diff --git a/.github/actions/ci-optimization/action.yml b/.github/actions/ci-optimization/action.yml
index 2f677a0e552c23..0d435963382675 100644
--- a/.github/actions/ci-optimization/action.yml
+++ b/.github/actions/ci-optimization/action.yml
@@ -1,5 +1,5 @@
-name: 'Identify CI Optimizations'
-description: 'Determine if code changes are specific to certain modules.'
+name: "Identify CI Optimizations"
+description: "Determine if code changes are specific to certain modules."
 
 outputs:
   frontend-only:
@@ -44,27 +44,26 @@ outputs:
 runs:
   using: "composite"
   steps:
-    - uses: dorny/paths-filter@v2
+    - uses: dorny/paths-filter@v3
       id: filter
       with:
+        token: "" # Empty token forces it to use raw git commands.
         filters: |
           frontend:
             - "datahub-frontend/**"
             - "datahub-web-react/**"
-            - "smoke-test/tests/cypress/**"
             - "docker/datahub-frontend/**"
           ingestion:
             - "metadata-ingestion-modules/**"
             - "metadata-ingestion/**"
             - "metadata-models/**"
-            - "smoke-test/**"
-            - "docker/datahub-ingestion**"
+            - "docker/datahub-ingestion-base/**"
+            - "docker/datahub-ingestion/**"
           ingestion-base:
             - "docker/datahub-ingestion-base/**"
           docker:
             - "docker/**"
           backend:
-            - ".github/**"
             - "metadata-models/**"
             - "datahub-upgrade/**"
             - "entity-registry/**"
@@ -78,7 +77,6 @@ runs:
             - "metadata-utils/**"
             - "metadata-operation-context/**"
             - "datahub-graphql-core/**"
-            - "smoke-test/**"
             - "docker/**"
           kafka-setup:
             - "docker/kafka-setup/**"
diff --git a/.github/actions/docker-custom-build-and-push/action.yml b/.github/actions/docker-custom-build-and-push/action.yml
index 1c4a777c14802a..ccaff510c120aa 100644
--- a/.github/actions/docker-custom-build-and-push/action.yml
+++ b/.github/actions/docker-custom-build-and-push/action.yml
@@ -26,18 +26,26 @@ inputs:
   build-args:
     description: "List of build-time variables. Same as docker/build-push-action"
     required: false
-  tags:
-    # e.g. latest,head,sha12345
-    description: "List of tags to use for the Docker image"
+  image_tag:
+    # e.g. pr12345 OR head OR v0.1.2.3
+    description: "Main tag to use for the Docker image"
     required: true
+  flavor:
+    description: "Image flavor (e.g., slim, full)"
+    required: false
   target:
     description: "Sets the target stage to build"
     required: false
+  depot-project:
+    # Setting this will use native arm64 docker builds instead of QEMU emulation.
+    # This speeds up builds by 2-3x.
+    description: "Depot project id"
+    required: false
+
 outputs:
   image_tag:
     description: "Docker image tags"
     value: ${{ steps.docker_meta.outputs.tags }}
-  # image_name: ${{ env.DATAHUB_GMS_IMAGE }}
 
 runs:
   using: "composite"
@@ -45,17 +53,32 @@ runs:
   steps:
     - name: Docker meta
       id: docker_meta
-      uses: crazy-max/ghaction-docker-meta@v1
+      uses: docker/metadata-action@v5
       with:
-        # list of Docker images to use as base name for tags
         images: ${{ inputs.images }}
-        # add git short SHA as Docker tag
-        tag-custom: ${{ inputs.tags }}
-        tag-custom-only: true
+        flavor: |
+          latest=false
+        tags: |
+          type=raw,value=${{ inputs.image_tag }}
+          type=raw,value=head,suffix=${{ inputs.flavor && format('-{0}', inputs.flavor) || '' }},enable={{is_default_branch}}
+          type=sha,prefix=,format=short,suffix=${{ inputs.flavor && format('-{0}', inputs.flavor) || '' }}
+
+    - name: Single Tag
+      id: single_tag
+      shell: bash
+      run: |
+        IMAGES="""
+        ${{ inputs.images }}
+        """
+        TAGS="""
+        ${{ inputs.image_tag }}
+        """
+        echo "SINGLE_IMAGE=$(echo $IMAGES | tr '\n' ' ' | awk -F' |,' '{ print $1 }')" >> "$GITHUB_OUTPUT"
+        echo "SINGLE_TAG=$(echo $IMAGES | tr '\n' ' ' | awk -F' |,' '{ print $1 }'):$(echo $TAGS | tr '\n' ' ' | awk -F' |,' '{ print $1 }')" >> "$GITHUB_OUTPUT"
 
     # Code for testing the build when not pushing to Docker Hub.
     - name: Build and Load image for testing (if not publishing)
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       if: ${{ inputs.publish != 'true' }}
       with:
         context: ${{ inputs.context }}
@@ -68,17 +91,11 @@ runs:
         target: ${{ inputs.target }}
         load: true
         push: false
-        cache-from: type=registry,ref=${{ steps.docker_meta.outputs.tags }}
-        cache-to: type=inline
-    - name: Single Tag
-      if: ${{ inputs.publish != 'true' }}
-      shell: bash
-      run: |
-        TAGS="""
-        ${{ steps.docker_meta.outputs.tags }}
-        """
-        echo "SINGLE_TAG=$(echo $TAGS | tr '\n' ' ' | awk -F' ' '{ print $1 }')" >> $GITHUB_OUTPUT
-      id: single_tag
+        cache-from: |
+          type=registry,ref=${{ steps.single_tag.outputs.SINGLE_IMAGE }}:head${{ inputs.flavor && format('-{0}', inputs.flavor) || '' }}
+          type=registry,ref=${{ steps.docker_meta.outputs.tags }}
+        cache-to: |
+          type=inline
     - name: Upload image locally for testing (if not publishing)
       uses: ishworkh/docker-image-artifact-upload@v1
       if: ${{ inputs.publish != 'true' }}
@@ -88,19 +105,42 @@ runs:
     # Code for building multi-platform images and pushing to Docker Hub.
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
-      if: ${{ inputs.publish == 'true' }}
+      if: ${{ inputs.publish == 'true' && inputs.depot-project == '' }}
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
-      if: ${{ inputs.publish == 'true' }}
+      if: ${{ inputs.publish == 'true' && inputs.depot-project == '' }}
+    - name: Setup Depot CLI
+      uses: depot/setup-action@v1
+      if: ${{ inputs.publish == 'true' && inputs.depot-project != '' }}
     - name: Login to DockerHub
       uses: docker/login-action@v3
       if: ${{ inputs.publish == 'true' }}
       with:
         username: ${{ inputs.username }}
         password: ${{ inputs.password }}
+
+    # Depot variant.
     - name: Build and Push Multi-Platform image
-      uses: docker/build-push-action@v5
-      if: ${{ inputs.publish == 'true' }}
+      uses: depot/build-push-action@v1
+      if: ${{ inputs.publish == 'true' && inputs.depot-project != '' }}
+      with:
+        project: ${{ inputs.depot-project }}
+        context: ${{ inputs.context }}
+        file: ${{ inputs.file }}
+        platforms: ${{ inputs.platforms }}
+        build-args: ${{ inputs.build-args }}
+        tags: ${{ steps.docker_meta.outputs.tags }}
+        target: ${{ inputs.target }}
+        push: true
+        cache-from: |
+          type=registry,ref=${{ steps.single_tag.outputs.SINGLE_IMAGE }}:head${{ inputs.flavor && format('-{0}', inputs.flavor) || '' }}
+          type=registry,ref=${{ steps.docker_meta.outputs.tags }}
+        cache-to: |
+          type=inline
+
+    - name: Build and Push Multi-Platform image
+      uses: docker/build-push-action@v6
+      if: ${{ inputs.publish == 'true' && inputs.depot-project == '' }}
       with:
         context: ${{ inputs.context }}
         file: ${{ inputs.file }}
@@ -109,7 +149,10 @@ runs:
         tags: ${{ steps.docker_meta.outputs.tags }}
         target: ${{ inputs.target }}
         push: true
-        cache-from: type=registry,ref=${{ steps.docker_meta.outputs.tags }}
-        cache-to: type=inline
+        cache-from: |
+          type=registry,ref=${{ steps.single_tag.outputs.SINGLE_IMAGE }}:head${{ inputs.flavor && format('-{0}', inputs.flavor) || '' }}
+          type=registry,ref=${{ steps.docker_meta.outputs.tags }}
+        cache-to: |
+          type=inline
 
     # TODO add code for vuln scanning?
diff --git a/.github/scripts/check_python_package.py b/.github/scripts/check_python_package.py
index f1f30056917006..1b23d8e621ef06 100644
--- a/.github/scripts/check_python_package.py
+++ b/.github/scripts/check_python_package.py
@@ -1,18 +1,33 @@
 import setuptools
+import os
 
 folders = ["./smoke-test/tests"]
 
 for folder in folders:
     print(f"Checking folder {folder}")
-    a = [i for i in setuptools.find_packages(folder) if "cypress" not in i]
-    b = [i for i in setuptools.find_namespace_packages(folder) if "cypress" not in i]
+    packages = [i for i in setuptools.find_packages(folder) if "cypress" not in i]
+    namespace_packages = [
+        i for i in setuptools.find_namespace_packages(folder) if "cypress" not in i
+    ]
 
-    in_a_not_b = set(a) - set(b)
-    in_b_not_a = set(b) - set(a)
+    print("Packages found:", packages)
+    print("Namespace packages found:", namespace_packages)
+
+    in_packages_not_namespace = set(packages) - set(namespace_packages)
+    in_namespace_not_packages = set(namespace_packages) - set(packages)
+
+    if in_packages_not_namespace:
+        print(f"Packages not in namespace packages: {in_packages_not_namespace}")
+    if in_namespace_not_packages:
+        print(f"Namespace packages not in packages: {in_namespace_not_packages}")
+        for pkg in in_namespace_not_packages:
+            pkg_path = os.path.join(folder, pkg.replace(".", os.path.sep))
+            print(f"Contents of {pkg_path}:")
+            print(os.listdir(pkg_path))
 
     assert (
-        len(in_a_not_b) == 0
-    ), f"Found packages in {folder} that are not in namespace packages: {in_a_not_b}"
+        len(in_packages_not_namespace) == 0
+    ), f"Found packages in {folder} that are not in namespace packages: {in_packages_not_namespace}"
     assert (
-        len(in_b_not_a) == 0
-    ), f"Found namespace packages in {folder} that are not in packages: {in_b_not_a}"
+        len(in_namespace_not_packages) == 0
+    ), f"Found namespace packages in {folder} that are not in packages: {in_namespace_not_packages}"
diff --git a/.github/scripts/docker_helpers.sh b/.github/scripts/docker_helpers.sh
index 0487c69eee0ef4..138c8649820ec5 100755
--- a/.github/scripts/docker_helpers.sh
+++ b/.github/scripts/docker_helpers.sh
@@ -5,22 +5,22 @@ export MAIN_BRANCH="master"
 export MAIN_BRANCH_TAG="head"
 
 function get_short_sha {
-    echo $(git rev-parse --short "$GITHUB_SHA")
+    echo $(git rev-parse --short "$GITHUB_SHA"|head -c7)
 }
 
 export SHORT_SHA=$(get_short_sha)
 echo "SHORT_SHA: $SHORT_SHA"
 
 function get_tag {
-    echo $(echo ${GITHUB_REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG},g" -e 's,refs/tags/,,g' -e 's,refs/pull/\([0-9]*\).*,pr\1,g'),${SHORT_SHA}
+    echo $(echo ${GITHUB_REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG},g" -e 's,refs/tags/,,g' -e 's,refs/pull/\([0-9]*\).*,pr\1,g')
 }
 
 function get_tag_slim {
-    echo $(echo ${GITHUB_REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG}-slim,g" -e 's,refs/tags/,,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-slim,g'),${SHORT_SHA}-slim
+    echo $(echo ${GITHUB_REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG}-slim,g" -e 's,refs/tags/\(.*\),\1-slim,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-slim,g')
 }
 
 function get_tag_full {
-    echo $(echo ${GITHUB_REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG}-full,g" -e 's,refs/tags/,,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-full,g'),${SHORT_SHA}-full
+    echo $(echo ${GITHUB_REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG}-full,g" -e 's,refs/tags/\(.*\),\1-full,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-full,g')
 }
 
 function get_python_docker_release_v {
@@ -32,9 +32,17 @@ function get_unique_tag {
 }
 
 function get_unique_tag_slim {
-    echo $(echo ${GITHUB_REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${SHORT_SHA}-slim,g" -e 's,refs/tags/,,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-slim,g')
+    echo $(echo ${GITHUB_REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${SHORT_SHA}-slim,g" -e 's,refs/tags/\(.*\),\1-slim,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-slim,g')
 }
 
 function get_unique_tag_full {
-    echo $(echo ${GITHUB_REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${SHORT_SHA}-full,g" -e 's,refs/tags/,,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-full,g')
+    echo $(echo ${GITHUB_REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${SHORT_SHA}-full,g" -e 's,refs/tags/\(.*\),\1-full,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-full,g')
+}
+
+function get_platforms_based_on_branch {
+    if [ "${{ github.event_name }}" == 'push' && "${{ github.ref }}" == "refs/heads/${MAIN_BRANCH}" ]; then
+        echo "linux/amd64,linux/arm64"
+    else
+        echo "linux/amd64"
+    fi
 }
diff --git a/.github/scripts/docker_logs.sh b/.github/scripts/docker_logs.sh
new file mode 100644
index 00000000000000..918b859fbe5b1d
--- /dev/null
+++ b/.github/scripts/docker_logs.sh
@@ -0,0 +1,8 @@
+TARGET_DIR="${TARGET_DIR:=docker_logs}"
+TEST_STRATEGY="${TEST_STRATEGY:=}"
+
+mkdir -p "$TARGET_DIR"
+for name in `docker ps -a --format '{{.Names}}'`;
+do
+    docker logs "$name" >& "${TARGET_DIR}/${name}${TEST_STRATEGY}.log" || true
+done
\ No newline at end of file
diff --git a/.github/workflows/airflow-plugin.yml b/.github/workflows/airflow-plugin.yml
index ab5b3eb48da7f3..912dd985f66c06 100644
--- a/.github/workflows/airflow-plugin.yml
+++ b/.github/workflows/airflow-plugin.yml
@@ -52,18 +52,18 @@ jobs:
             extra_pip_requirements: 'apache-airflow~=2.8.1 -c https://raw.githubusercontent.com/apache/airflow/constraints-2.8.1/constraints-3.10.txt'
             extra_pip_extras: plugin-v2
           - python-version: "3.11"
-            extra_pip_requirements: 'apache-airflow~=2.9.3 -c https://raw.githubusercontent.com/apache/airflow/constraints-2.9.3/constraints-3.10.txt'
+            extra_pip_requirements: 'apache-airflow~=2.9.3 -c https://raw.githubusercontent.com/apache/airflow/constraints-2.9.3/constraints-3.11.txt'
             extra_pip_extras: plugin-v2
       fail-fast: false
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v3
       - uses: acryldata/sane-checkout-action@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index c93267947b65a8..52148ef1b91f95 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -57,18 +57,23 @@ jobs:
     timeout-minutes: 60
     needs: setup
     steps:
+      - name: Free up disk space
+        run: |
+          sudo apt-get remove 'dotnet-*' azure-cli || true
+          sudo rm -rf /usr/local/lib/android/ || true
+          sudo docker image prune -a -f || true
       - uses: szenius/set-timezone@v1.2
         with:
           timezoneLinux: ${{ matrix.timezone }}
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         if: ${{ needs.setup.outputs.ingestion_change == 'true' }}
         with:
           python-version: "3.10"
@@ -86,6 +91,10 @@ jobs:
             -x :metadata-ingestion-modules:airflow-plugin:check \
             -x :metadata-ingestion-modules:dagster-plugin:build \
             -x :metadata-ingestion-modules:dagster-plugin:check \
+            -x :metadata-ingestion-modules:prefect-plugin:build \
+            -x :metadata-ingestion-modules:prefect-plugin:check \
+            -x :metadata-ingestion-modules:gx-plugin:build \
+            -x :metadata-ingestion-modules:gx-plugin:check \
             -x :datahub-frontend:build \
             -x :datahub-web-react:build \
             --parallel
@@ -118,7 +127,7 @@ jobs:
     steps:
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Quickstart Compose Validation
@@ -131,4 +140,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: Event File
-          path: ${{ github.event_path }}
+          path: ${{ github.event_path }}
\ No newline at end of file
diff --git a/.github/workflows/check-datahub-jars.yml b/.github/workflows/check-datahub-jars.yml
index b45d130e0494dd..becf8126dc45ba 100644
--- a/.github/workflows/check-datahub-jars.yml
+++ b/.github/workflows/check-datahub-jars.yml
@@ -29,12 +29,12 @@ jobs:
     steps:
       - uses: acryldata/sane-checkout-action@v3
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: check ${{ matrix.command }} jar
diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml
index b3b94cc40a2fdd..0583f9ab3c4262 100644
--- a/.github/workflows/code-checks.yml
+++ b/.github/workflows/code-checks.yml
@@ -32,7 +32,7 @@ jobs:
     steps:
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: run check ${{ matrix.command }}
diff --git a/.github/workflows/dagster-plugin.yml b/.github/workflows/dagster-plugin.yml
index 48f1b24196c9e0..f0b9038b610d22 100644
--- a/.github/workflows/dagster-plugin.yml
+++ b/.github/workflows/dagster-plugin.yml
@@ -40,12 +40,12 @@ jobs:
       fail-fast: false
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
diff --git a/.github/workflows/docker-unified.yml b/.github/workflows/docker-unified.yml
index 9487e71e8da3d1..075da20cdd11cc 100644
--- a/.github/workflows/docker-unified.yml
+++ b/.github/workflows/docker-unified.yml
@@ -33,6 +33,10 @@ env:
   DATAHUB_INGESTION_BASE_IMAGE: "acryldata/datahub-ingestion-base"
   DATAHUB_INGESTION_IMAGE: "acryldata/datahub-ingestion"
 
+permissions:
+  contents: read
+  id-token: write
+
 jobs:
   setup:
     runs-on: ubuntu-latest
@@ -47,7 +51,6 @@ jobs:
       publish: ${{ steps.publish.outputs.publish }}
       pr-publish: ${{ steps.pr-publish.outputs.publish }}
       python_release_version: ${{ steps.tag.outputs.python_release_version }}
-      short_sha: ${{ steps.tag.outputs.short_sha }}
       branch_name: ${{ steps.tag.outputs.branch_name }}
       repository_name: ${{ steps.tag.outputs.repository_name }}
       frontend_change: ${{ steps.ci-optimize.outputs.frontend-change == 'true' }}
@@ -61,6 +64,7 @@ jobs:
       mysql_setup_change: ${{ steps.ci-optimize.outputs.mysql-setup-change == 'true' }}
       postgres_setup_change: ${{ steps.ci-optimize.outputs.postgres-setup-change == 'true' }}
       elasticsearch_setup_change: ${{ steps.ci-optimize.outputs.elasticsearch-setup-change == 'true' }}
+      smoke_test_change: ${{ steps.ci-optimize.outputs.smoke-test-change == 'true' }}
     steps:
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
@@ -68,23 +72,23 @@ jobs:
         id: tag
         run: |
           source .github/scripts/docker_helpers.sh
-          echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
-          echo "tag=$(get_tag)" >> $GITHUB_OUTPUT
-          echo "slim_tag=$(get_tag_slim)" >> $GITHUB_OUTPUT
-          echo "full_tag=$(get_tag_full)" >> $GITHUB_OUTPUT
-          echo "unique_tag=$(get_unique_tag)" >> $GITHUB_OUTPUT
-          echo "unique_slim_tag=$(get_unique_tag_slim)" >> $GITHUB_OUTPUT
-          echo "unique_full_tag=$(get_unique_tag_full)" >> $GITHUB_OUTPUT
-          echo "python_release_version=$(get_python_docker_release_v)" >> $GITHUB_OUTPUT
-          echo "branch_name=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
-          echo "repository_name=${GITHUB_REPOSITORY#*/}" >> $GITHUB_OUTPUT
+          echo "short_sha=${SHORT_SHA}" >> "$GITHUB_OUTPUT"
+          echo "tag=$(get_tag)" >> "$GITHUB_OUTPUT"
+          echo "slim_tag=$(get_tag_slim)" >> "$GITHUB_OUTPUT"
+          echo "full_tag=$(get_tag_full)" >> "$GITHUB_OUTPUT"
+          echo "unique_tag=$(get_unique_tag)" >> "$GITHUB_OUTPUT"
+          echo "unique_slim_tag=$(get_unique_tag_slim)" >> "$GITHUB_OUTPUT"
+          echo "unique_full_tag=$(get_unique_tag_full)" >> "$GITHUB_OUTPUT"
+          echo "python_release_version=$(get_python_docker_release_v)" >> "$GITHUB_OUTPUT"
+          echo "branch_name=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> "$GITHUB_OUTPUT"
+          echo "repository_name=${GITHUB_REPOSITORY#*/}" >> "$GITHUB_OUTPUT"
       - name: Check whether docker login is possible
         id: docker-login
         env:
           ENABLE_DOCKER_LOGIN: ${{ secrets.ACRYL_DOCKER_PASSWORD != '' }}
         run: |
           echo "Enable Docker Login: ${{ env.ENABLE_DOCKER_LOGIN }}"
-          echo "docker-login=${{ env.ENABLE_DOCKER_LOGIN }}" >> $GITHUB_OUTPUT
+          echo "docker-login=${{ env.ENABLE_DOCKER_LOGIN }}" >> "$GITHUB_OUTPUT"
       - name: Check whether publishing enabled
         id: publish
         env:
@@ -95,7 +99,7 @@ jobs:
              }}
         run: |
           echo "Enable publish: ${{ env.ENABLE_PUBLISH }}"
-          echo "publish=${{ env.ENABLE_PUBLISH }}" >> $GITHUB_OUTPUT
+          echo "publish=${{ env.ENABLE_PUBLISH }}" >> "$GITHUB_OUTPUT"
       - name: Check whether PR publishing enabled
         id: pr-publish
         env:
@@ -106,10 +110,10 @@ jobs:
              }}
         run: |
           echo "Enable PR publish: ${{ env.ENABLE_PUBLISH }}"
-          echo "publish=${{ env.ENABLE_PUBLISH }}" >> $GITHUB_OUTPUT
+          echo "publish=${{ env.ENABLE_PUBLISH }}" >> "$GITHUB_OUTPUT"
       - uses: ./.github/actions/ci-optimization
         id: ci-optimize
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         if: ${{ steps.ci-optimize.outputs.smoke-test-change == 'true' }}
         with:
           python-version: "3.10"
@@ -121,7 +125,7 @@ jobs:
             ~/.cache/uv
           key: ${{ runner.os }}-uv-${{ hashFiles('**/requirements.txt') }}
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         if: ${{ steps.ci-optimize.outputs.smoke-test-change == 'true' }}
         with:
           distribution: "zulu"
@@ -141,7 +145,7 @@ jobs:
     if: ${{ needs.setup.outputs.backend_change == 'true' || needs.setup.outputs.publish == 'true' }}
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
@@ -157,7 +161,7 @@ jobs:
         with:
           images: |
             ${{ env.DATAHUB_GMS_IMAGE }}
-          tags: ${{ needs.setup.outputs.tag }}
+          image_tag: ${{ needs.setup.outputs.tag }}
           username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
           password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
           publish: ${{ needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
@@ -205,7 +209,7 @@ jobs:
     if: ${{ needs.setup.outputs.backend_change == 'true' || needs.setup.outputs.publish == 'true' }}
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
@@ -221,7 +225,7 @@ jobs:
         with:
           images: |
             ${{ env.DATAHUB_MAE_CONSUMER_IMAGE }}
-          tags: ${{ needs.setup.outputs.tag }}
+          image_tag: ${{ needs.setup.outputs.tag }}
           username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
           password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
           publish: ${{ needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
@@ -269,7 +273,7 @@ jobs:
     if: ${{ needs.setup.outputs.backend_change == 'true' || needs.setup.outputs.publish == 'true' }}
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
@@ -285,7 +289,7 @@ jobs:
         with:
           images: |
             ${{ env.DATAHUB_MCE_CONSUMER_IMAGE }}
-          tags: ${{ needs.setup.outputs.tag }}
+          image_tag: ${{ needs.setup.outputs.tag }}
           username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
           password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
           publish: ${{ needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
@@ -333,7 +337,7 @@ jobs:
     if: ${{ needs.setup.outputs.backend_change == 'true' || needs.setup.outputs.publish == 'true' }}
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
@@ -349,7 +353,7 @@ jobs:
         with:
           images: |
             ${{ env.DATAHUB_UPGRADE_IMAGE }}
-          tags: ${{ needs.setup.outputs.tag }}
+          image_tag: ${{ needs.setup.outputs.tag }}
           username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
           password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
           publish: ${{ needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
@@ -394,10 +398,10 @@ jobs:
     name: Build and Push DataHub Frontend Docker Image
     runs-on: ubuntu-latest
     needs: setup
-    if: ${{ needs.setup.outputs.frontend_change == 'true' || needs.setup.outputs.publish == 'true' }}
+    if: ${{ needs.setup.outputs.frontend_change == 'true' || needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true'}}
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
@@ -415,7 +419,7 @@ jobs:
         with:
           images: |
             ${{ env.DATAHUB_FRONTEND_IMAGE }}
-          tags: ${{ needs.setup.outputs.tag }}
+          image_tag: ${{ needs.setup.outputs.tag }}
           username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
           password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
           publish: ${{ needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
@@ -433,7 +437,7 @@ jobs:
       actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
     steps:
       - name: Checkout # adding checkout step just to make trivy upload happy
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Download image
         uses: ishworkh/docker-image-artifact-download@v1
         if: ${{ needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' }}
@@ -469,7 +473,7 @@ jobs:
         with:
           images: |
             ${{ env.DATAHUB_KAFKA_SETUP_IMAGE }}
-          tags: ${{ needs.setup.outputs.tag }}
+          image_tag: ${{ needs.setup.outputs.tag }}
           username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
           password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
           publish: ${{ needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
@@ -490,7 +494,7 @@ jobs:
         with:
           images: |
             ${{ env.DATAHUB_MYSQL_SETUP_IMAGE }}
-          tags: ${{ needs.setup.outputs.tag }}
+          image_tag: ${{ needs.setup.outputs.tag }}
           username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
           password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
           publish: ${{ needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
@@ -502,7 +506,7 @@ jobs:
     name: Build and Push DataHub Elasticsearch Setup Docker Image
     runs-on: ubuntu-latest
     needs: setup
-    if: ${{ needs.setup.outputs.elasticsearch_setup_change == 'true' || (needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true') }}
+    if: ${{ needs.setup.outputs.elasticsearch_setup_change == 'true' || (needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' ) }}
     steps:
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
@@ -511,7 +515,7 @@ jobs:
         with:
           images: |
             ${{ env.DATAHUB_ELASTIC_SETUP_IMAGE }}
-          tags: ${{ needs.setup.outputs.tag }}
+          image_tag: ${{ needs.setup.outputs.tag }}
           username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
           password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
           publish: ${{ needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
@@ -525,7 +529,7 @@ jobs:
     outputs:
       tag: ${{ steps.tag.outputs.tag }}
     needs: setup
-    if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }}
+    if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
     steps:
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
@@ -536,23 +540,24 @@ jobs:
           target: base
           images: |
             ${{ env.DATAHUB_INGESTION_BASE_IMAGE }}
-          tags: ${{ needs.setup.outputs.tag }}
+          image_tag: ${{ needs.setup.outputs.tag }}
           username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
           password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
           publish: ${{ needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
           context: .
           file: ./docker/datahub-ingestion-base/Dockerfile
           platforms: linux/amd64,linux/arm64/v8
+          depot-project: ${{ vars.DEPOT_PROJECT_ID }}
       - name: Compute DataHub Ingestion (Base) Tag
         id: tag
-        run: echo "tag=${{ needs.setup.outputs.ingestion_base_change == 'true' && needs.setup.outputs.unique_tag || 'head' }}" >> $GITHUB_OUTPUT
+        run: echo "tag=${{ needs.setup.outputs.ingestion_base_change == 'true' && needs.setup.outputs.unique_tag || 'head' }}" >> "$GITHUB_OUTPUT"
   datahub_ingestion_base_slim_build:
     name: Build and Push DataHub Ingestion (Base-Slim) Docker Image
     runs-on: ubuntu-latest
     outputs:
       tag: ${{ steps.tag.outputs.tag }}
     needs: [setup, datahub_ingestion_base_build]
-    if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }}
+    if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
     steps:
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
@@ -574,7 +579,8 @@ jobs:
           target: slim-install
           images: |
             ${{ env.DATAHUB_INGESTION_BASE_IMAGE }}
-          tags: ${{ needs.setup.outputs.slim_tag }}
+          image_tag: ${{ needs.setup.outputs.slim_tag }}
+          flavor: slim
           username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
           password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
           build-args: |
@@ -584,16 +590,17 @@ jobs:
           context: .
           file: ./docker/datahub-ingestion-base/Dockerfile
           platforms: linux/amd64,linux/arm64/v8
+          depot-project: ${{ vars.DEPOT_PROJECT_ID }}
       - name: Compute DataHub Ingestion (Base-Slim) Tag
         id: tag
-        run: echo "tag=${{ needs.setup.outputs.ingestion_base_change == 'true' && needs.setup.outputs.unique_slim_tag || 'head-slim' }}" >> $GITHUB_OUTPUT
+        run: echo "tag=${{ needs.setup.outputs.ingestion_base_change == 'true' && needs.setup.outputs.unique_slim_tag || 'head-slim' }}" >> "$GITHUB_OUTPUT"
   datahub_ingestion_base_full_build:
     name: Build and Push DataHub Ingestion (Base-Full) Docker Image
     runs-on: ubuntu-latest
     outputs:
       tag: ${{ steps.tag.outputs.tag }}
     needs: [setup, datahub_ingestion_base_build]
-    if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }}
+    if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
     steps:
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
@@ -615,7 +622,7 @@ jobs:
           target: full-install
           images: |
             ${{ env.DATAHUB_INGESTION_BASE_IMAGE }}
-          tags: ${{ needs.setup.outputs.full_tag }}
+          image_tag: ${{ needs.setup.outputs.full_tag }}
           username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
           password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
           build-args: |
@@ -627,7 +634,7 @@ jobs:
           platforms: linux/amd64,linux/arm64/v8
       - name: Compute DataHub Ingestion (Base-Full) Tag
         id: tag
-        run: echo "tag=${{ needs.setup.outputs.ingestion_base_change == 'true' && needs.setup.outputs.unique_full_tag || 'head' }}" >> $GITHUB_OUTPUT
+        run: echo "tag=${{ needs.setup.outputs.ingestion_base_change == 'true' && needs.setup.outputs.unique_full_tag || 'head' }}" >> "$GITHUB_OUTPUT"
 
   datahub_ingestion_slim_build:
     name: Build and Push DataHub Ingestion Docker Images
@@ -636,10 +643,10 @@ jobs:
       tag: ${{ steps.tag.outputs.tag }}
       needs_artifact_download: ${{ needs.setup.outputs.ingestion_change == 'true' && ( needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true') }}
     needs: [setup, datahub_ingestion_base_slim_build]
-    if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }}
+    if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
@@ -647,7 +654,7 @@ jobs:
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
       - name: Build codegen
-        if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }}
+        if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish =='true' }}
         run: ./gradlew :metadata-ingestion:codegen
       - name: Download Base Image
         uses: ishworkh/docker-image-artifact-download@v1
@@ -661,7 +668,7 @@ jobs:
           username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
           password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
       - name: Build and push Slim Image
-        if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }}
+        if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
         uses: ./.github/actions/docker-custom-build-and-push
         with:
           target: final
@@ -672,16 +679,18 @@ jobs:
             DOCKER_VERSION=${{ needs.setup.outputs.ingestion_base_change == 'true' && needs.setup.outputs.unique_slim_tag || 'head-slim' }}
             RELEASE_VERSION=${{ needs.setup.outputs.python_release_version }}
             APP_ENV=slim
-          tags: ${{ needs.setup.outputs.slim_tag }}
+          image_tag: ${{ needs.setup.outputs.slim_tag }}
+          flavor: slim
           username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
           password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
           publish: ${{ needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
           context: .
           file: ./docker/datahub-ingestion/Dockerfile
           platforms: linux/amd64,linux/arm64/v8
+          depot-project: ${{ vars.DEPOT_PROJECT_ID }}
       - name: Compute Tag
         id: tag
-        run: echo "tag=${{ needs.setup.outputs.ingestion_change == 'true' && needs.setup.outputs.unique_slim_tag || 'head-slim' }}" >> $GITHUB_OUTPUT
+        run: echo "tag=${{ needs.setup.outputs.ingestion_change == 'true' && needs.setup.outputs.unique_slim_tag || 'head-slim' }}" >> "$GITHUB_OUTPUT"
   datahub_ingestion_slim_scan:
     permissions:
       contents: read # for actions/checkout to fetch code
@@ -711,6 +720,7 @@ jobs:
           severity: "CRITICAL,HIGH"
           ignore-unfixed: true
           vuln-type: "os,library"
+          timeout: 15m
       - name: Upload Trivy scan results to GitHub Security tab
         uses: github/codeql-action/upload-sarif@v2
         with:
@@ -723,10 +733,10 @@ jobs:
       tag: ${{ steps.tag.outputs.tag }}
       needs_artifact_download: ${{ needs.setup.outputs.ingestion_change == 'true' && ( needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' ) }}
     needs: [setup, datahub_ingestion_base_full_build]
-    if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }}
+    if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
@@ -734,7 +744,7 @@ jobs:
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
       - name: Build codegen
-        if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }}
+        if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
         run: ./gradlew :metadata-ingestion:codegen
       - name: Download Base Image
         uses: ishworkh/docker-image-artifact-download@v1
@@ -748,7 +758,7 @@ jobs:
           username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
           password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
       - name: Build and push Full Image
-        if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }}
+        if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
         uses: ./.github/actions/docker-custom-build-and-push
         with:
           target: final
@@ -758,16 +768,17 @@ jobs:
             BASE_IMAGE=${{ env.DATAHUB_INGESTION_BASE_IMAGE }}
             DOCKER_VERSION=${{ needs.setup.outputs.ingestion_base_change == 'true' && needs.setup.outputs.unique_tag || 'head' }}
             RELEASE_VERSION=${{ needs.setup.outputs.python_release_version }}
-          tags: ${{ needs.setup.outputs.tag }}
+          image_tag: ${{ needs.setup.outputs.tag }}
           username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
           password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
           publish: ${{ needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
           context: .
           file: ./docker/datahub-ingestion/Dockerfile
           platforms: linux/amd64,linux/arm64/v8
+          depot-project: ${{ vars.DEPOT_PROJECT_ID }}
       - name: Compute Tag (Full)
         id: tag
-        run: echo "tag=${{ needs.setup.outputs.ingestion_change == 'true' && needs.setup.outputs.unique_tag || 'head' }}" >> $GITHUB_OUTPUT
+        run: echo "tag=${{ needs.setup.outputs.ingestion_change == 'true' && needs.setup.outputs.unique_tag || 'head' }}" >> "$GITHUB_OUTPUT"
   datahub_ingestion_full_scan:
     permissions:
       contents: read # for actions/checkout to fetch code
@@ -776,7 +787,7 @@ jobs:
     name: "[Monitoring] Scan Datahub Ingestion images for vulnerabilities"
     runs-on: ubuntu-latest
     needs: [setup, datahub_ingestion_full_build]
-    if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }}
+    if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
     steps:
       - name: Checkout # adding checkout step just to make trivy upload happy
         uses: acryldata/sane-checkout-action@v3
@@ -797,6 +808,7 @@ jobs:
           severity: "CRITICAL,HIGH"
           ignore-unfixed: true
           vuln-type: "os,library"
+          timeout: 15m
       - name: Upload Trivy scan results to GitHub Security tab
         uses: github/codeql-action/upload-sarif@v2
         with:
@@ -811,13 +823,13 @@ jobs:
       - id: set-matrix
         run: |
           if [ '${{ needs.setup.outputs.frontend_only }}' == 'true' ]; then
-             echo 'matrix=["cypress_suite1","cypress_rest"]' >> $GITHUB_OUTPUT
+             echo 'matrix=["cypress_suite1","cypress_rest"]' >> "$GITHUB_OUTPUT"
           elif [ '${{ needs.setup.outputs.ingestion_only }}' == 'true' ]; then
-             echo 'matrix=["no_cypress_suite0","no_cypress_suite1"]' >> $GITHUB_OUTPUT
-          elif [ '${{ needs.setup.outputs.backend_change }}' == 'true' ]; then
-             echo 'matrix=["no_cypress_suite0","no_cypress_suite1","cypress_suite1","cypress_rest"]' >> $GITHUB_OUTPUT
+             echo 'matrix=["no_cypress_suite0","no_cypress_suite1"]' >> "$GITHUB_OUTPUT"
+          elif [[ '${{ needs.setup.outputs.backend_change }}' == 'true' || '${{ needs.setup.outputs.smoke_test_change }}' == 'true' ]]; then
+             echo 'matrix=["no_cypress_suite0","no_cypress_suite1","cypress_suite1","cypress_rest"]' >> "$GITHUB_OUTPUT"
           else
-             echo 'matrix=[]' >> $GITHUB_OUTPUT
+             echo 'matrix=[]' >> "$GITHUB_OUTPUT"
           fi
 
   smoke_test:
@@ -853,20 +865,15 @@ jobs:
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
           cache: "pip"
-      - name: Install dependencies
-        run: ./metadata-ingestion/scripts/install_deps.sh
-      - name: Build datahub cli
-        run: |
-          ./gradlew :metadata-ingestion:install
       - name: Login to DockerHub
         uses: docker/login-action@v3
         if: ${{ needs.setup.outputs.docker-login == 'true' }}
@@ -961,11 +968,18 @@ jobs:
             docker pull '${{ env.DATAHUB_ELASTIC_SETUP_IMAGE }}:head'
             docker tag '${{ env.DATAHUB_ELASTIC_SETUP_IMAGE }}:head' '${{ env.DATAHUB_ELASTIC_SETUP_IMAGE }}:${{ needs.setup.outputs.unique_tag }}'
           fi
+          if [ '${{ needs.setup.outputs.integrations_service_change }}' == 'false' ]; then
+            echo 'datahub-integration-service head images'
+            docker pull '${{ env.DATAHUB_INTEGRATIONS_IMAGE }}:head'
+            docker tag '${{ env.DATAHUB_INTEGRATIONS_IMAGE }}:head' '${{ env.DATAHUB_INTEGRATIONS_IMAGE }}:${{ needs.setup.outputs.unique_tag }}'
+          fi
+      - name: CI Slim Head Images
+        run: |
           if [ '${{ needs.setup.outputs.ingestion_change }}' == 'false' ]; then
             echo 'datahub-ingestion head-slim images'
             docker pull '${{ env.DATAHUB_INGESTION_IMAGE }}:head-slim'
             if [ '${{ needs.datahub_ingestion_slim_build.outputs.tag || 'head-slim' }}' != 'head-slim' ]; then
-               docker tag '${{ env.DATAHUB_INGESTION_IMAGE }}:head-slim' '${{ env.DATAHUB_INGESTION_IMAGE }}:${{ needs.datahub_ingestion_slim_build.outputs.tag }}'
+               docker tag '${{ env.DATAHUB_INGESTION_IMAGE }}:head-slim' '${{ env.DATAHUB_INGESTION_IMAGE }}:${{ needs.setup.outputs.unique_tag }}'
             fi
           fi
       - name: Disk Check
@@ -994,6 +1008,15 @@ jobs:
               }
             }
           }'
+      - name: Disk Check
+        run: df -h . && docker images
+      - name: Install dependencies
+        run: ./metadata-ingestion/scripts/install_deps.sh
+      - name: Build datahub cli
+        run: |
+          ./gradlew :metadata-ingestion:install
+      - name: Disk Check
+        run: df -h . && docker images
       - name: Remove Source Code
         run: find ./*/* ! -path "./metadata-ingestion*" ! -path "./smoke-test*" ! -path "./gradle*" -delete
       - name: Disk Check
@@ -1014,21 +1037,14 @@ jobs:
         if: failure()
         run: |
           docker ps -a
-          docker logs datahub-datahub-gms-1 >& gms-${{ matrix.test_strategy }}.log || true
-          docker logs datahub-datahub-actions-1 >& actions-${{ matrix.test_strategy }}.log || true
-          docker logs datahub-datahub-mae-consumer-1 >& mae-${{ matrix.test_strategy }}.log || true
-          docker logs datahub-datahub-mce-consumer-1 >& mce-${{ matrix.test_strategy }}.log || true
-          docker logs datahub-broker-1 >& broker-${{ matrix.test_strategy }}.log || true
-          docker logs datahub-mysql-1 >& mysql-${{ matrix.test_strategy }}.log || true
-          docker logs datahub-elasticsearch-1 >& elasticsearch-${{ matrix.test_strategy }}.log || true
-          docker logs datahub-datahub-frontend-react-1 >& frontend-${{ matrix.test_strategy }}.log || true
-          docker logs datahub-upgrade-1 >& upgrade-${{ matrix.test_strategy }}.log || true
+          TEST_STRATEGY="-${{ matrix.test_strategy }}"
+          source .github/scripts/docker_logs.sh
       - name: Upload logs
         uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: docker logs
-          path: "*.log"
+          path: "docker_logs/*.log"
       - name: Upload screenshots
         uses: actions/upload-artifact@v3
         if: failure()
@@ -1049,7 +1065,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [setup, smoke_test]
     steps:
-      - uses: aws-actions/configure-aws-credentials@v1
+      - uses: aws-actions/configure-aws-credentials@v4
         if: ${{ needs.setup.outputs.publish != 'false' && github.repository_owner == 'datahub-project' && needs.setup.outputs.repository_name == 'datahub' }}
         with:
           aws-access-key-id: ${{ secrets.AWS_SQS_ACCESS_KEY_ID }}
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 9d63663693f902..dbeff7a9c0f9fc 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -36,12 +36,12 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
           cache: pip
diff --git a/.github/workflows/gx-plugin.yml b/.github/workflows/gx-plugin.yml
new file mode 100644
index 00000000000000..06a10883e70f54
--- /dev/null
+++ b/.github/workflows/gx-plugin.yml
@@ -0,0 +1,87 @@
+name: GX Plugin
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - ".github/workflows/gx-plugin.yml"
+      - "metadata-ingestion-modules/gx-plugin/**"
+      - "metadata-ingestion/**"
+      - "metadata-models/**"
+  pull_request:
+    branches:
+      - master
+    paths:
+      - ".github/**"
+      - "metadata-ingestion-modules/gx-plugin/**"
+      - "metadata-ingestion/**"
+      - "metadata-models/**"
+  release:
+    types: [published]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  gx-plugin:
+    runs-on: ubuntu-latest
+    env:
+      SPARK_VERSION: 3.0.3
+      DATAHUB_TELEMETRY_ENABLED: false
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.10"]
+        include:
+          - python-version: "3.8"
+            extraPythonRequirement: "great-expectations~=0.15.12"
+          - python-version: "3.10"
+            extraPythonRequirement: "great-expectations~=0.16.0 numpy~=1.26.0"
+          - python-version: "3.11"
+            extraPythonRequirement: "great-expectations~=0.17.0"
+      fail-fast: false
+    steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: "zulu"
+          java-version: 17
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "pip"
+      - name: Install dependencies
+        run: ./metadata-ingestion/scripts/install_deps.sh
+      - name: Install GX package and test  (extras ${{ matrix.extraPythonRequirement }})
+        run: ./gradlew -Pextra_pip_requirements='${{ matrix.extraPythonRequirement }}' :metadata-ingestion-modules:gx-plugin:lint :metadata-ingestion-modules:gx-plugin:testQuick
+      - name: pip freeze show list installed
+        if: always()
+        run: source metadata-ingestion-modules/gx-plugin/venv/bin/activate && pip freeze
+      - uses: actions/upload-artifact@v3
+        if: ${{ always() && matrix.python-version == '3.11' && matrix.extraPythonRequirement == 'great-expectations~=0.17.0' }}
+        with:
+          name: Test Results (GX Plugin ${{ matrix.python-version}})
+          path: |
+            **/build/reports/tests/test/**
+            **/build/test-results/test/**
+            **/junit.*.xml
+      - name: Upload coverage to Codecov
+        if: always()
+        uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          directory: .
+          fail_ci_if_error: false
+          flags: gx-${{ matrix.python-version }}-${{ matrix.extraPythonRequirement }}
+          name: pytest-gx
+          verbose: true
+
+  event-file:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: Event File
+          path: ${{ github.event_path }}
diff --git a/.github/workflows/lint-actions.yml b/.github/workflows/lint-actions.yml
index 4d83adbeba08a1..8a1777522f416b 100644
--- a/.github/workflows/lint-actions.yml
+++ b/.github/workflows/lint-actions.yml
@@ -14,3 +14,8 @@ jobs:
       - uses: reviewdog/action-actionlint@v1
         with:
           reporter: github-pr-review
+    permissions:
+      contents: read
+      checks: write
+      pull-requests: write
+      issues: write
diff --git a/.github/workflows/metadata-ingestion.yml b/.github/workflows/metadata-ingestion.yml
index 51b97552eb150a..cfb3693d89381f 100644
--- a/.github/workflows/metadata-ingestion.yml
+++ b/.github/workflows/metadata-ingestion.yml
@@ -46,14 +46,19 @@ jobs:
           - python-version: "3.10"
       fail-fast: false
     steps:
+      - name: Free up disk space
+        run: |
+          sudo apt-get remove 'dotnet-*' azure-cli || true
+          sudo rm -rf /usr/local/lib/android/ || true
+          sudo docker image prune -a -f || true
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v3
       - uses: acryldata/sane-checkout-action@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
@@ -62,7 +67,7 @@ jobs:
           path: |
             ~/.cache/uv
           key: ${{ runner.os }}-uv-${{ hashFiles('**/requirements.txt') }}
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
diff --git a/.github/workflows/metadata-io.yml b/.github/workflows/metadata-io.yml
index 6797c7ad67c0b6..e5e5f1dae5447d 100644
--- a/.github/workflows/metadata-io.yml
+++ b/.github/workflows/metadata-io.yml
@@ -47,14 +47,19 @@ jobs:
     timeout-minutes: 60
     needs: setup
     steps:
+      - name: Free up disk space
+        run: |
+          sudo apt-get remove 'dotnet-*' azure-cli || true
+          sudo rm -rf /usr/local/lib/android/ || true
+          sudo docker image prune -a -f || true
       - uses: acryldata/sane-checkout-action@v3
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         if: ${{ needs.setup.outputs.ingestion_change == 'true' }}
         with:
           python-version: "3.10"
diff --git a/.github/workflows/metadata-model.yml b/.github/workflows/metadata-model.yml
index 558b7c80f727c1..632e6ac35d673e 100644
--- a/.github/workflows/metadata-model.yml
+++ b/.github/workflows/metadata-model.yml
@@ -30,13 +30,13 @@ jobs:
     needs: setup
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v3
       - uses: acryldata/sane-checkout-action@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
           cache: "pip"
@@ -49,7 +49,7 @@ jobs:
         run: ./gradlew :metadata-ingestion:modelDocGen
       - name: Configure AWS Credentials
         if: ${{ needs.setup.outputs.publish == 'true' }}
-        uses: aws-actions/configure-aws-credentials@v3
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.ACRYL_CI_ARTIFACTS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.ACRYL_CI_ARTIFACTS_ACCESS_KEY }}
diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index 77874abedaabd0..a3d1b85df08188 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -30,14 +30,13 @@ jobs:
                 "treff7es",
                 "yoonhyejin",
                 "eboneil",
-                "ethan-cartwright",
                 "gabe-lyons",
                 "hsheth2",
                 "jjoyce0510",
                 "maggiehays",
-                "mrjefflewis",
                 "pedro93",
                 "RyanHolstien",
+                "sakethvarma397",
                 "Kunal-kankriya",
                 "purnimagarg1",
                 "dushayntAW",
@@ -45,7 +44,8 @@ jobs:
                 "kushagra-apptware",
                 "Salman-Apptware",
                 "mayurinehate",
-                "noggi"
+                "noggi",
+                "skrydal"
               ]'), 
               github.actor
             ) 
@@ -60,7 +60,6 @@ jobs:
           ${{ 
             contains(
               fromJson('[
-                "skrydal",
                 "siladitya2",
                 "sgomezvillamor",
                 "ngamanda",
diff --git a/.github/workflows/prefect-plugin.yml b/.github/workflows/prefect-plugin.yml
new file mode 100644
index 00000000000000..09af0ad3f354a3
--- /dev/null
+++ b/.github/workflows/prefect-plugin.yml
@@ -0,0 +1,86 @@
+name: Prefect Plugin
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - ".github/workflows/prefect-plugin.yml"
+      - "metadata-ingestion-modules/prefect-plugin/**"
+      - "metadata-ingestion/**"
+      - "metadata-models/**"
+  pull_request:
+    branches:
+      - "**"
+    paths:
+      - ".github/workflows/prefect-plugin.yml"
+      - "metadata-ingestion-modules/prefect-plugin/**"
+      - "metadata-ingestion/**"
+      - "metadata-models/**"
+  release:
+    types: [published]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  prefect-plugin:
+    runs-on: ubuntu-latest
+    env:
+      SPARK_VERSION: 3.0.3
+      DATAHUB_TELEMETRY_ENABLED: false
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10"]
+        include:
+          - python-version: "3.8"
+          - python-version: "3.9"
+          - python-version: "3.10"
+      fail-fast: false
+    steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: 17
+      - uses: gradle/gradle-build-action@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "pip"
+      - name: Install dependencies
+        run: ./metadata-ingestion/scripts/install_deps.sh
+      - name: Install prefect package
+        run: ./gradlew :metadata-ingestion-modules:prefect-plugin:lint :metadata-ingestion-modules:prefect-plugin:testQuick
+      - name: pip freeze show list installed
+        if: always()
+        run: source metadata-ingestion-modules/prefect-plugin/venv/bin/activate && pip freeze
+      - uses: actions/upload-artifact@v3
+        if: ${{ always() && matrix.python-version == '3.10'}}
+        with:
+          name: Test Results (Prefect Plugin ${{ matrix.python-version}})
+          path: |
+            **/build/reports/tests/test/**
+            **/build/test-results/test/**
+            **/junit.*.xml
+            !**/binary/**
+      - name: Upload coverage to Codecov
+        if: always()
+        uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          directory: .
+          fail_ci_if_error: false
+          flags: prefect,prefect-${{ matrix.extra_pip_extras }}
+          name: pytest-prefect-${{ matrix.python-version }}
+          verbose: true
+
+  event-file:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: Event File
+          path: ${{ github.event_path }}
diff --git a/.github/workflows/publish-datahub-jars.yml b/.github/workflows/publish-datahub-jars.yml
index 7137302c73564c..eb57c29e151ae6 100644
--- a/.github/workflows/publish-datahub-jars.yml
+++ b/.github/workflows/publish-datahub-jars.yml
@@ -45,17 +45,20 @@ jobs:
           echo "tag=$TAG" >> $GITHUB_OUTPUT
   publish:
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
     needs: ["check-secret", "setup"]
     if: ${{ needs.check-secret.outputs.publish-enabled == 'true' }}
     steps:
       - uses: acryldata/sane-checkout-action@v3
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
           cache: "pip"
diff --git a/.github/workflows/spark-smoke-test.yml b/.github/workflows/spark-smoke-test.yml
index 8ffc8420ba9413..23413336404f2b 100644
--- a/.github/workflows/spark-smoke-test.yml
+++ b/.github/workflows/spark-smoke-test.yml
@@ -31,12 +31,12 @@ jobs:
     steps:
       - uses: acryldata/sane-checkout-action@v3
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: 17
       - uses: gradle/actions/setup-gradle@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
           cache: "pip"
@@ -44,8 +44,11 @@ jobs:
         run: ./metadata-ingestion/scripts/install_deps.sh
       - name: Disk Check
         run: df -h . && docker images
-      - name: Remove images
-        run: docker image prune -a -f || true
+      - name: Free up disk space
+        run: |
+          sudo apt-get remove 'dotnet-*' azure-cli || true
+          sudo rm -rf /usr/local/lib/android/ || true
+          sudo docker image prune -a -f || true
       - name: Disk Check
         run: df -h . && docker images
       - name: Smoke test
diff --git a/.github/workflows/test-results.yml b/.github/workflows/test-results.yml
index c94a5fc340f473..23a80aab8082a5 100644
--- a/.github/workflows/test-results.yml
+++ b/.github/workflows/test-results.yml
@@ -2,7 +2,7 @@ name: Test Results
 
 on:
   workflow_run:
-    workflows: ["build & test", "metadata ingestion", "Airflow Plugin", "Dagster Plugin"]
+    workflows: ["build & test", "metadata ingestion", "Airflow Plugin", "Dagster Plugin", "Prefect Plugin", "GX Plugin"]
     types:
       - completed
 
@@ -10,6 +10,11 @@ jobs:
   unit-test-results:
     name: Unit Test Results
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      actions: read
+      checks: write
+      issues: read
     if: github.event.workflow_run.conclusion != 'skipped'
 
     steps:
diff --git a/README.md b/README.md
index b3c2e2d5459410..1089c4dbc055c4 100644
--- a/README.md
+++ b/README.md
@@ -108,6 +108,10 @@ We welcome contributions from the community. Please refer to our [Contributing G
 
 Join our [Slack workspace](https://datahubproject.io/slack?utm_source=github&utm_medium=readme&utm_campaign=github_readme) for discussions and important announcements. You can also find out more about our upcoming [town hall meetings](docs/townhalls.md) and view past recordings.
 
+## Security
+
+See [Security Stance](docs/SECURITY_STANCE.md) for information on DataHub's Security.
+
 ## Adoption
 
 Here are the companies that have officially adopted DataHub. Please feel free to add yours to the list if we missed it.
@@ -129,6 +133,7 @@ Here are the companies that have officially adopted DataHub. Please feel free to
 - [Haibo Technology](https://www.botech.com.cn)
 - [hipages](https://hipages.com.au/)
 - [inovex](https://www.inovex.de/)
+- [Inter&Co](https://inter.co/)
 - [IOMED](https://iomed.health)
 - [Klarna](https://www.klarna.com)
 - [LinkedIn](http://linkedin.com)
@@ -138,7 +143,7 @@ Here are the companies that have officially adopted DataHub. Please feel free to
 - [Peloton](https://www.onepeloton.com)
 - [PITS Global Data Recovery Services](https://www.pitsdatarecovery.net/)
 - [Razer](https://www.razer.com)
-- [Saxo Bank](https://www.home.saxo)
+- [Rippling](https://www.rippling.com/)
 - [Showroomprive](https://www.showroomprive.com/)
 - [SpotHero](https://spothero.com)
 - [Stash](https://www.stash.com)
@@ -154,6 +159,7 @@ Here are the companies that have officially adopted DataHub. Please feel free to
 - [Zynga](https://www.zynga.com)
 
 
+
 ## Select Articles & Talks
 
 - [DataHub Blog](https://blog.datahubproject.io/)
diff --git a/build.gradle b/build.gradle
index adb45705c0ebd0..fbced335ddc2e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,7 @@ buildscript {
   // Releases: https://github.com/linkedin/rest.li/blob/master/CHANGELOG.md
   ext.pegasusVersion = '29.57.0'
   ext.mavenVersion = '3.6.3'
-  ext.springVersion = '6.1.5'
+  ext.springVersion = '6.1.6'
   ext.springBootVersion = '3.2.6'
   ext.springKafkaVersion = '3.1.6'
   ext.openTelemetryVersion = '1.18.0'
@@ -49,7 +49,7 @@ buildscript {
   ext.log4jVersion = '2.23.1'
   ext.slf4jVersion = '1.7.36'
   ext.logbackClassic = '1.4.14'
-  ext.hadoop3Version = '3.3.5'
+  ext.hadoop3Version = '3.3.6'
   ext.kafkaVersion = '5.5.15'
   ext.hazelcastVersion = '5.3.6'
   ext.ebeanVersion = '12.16.1'
@@ -134,7 +134,7 @@ project.ext.externalDependency = [
     'elasticSearchRest': 'org.opensearch.client:opensearch-rest-high-level-client:' + elasticsearchVersion,
     'elasticSearchJava': 'org.opensearch.client:opensearch-java:2.6.0',
     'findbugsAnnotations': 'com.google.code.findbugs:annotations:3.0.1',
-    'graphqlJava': 'com.graphql-java:graphql-java:21.3',
+    'graphqlJava': 'com.graphql-java:graphql-java:21.5',
     'graphqlJavaScalars': 'com.graphql-java:graphql-java-extended-scalars:21.0',
     'gson': 'com.google.code.gson:gson:2.8.9',
     'guice': 'com.google.inject:guice:7.0.0',
diff --git a/datahub-frontend/app/auth/sso/oidc/OidcConfigs.java b/datahub-frontend/app/auth/sso/oidc/OidcConfigs.java
index 753edaf89d988f..080ca236630bf3 100644
--- a/datahub-frontend/app/auth/sso/oidc/OidcConfigs.java
+++ b/datahub-frontend/app/auth/sso/oidc/OidcConfigs.java
@@ -41,6 +41,8 @@ public class OidcConfigs extends SsoConfigs {
   public static final String OIDC_EXTRACT_JWT_ACCESS_TOKEN_CLAIMS =
       "auth.oidc.extractJwtAccessTokenClaims";
   public static final String OIDC_PREFERRED_JWS_ALGORITHM = "auth.oidc.preferredJwsAlgorithm";
+  public static final String OIDC_GRANT_TYPE = "auth.oidc.grantType";
+  public static final String OIDC_ACR_VALUES = "auth.oidc.acrValues";
 
   /** Default values */
   private static final String DEFAULT_OIDC_USERNAME_CLAIM = "email";
@@ -75,7 +77,9 @@ public class OidcConfigs extends SsoConfigs {
   private final Optional<String> customParamResource;
   private final String readTimeout;
   private final Optional<Boolean> extractJwtAccessTokenClaims;
-  private Optional<String> preferredJwsAlgorithm;
+  private final Optional<String> preferredJwsAlgorithm;
+  private final Optional<String> grantType;
+  private final Optional<String> acrValues;
 
   public OidcConfigs(Builder builder) {
     super(builder);
@@ -98,6 +102,8 @@ public OidcConfigs(Builder builder) {
     this.readTimeout = builder.readTimeout;
     this.extractJwtAccessTokenClaims = builder.extractJwtAccessTokenClaims;
     this.preferredJwsAlgorithm = builder.preferredJwsAlgorithm;
+    this.acrValues = builder.acrValues;
+    this.grantType = builder.grantType;
   }
 
   public static class Builder extends SsoConfigs.Builder<Builder> {
@@ -123,6 +129,8 @@ public static class Builder extends SsoConfigs.Builder<Builder> {
     private String readTimeout = DEFAULT_OIDC_READ_TIMEOUT;
     private Optional<Boolean> extractJwtAccessTokenClaims = Optional.empty();
     private Optional<String> preferredJwsAlgorithm = Optional.empty();
+    private Optional<String> grantType = Optional.empty();
+    private Optional<String> acrValues = Optional.empty();
 
     public Builder from(final com.typesafe.config.Config configs) {
       super.from(configs);
@@ -169,6 +177,8 @@ public Builder from(final com.typesafe.config.Config configs) {
           getOptional(configs, OIDC_EXTRACT_JWT_ACCESS_TOKEN_CLAIMS).map(Boolean::parseBoolean);
       preferredJwsAlgorithm =
           Optional.ofNullable(getOptional(configs, OIDC_PREFERRED_JWS_ALGORITHM, null));
+      grantType = Optional.ofNullable(getOptional(configs, OIDC_GRANT_TYPE, null));
+      acrValues = Optional.ofNullable(getOptional(configs, OIDC_ACR_VALUES, null));
       return this;
     }
 
diff --git a/datahub-frontend/app/auth/sso/oidc/OidcProvider.java b/datahub-frontend/app/auth/sso/oidc/OidcProvider.java
index 39a65a46cbf919..a8a3205e8299c8 100644
--- a/datahub-frontend/app/auth/sso/oidc/OidcProvider.java
+++ b/datahub-frontend/app/auth/sso/oidc/OidcProvider.java
@@ -3,6 +3,8 @@
 import auth.sso.SsoProvider;
 import auth.sso.oidc.custom.CustomOidcClient;
 import com.google.common.collect.ImmutableMap;
+import java.util.HashMap;
+import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
 import org.pac4j.core.client.Client;
 import org.pac4j.core.http.callback.PathParameterCallbackUrlResolver;
@@ -64,9 +66,19 @@ private Client<OidcCredentials> createPac4jClient() {
     _oidcConfigs.getResponseType().ifPresent(oidcConfiguration::setResponseType);
     _oidcConfigs.getResponseMode().ifPresent(oidcConfiguration::setResponseMode);
     _oidcConfigs.getUseNonce().ifPresent(oidcConfiguration::setUseNonce);
+    Map<String, String> customParamsMap = new HashMap<>();
     _oidcConfigs
         .getCustomParamResource()
-        .ifPresent(value -> oidcConfiguration.setCustomParams(ImmutableMap.of("resource", value)));
+        .ifPresent(value -> customParamsMap.put("resource", value));
+    _oidcConfigs
+        .getGrantType()
+        .ifPresent(value -> customParamsMap.put("grant_type", value));
+    _oidcConfigs
+        .getAcrValues()
+        .ifPresent(value -> customParamsMap.put("acr_values", value));
+    if (!customParamsMap.isEmpty()) {
+      oidcConfiguration.setCustomParams(customParamsMap);
+    }
     _oidcConfigs
         .getPreferredJwsAlgorithm()
         .ifPresent(
diff --git a/datahub-frontend/app/client/KafkaTrackingProducer.java b/datahub-frontend/app/client/KafkaTrackingProducer.java
index b7173684b63500..058e75100c24ac 100644
--- a/datahub-frontend/app/client/KafkaTrackingProducer.java
+++ b/datahub-frontend/app/client/KafkaTrackingProducer.java
@@ -1,5 +1,6 @@
 package client;
 
+import com.linkedin.metadata.config.kafka.KafkaConfiguration;
 import com.linkedin.metadata.config.kafka.ProducerConfiguration;
 import com.typesafe.config.Config;
 import config.ConfigurationProvider;
@@ -46,7 +47,7 @@ public KafkaTrackingProducer(
 
     if (_isEnabled) {
       _logger.debug("Analytics tracking is enabled");
-      _producer = createKafkaProducer(config, configurationProvider.getKafka().getProducer());
+      _producer = createKafkaProducer(config, configurationProvider.getKafka());
 
       lifecycle.addStopHook(
           () -> {
@@ -69,7 +70,8 @@ public void send(ProducerRecord<String, String> record) {
   }
 
   private static KafkaProducer createKafkaProducer(
-      Config config, ProducerConfiguration producerConfiguration) {
+      Config config, KafkaConfiguration kafkaConfiguration) {
+    final ProducerConfiguration producerConfiguration = kafkaConfiguration.getProducer();
     final Properties props = new Properties();
     props.put(ProducerConfig.CLIENT_ID_CONFIG, "datahub-frontend");
     props.put(
@@ -78,12 +80,9 @@ private static KafkaProducer createKafkaProducer(
     props.put(
         ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
         config.getString("analytics.kafka.bootstrap.server"));
-    props.put(
-        ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
-        "org.apache.kafka.common.serialization.StringSerializer"); // Actor urn.
-    props.put(
-        ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
-        "org.apache.kafka.common.serialization.StringSerializer"); // JSON object.
+    // key: Actor urn.
+    // value: JSON object.
+    props.putAll(kafkaConfiguration.getSerde().getUsageEvent().getProducerProperties(null));
     props.put(ProducerConfig.MAX_REQUEST_SIZE_CONFIG, producerConfiguration.getMaxRequestSize());
     props.put(ProducerConfig.COMPRESSION_TYPE_CONFIG, producerConfiguration.getCompressionType());
 
diff --git a/datahub-frontend/app/controllers/Application.java b/datahub-frontend/app/controllers/Application.java
index d17e600aadc072..017847367de053 100644
--- a/datahub-frontend/app/controllers/Application.java
+++ b/datahub-frontend/app/controllers/Application.java
@@ -9,12 +9,15 @@
 import akka.util.ByteString;
 import auth.Authenticator;
 import com.datahub.authentication.AuthenticationConstants;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.linkedin.util.Pair;
 import com.typesafe.config.Config;
 import java.io.InputStream;
 import java.net.URI;
 import java.time.Duration;
+import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -33,6 +36,7 @@
 import play.libs.ws.StandaloneWSClient;
 import play.libs.ws.ahc.StandaloneAhcWSClient;
 import play.mvc.Controller;
+import play.mvc.Http.Cookie;
 import play.mvc.Http;
 import play.mvc.ResponseHeader;
 import play.mvc.Result;
@@ -132,6 +136,9 @@ public CompletableFuture<Result> proxy(String path, Http.Request request)
       headers.put(Http.HeaderNames.X_FORWARDED_PROTO, List.of(schema));
     }
 
+    // Get the current time to measure the duration of the request
+    Instant start = Instant.now();
+
     return _ws.url(
             String.format(
                 "%s://%s:%s%s", protocol, metadataServiceHost, metadataServicePort, resolvedUri))
@@ -160,6 +167,15 @@ AuthenticationConstants.LEGACY_X_DATAHUB_ACTOR_HEADER, getDataHubActorHeader(req
         .execute()
         .thenApply(
             apiResponse -> {
+              // Log the query if it takes longer than the configured threshold and verbose logging is enabled
+              boolean verboseGraphQLLogging = _config.getBoolean("graphql.verbose.logging");
+              int verboseGraphQLLongQueryMillis = _config.getInt("graphql.verbose.slowQueryMillis");
+              Instant finish = Instant.now();
+              long timeElapsed = Duration.between(start, finish).toMillis();
+              if (verboseGraphQLLogging && timeElapsed >= verboseGraphQLLongQueryMillis) {
+                logSlowQuery(request, resolvedUri, timeElapsed);
+              }
+
               final ResponseHeader header =
                   new ResponseHeader(
                       apiResponse.getStatus(),
@@ -359,4 +375,34 @@ private String mapPath(@Nonnull final String path) {
     // Otherwise, return original path
     return path;
   }
+
+
+  /**
+   * Called if verbose logging is enabled and request takes longer that the slow query milliseconds defined in the config
+   * @param request GraphQL request that was made
+   * @param resolvedUri URI that was requested
+   * @param duration How long the query took to complete
+   */
+  private void logSlowQuery(Http.Request request, String resolvedUri, float duration) {
+    StringBuilder jsonBody = new StringBuilder();
+    Optional<Cookie> actorCookie = request.getCookie("actor");
+    String actorValue = actorCookie.isPresent() ? actorCookie.get().value() : "N/A";
+
+    try {
+      ObjectMapper mapper = new ObjectMapper();
+      JsonNode jsonNode = request.body().asJson();
+      ((ObjectNode) jsonNode).remove("query");
+      jsonBody.append(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonNode));
+    }
+    catch (Exception e) {
+      _logger.info("GraphQL Request Received: {}, Unable to parse JSON body", resolvedUri);
+    }
+    String jsonBodyStr = jsonBody.toString();
+    _logger.info("Slow GraphQL Request Received: {}, Request query string: {}, Request actor: {}, Request JSON: {}, Request completed in {} ms",
+            resolvedUri,
+            request.queryString(),
+            actorValue,
+            jsonBodyStr,
+            duration);
+  }
 }
diff --git a/datahub-frontend/app/controllers/SsoCallbackController.java b/datahub-frontend/app/controllers/SsoCallbackController.java
index 5e30bf976b8196..750886570bf406 100644
--- a/datahub-frontend/app/controllers/SsoCallbackController.java
+++ b/datahub-frontend/app/controllers/SsoCallbackController.java
@@ -66,7 +66,8 @@ public SsoCallbackController(
 
   public CompletionStage<Result> handleCallback(String protocol, Http.Request request) {
     if (shouldHandleCallback(protocol)) {
-      log.debug(String.format("Handling SSO callback. Protocol: %s", protocol));
+      log.debug("Handling SSO callback. Protocol: {}",
+        _ssoManager.getSsoProvider().protocol().getCommonName());
       return callback(request)
           .handle(
               (res, e) -> {
diff --git a/datahub-frontend/app/utils/SearchUtil.java b/datahub-frontend/app/utils/SearchUtil.java
index 803c70a63646a0..cfbf11c2ffa85a 100644
--- a/datahub-frontend/app/utils/SearchUtil.java
+++ b/datahub-frontend/app/utils/SearchUtil.java
@@ -20,7 +20,7 @@ private SearchUtil() {
   @Nonnull
   public static String escapeForwardSlash(@Nonnull String input) {
     if (input.contains("/")) {
-      input = input.replace("/", "\\\\/");
+      input = input.replace("/", "\\/");
     }
     return input;
   }
diff --git a/datahub-frontend/conf/application.conf b/datahub-frontend/conf/application.conf
index dc243ecadafd82..be57a33b13564d 100644
--- a/datahub-frontend/conf/application.conf
+++ b/datahub-frontend/conf/application.conf
@@ -186,6 +186,8 @@ auth.oidc.customParam.resource = ${?AUTH_OIDC_CUSTOM_PARAM_RESOURCE}
 auth.oidc.readTimeout = ${?AUTH_OIDC_READ_TIMEOUT}
 auth.oidc.extractJwtAccessTokenClaims = ${?AUTH_OIDC_EXTRACT_JWT_ACCESS_TOKEN_CLAIMS} # Whether to extract claims from JWT access token.  Defaults to false.
 auth.oidc.preferredJwsAlgorithm = ${?AUTH_OIDC_PREFERRED_JWS_ALGORITHM} # Which jws algorithm to use
+auth.oidc.acrValues = ${?AUTH_OIDC_ACR_VALUES}
+auth.oidc.grantType = ${?AUTH_OIDC_GRANT_TYPE}
 
 #
 # By default, the callback URL that should be registered with the identity provider is computed as {$baseUrl}/callback/oidc.
@@ -296,4 +298,10 @@ entityClient.numRetries = ${?ENTITY_CLIENT_NUM_RETRIES}
 entityClient.restli.get.batchSize = 50
 entityClient.restli.get.batchSize = ${?ENTITY_CLIENT_RESTLI_GET_BATCH_SIZE}
 entityClient.restli.get.batchConcurrency = 2
-entityClient.restli.get.batchConcurrency = ${?ENTITY_CLIENT_RESTLI_GET_BATCH_CONCURRENCY}
\ No newline at end of file
+entityClient.restli.get.batchConcurrency = ${?ENTITY_CLIENT_RESTLI_GET_BATCH_CONCURRENCY}
+
+# Enable verbose authentication logging
+graphql.verbose.logging = false
+graphql.verbose.logging = ${?GRAPHQL_VERBOSE_LOGGING}
+graphql.verbose.slowQueryMillis = 2500
+graphql.verbose.slowQueryMillis = ${?GRAPHQL_VERBOSE_LONG_QUERY_MILLIS}
\ No newline at end of file
diff --git a/datahub-frontend/test/utils/SearchUtilTest.java b/datahub-frontend/test/utils/SearchUtilTest.java
index 6767fa56374692..2efc4420c7f766 100644
--- a/datahub-frontend/test/utils/SearchUtilTest.java
+++ b/datahub-frontend/test/utils/SearchUtilTest.java
@@ -8,10 +8,10 @@ public class SearchUtilTest {
   @Test
   public void testEscapeForwardSlash() {
     // escape "/"
-    assertEquals("\\\\/foo\\\\/bar", SearchUtil.escapeForwardSlash("/foo/bar"));
+    assertEquals("\\/foo\\/bar", SearchUtil.escapeForwardSlash("/foo/bar"));
     // "/" is escaped but "*" is not escaped and is treated as regex. Since currently we want to
     // retain the regex behaviour with "*"
-    assertEquals("\\\\/foo\\\\/bar\\\\/*", SearchUtil.escapeForwardSlash("/foo/bar/*"));
+    assertEquals("\\/foo\\/bar\\/*", SearchUtil.escapeForwardSlash("/foo/bar/*"));
     assertEquals("", "");
     assertEquals("foo", "foo");
   }
diff --git a/datahub-graphql-core/build.gradle b/datahub-graphql-core/build.gradle
index de264ce31b719b..49a7fa7fbfbc2f 100644
--- a/datahub-graphql-core/build.gradle
+++ b/datahub-graphql-core/build.gradle
@@ -22,6 +22,7 @@ dependencies {
     implementation externalDependency.opentelemetryAnnotations
 
     implementation externalDependency.slf4jApi
+    implementation externalDependency.springContext
     compileOnly externalDependency.lombok
     annotationProcessor externalDependency.lombok
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/Constants.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/Constants.java
index f70c46ba943a5a..69306862a46ef7 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/Constants.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/Constants.java
@@ -24,6 +24,7 @@ private Constants() {}
   public static final String PROPERTIES_SCHEMA_FILE = "properties.graphql";
   public static final String FORMS_SCHEMA_FILE = "forms.graphql";
   public static final String ASSERTIONS_SCHEMA_FILE = "assertions.graphql";
+  public static final String COMMON_SCHEMA_FILE = "common.graphql";
   public static final String INCIDENTS_SCHEMA_FILE = "incident.graphql";
   public static final String CONTRACTS_SCHEMA_FILE = "contract.graphql";
   public static final String CONNECTIONS_SCHEMA_FILE = "connection.graphql";
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
index b751849859be47..de77ff9444c6e7 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
@@ -96,6 +96,7 @@
 import com.linkedin.datahub.graphql.generated.MLPrimaryKey;
 import com.linkedin.datahub.graphql.generated.MLPrimaryKeyProperties;
 import com.linkedin.datahub.graphql.generated.MatchedField;
+import com.linkedin.datahub.graphql.generated.MetadataAttribution;
 import com.linkedin.datahub.graphql.generated.Notebook;
 import com.linkedin.datahub.graphql.generated.Owner;
 import com.linkedin.datahub.graphql.generated.OwnershipTypeEntity;
@@ -284,6 +285,8 @@
 import com.linkedin.datahub.graphql.resolvers.search.SearchAcrossEntitiesResolver;
 import com.linkedin.datahub.graphql.resolvers.search.SearchAcrossLineageResolver;
 import com.linkedin.datahub.graphql.resolvers.search.SearchResolver;
+import com.linkedin.datahub.graphql.resolvers.settings.docPropagation.DocPropagationSettingsResolver;
+import com.linkedin.datahub.graphql.resolvers.settings.docPropagation.UpdateDocPropagationSettingsResolver;
 import com.linkedin.datahub.graphql.resolvers.settings.user.UpdateCorpUserViewsSettingsResolver;
 import com.linkedin.datahub.graphql.resolvers.settings.view.GlobalViewsSettingsResolver;
 import com.linkedin.datahub.graphql.resolvers.settings.view.UpdateGlobalViewsSettingsResolver;
@@ -695,7 +698,8 @@ public GmsGraphQLEngine(final GmsGraphQLEngineArgs args) {
                 businessAttributeType));
     this.loadableTypes = new ArrayList<>(entityTypes);
     // Extend loadable types with types from the plugins
-    // This allows us to offer search and browse capabilities out of the box for those types
+    // This allows us to offer search and browse capabilities out of the box for
+    // those types
     for (GmsGraphQLPlugin plugin : this.graphQLPlugins) {
       this.entityTypes.addAll(plugin.getEntityTypes());
       Collection<? extends LoadableType<?, ?>> pluginLoadableTypes = plugin.getLoadableTypes();
@@ -720,7 +724,7 @@ public GmsGraphQLEngine(final GmsGraphQLEngineArgs args) {
    * Returns a {@link Supplier} responsible for creating a new {@link DataLoader} from a {@link
    * LoadableType}.
    */
-  public Map<String, Function<QueryContext, DataLoader<?, ?>>> loaderSuppliers(
+  public static Map<String, Function<QueryContext, DataLoader<?, ?>>> loaderSuppliers(
       final Collection<? extends LoadableType<?, ?>> loadableTypes) {
     return loadableTypes.stream()
         .collect(
@@ -790,6 +794,7 @@ public void configureRuntimeWiring(final RuntimeWiring.Builder builder) {
     configureBusinessAttributeAssociationResolver(builder);
     configureConnectionResolvers(builder);
     configureDeprecationResolvers(builder);
+    configureMetadataAttributionResolver(builder);
   }
 
   private void configureOrganisationRoleResolvers(RuntimeWiring.Builder builder) {
@@ -843,7 +848,8 @@ public GraphQLEngine.Builder builder() {
         .addSchema(fileBasedSchema(CONNECTIONS_SCHEMA_FILE))
         .addSchema(fileBasedSchema(ASSERTIONS_SCHEMA_FILE))
         .addSchema(fileBasedSchema(INCIDENTS_SCHEMA_FILE))
-        .addSchema(fileBasedSchema(CONTRACTS_SCHEMA_FILE));
+        .addSchema(fileBasedSchema(CONTRACTS_SCHEMA_FILE))
+        .addSchema(fileBasedSchema(COMMON_SCHEMA_FILE));
 
     for (GmsGraphQLPlugin plugin : this.graphQLPlugins) {
       List<String> pluginSchemaFiles = plugin.getSchemaFiles();
@@ -1026,6 +1032,8 @@ private void configureQueryResolvers(final RuntimeWiring.Builder builder) {
                 .dataFetcher("mlModel", getResolver(mlModelType))
                 .dataFetcher("mlModelGroup", getResolver(mlModelGroupType))
                 .dataFetcher("assertion", getResolver(assertionType))
+                .dataFetcher("form", getResolver(formType))
+                .dataFetcher("view", getResolver(dataHubViewType))
                 .dataFetcher("listPolicies", new ListPoliciesResolver(this.entityClient))
                 .dataFetcher("getGrantedPrivileges", new GetGrantedPrivilegesResolver())
                 .dataFetcher("listUsers", new ListUsersResolver(this.entityClient))
@@ -1087,8 +1095,10 @@ private void configureQueryResolvers(final RuntimeWiring.Builder builder) {
                     new BrowseV2Resolver(this.entityClient, this.viewService, this.formService))
                 .dataFetcher("businessAttribute", getResolver(businessAttributeType))
                 .dataFetcher(
-                    "listBusinessAttributes",
-                    new ListBusinessAttributesResolver(this.entityClient)));
+                    "listBusinessAttributes", new ListBusinessAttributesResolver(this.entityClient))
+                .dataFetcher(
+                    "docPropagationSettings",
+                    new DocPropagationSettingsResolver(this.settingsService)));
   }
 
   private DataFetcher getEntitiesResolver() {
@@ -1125,16 +1135,16 @@ private DataFetcher getEntityResolver() {
         });
   }
 
-  private DataFetcher getResolver(LoadableType<?, String> loadableType) {
-    return getResolver(loadableType, this::getUrnField);
+  private static DataFetcher getResolver(LoadableType<?, String> loadableType) {
+    return getResolver(loadableType, GmsGraphQLEngine::getUrnField);
   }
 
-  private <T, K> DataFetcher getResolver(
+  private static <T, K> DataFetcher getResolver(
       LoadableType<T, K> loadableType, Function<DataFetchingEnvironment, K> keyProvider) {
     return new LoadableTypeResolver<>(loadableType, keyProvider);
   }
 
-  private String getUrnField(DataFetchingEnvironment env) {
+  private static String getUrnField(DataFetchingEnvironment env) {
     return env.getArgument(URN_FIELD_NAME);
   }
 
@@ -1340,7 +1350,11 @@ private void configureMutationResolvers(final RuntimeWiring.Builder builder) {
               .dataFetcher(
                   "createForm", new CreateFormResolver(this.entityClient, this.formService))
               .dataFetcher("deleteForm", new DeleteFormResolver(this.entityClient))
-              .dataFetcher("updateForm", new UpdateFormResolver(this.entityClient));
+              .dataFetcher("updateForm", new UpdateFormResolver(this.entityClient))
+              .dataFetcher(
+                  "updateDocPropagationSettings",
+                  new UpdateDocPropagationSettingsResolver(this.settingsService));
+
           if (featureFlags.isBusinessAttributeEntityEnabled()) {
             typeWiring
                 .dataFetcher(
@@ -1869,7 +1883,9 @@ private void configureCorpGroupResolvers(final RuntimeWiring.Builder builder) {
         "CorpGroup",
         typeWiring ->
             typeWiring
-                .dataFetcher("relationships", new EntityRelationshipsResultResolver(graphClient))
+                .dataFetcher(
+                    "relationships",
+                    new EntityRelationshipsResultResolver(graphClient, entityService))
                 .dataFetcher("privileges", new EntityPrivilegesResolver(entityClient))
                 .dataFetcher(
                     "aspects", new WeaklyTypedAspectsResolver(entityClient, entityRegistry))
@@ -2712,9 +2728,11 @@ private void configureFormResolvers(final RuntimeWiring.Builder builder) {
                         corpUserType,
                         (env) -> {
                           final FormActorAssignment actors = env.getSource();
-                          return actors.getUsers().stream()
-                              .map(CorpUser::getUrn)
-                              .collect(Collectors.toList());
+                          return actors.getUsers() != null
+                              ? actors.getUsers().stream()
+                                  .map(CorpUser::getUrn)
+                                  .collect(Collectors.toList())
+                              : null;
                         }))
                 .dataFetcher(
                     "groups",
@@ -2722,9 +2740,11 @@ private void configureFormResolvers(final RuntimeWiring.Builder builder) {
                         corpGroupType,
                         (env) -> {
                           final FormActorAssignment actors = env.getSource();
-                          return actors.getGroups().stream()
-                              .map(CorpGroup::getUrn)
-                              .collect(Collectors.toList());
+                          return actors.getGroups() != null
+                              ? actors.getGroups().stream()
+                                  .map(CorpGroup::getUrn)
+                                  .collect(Collectors.toList())
+                              : null;
                         }))
                 .dataFetcher("isAssignedToMe", new IsFormAssignedToMeResolver(groupService)));
   }
@@ -2821,7 +2841,8 @@ private void configureContractResolvers(final RuntimeWiring.Builder builder) {
   }
 
   private void configurePolicyResolvers(final RuntimeWiring.Builder builder) {
-    // Register resolvers for "resolvedUsers" and "resolvedGroups" field of the Policy type.
+    // Register resolvers for "resolvedUsers" and "resolvedGroups" field of the
+    // Policy type.
     builder.type(
         "ActorFilter",
         typeWiring ->
@@ -3004,7 +3025,7 @@ private void configureTestResultResolvers(final RuntimeWiring.Builder builder) {
                     })));
   }
 
-  private <T, K> DataLoader<K, DataFetcherResult<T>> createDataLoader(
+  private static <T, K> DataLoader<K, DataFetcherResult<T>> createDataLoader(
       final LoadableType<T, K> graphType, final QueryContext queryContext) {
     BatchLoaderContextProvider contextProvider = () -> queryContext;
     DataLoaderOptions loaderOptions =
@@ -3174,4 +3195,20 @@ private void configureDeprecationResolvers(final RuntimeWiring.Builder builder)
                 new EntityTypeResolver(
                     entityTypes, (env) -> ((Deprecation) env.getSource()).getActorEntity())));
   }
+
+  private void configureMetadataAttributionResolver(final RuntimeWiring.Builder builder) {
+    builder.type(
+        "MetadataAttribution",
+        typeWiring ->
+            typeWiring
+                .dataFetcher(
+                    "actor",
+                    new EntityTypeResolver(
+                        entityTypes, (env) -> ((MetadataAttribution) env.getSource()).getActor()))
+                .dataFetcher(
+                    "source",
+                    new EntityTypeResolver(
+                        entityTypes,
+                        (env) -> ((MetadataAttribution) env.getSource()).getSource())));
+  }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GraphQLEngine.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GraphQLEngine.java
index dd8eabd3ce06fd..97e282c106a9a2 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GraphQLEngine.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GraphQLEngine.java
@@ -28,7 +28,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.dataloader.DataLoader;
-import org.dataloader.DataLoaderRegistry;
 
 /**
  * Simple wrapper around a {@link GraphQL} instance providing APIs for building an engine and
@@ -100,7 +99,7 @@ public ExecutionResult execute(
     /*
      * Init DataLoaderRegistry - should be created for each request.
      */
-    DataLoaderRegistry register = createDataLoaderRegistry(_dataLoaderSuppliers, context);
+    LazyDataLoaderRegistry register = new LazyDataLoaderRegistry(context, _dataLoaderSuppliers);
 
     /*
      * Construct execution input
@@ -218,14 +217,4 @@ public GraphQLEngine build() {
           graphQLQueryIntrospectionEnabled);
     }
   }
-
-  private DataLoaderRegistry createDataLoaderRegistry(
-      final Map<String, Function<QueryContext, DataLoader<?, ?>>> dataLoaderSuppliers,
-      final QueryContext context) {
-    final DataLoaderRegistry registry = new DataLoaderRegistry();
-    for (String key : dataLoaderSuppliers.keySet()) {
-      registry.register(key, dataLoaderSuppliers.get(key).apply(context));
-    }
-    return registry;
-  }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/LazyDataLoaderRegistry.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/LazyDataLoaderRegistry.java
new file mode 100644
index 00000000000000..1a1d2d5f71f336
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/LazyDataLoaderRegistry.java
@@ -0,0 +1,53 @@
+package com.linkedin.datahub.graphql;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import lombok.extern.slf4j.Slf4j;
+import org.dataloader.DataLoader;
+import org.dataloader.DataLoaderRegistry;
+
+/**
+ * The purpose of this class is to avoid loading 42+ dataLoaders when many of the graphql queries do
+ * not use all of them.
+ */
+@Slf4j
+public class LazyDataLoaderRegistry extends DataLoaderRegistry {
+  private final QueryContext queryContext;
+  private final Map<String, Function<QueryContext, DataLoader<?, ?>>> dataLoaderSuppliers;
+
+  public LazyDataLoaderRegistry(
+      QueryContext queryContext,
+      Map<String, Function<QueryContext, DataLoader<?, ?>>> dataLoaderSuppliers) {
+    super();
+    this.queryContext = queryContext;
+    this.dataLoaderSuppliers = new ConcurrentHashMap<>(dataLoaderSuppliers);
+  }
+
+  @Override
+  public <K, V> DataLoader<K, V> getDataLoader(String key) {
+    return super.computeIfAbsent(
+        key,
+        k -> {
+          Function<QueryContext, DataLoader<?, ?>> supplier = dataLoaderSuppliers.get(key);
+          if (supplier == null) {
+            throw new IllegalArgumentException("No DataLoader registered for key: " + key);
+          }
+          return supplier.apply(queryContext);
+        });
+  }
+
+  @Override
+  public Set<String> getKeys() {
+    return Stream.concat(dataLoaders.keySet().stream(), dataLoaderSuppliers.keySet().stream())
+        .collect(Collectors.toSet());
+  }
+
+  @Override
+  public DataLoaderRegistry combine(DataLoaderRegistry registry) {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/QueryContext.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/QueryContext.java
index 7dffd90cf2d7cc..5ad82b5d703757 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/QueryContext.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/QueryContext.java
@@ -3,6 +3,7 @@
 import com.datahub.authentication.Actor;
 import com.datahub.authentication.Authentication;
 import com.datahub.plugins.auth.authorization.Authorizer;
+import com.linkedin.metadata.config.DataHubAppConfiguration;
 import io.datahubproject.metadata.context.OperationContext;
 
 /** Provided as input to GraphQL resolvers; used to carry information about GQL request context. */
@@ -31,4 +32,6 @@ default String getActorUrn() {
    * @return Returns the operational context
    */
   OperationContext getOperationContext();
+
+  DataHubAppConfiguration getDataHubAppConfig();
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetChartsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetChartsResolver.java
index 767c9b4d4e71bc..4847aea224ccd6 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetChartsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetChartsResolver.java
@@ -159,9 +159,10 @@ private SearchResult searchForNewUsers(@Nonnull final OperationContext opContext
                                             .setValue(
                                                 String.valueOf(
                                                     trailingMonthDateRange.getStart())))))))),
-        new SortCriterion()
-            .setField(CORP_USER_STATUS_LAST_MODIFIED_FIELD_NAME)
-            .setOrder(SortOrder.DESCENDING),
+        Collections.singletonList(
+            new SortCriterion()
+                .setField(CORP_USER_STATUS_LAST_MODIFIED_FIELD_NAME)
+                .setOrder(SortOrder.DESCENDING)),
         0,
         100);
   }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetMetadataAnalyticsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetMetadataAnalyticsResolver.java
index 01f2e6c8462e39..6045b1e726c7a5 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetMetadataAnalyticsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetMetadataAnalyticsResolver.java
@@ -77,7 +77,8 @@ private List<AnalyticsChart> getCharts(MetadataAnalyticsInput input, OperationCo
     }
 
     SearchResult searchResult =
-        _entityClient.searchAcrossEntities(opContext, entities, query, filter, 0, 0, null, null);
+        _entityClient.searchAcrossEntities(
+            opContext, entities, query, filter, 0, 0, Collections.emptyList(), null);
 
     List<AggregationMetadata> aggregationMetadataList =
         searchResult.getMetadata().getAggregations();
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/authorization/AuthorizationUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/authorization/AuthorizationUtils.java
index b9b4e4f4ef292b..4fb49d79a0aa70 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/authorization/AuthorizationUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/authorization/AuthorizationUtils.java
@@ -398,6 +398,11 @@ public static boolean canManageForms(@Nonnull QueryContext context) {
         PoliciesConfig.MANAGE_DOCUMENTATION_FORMS_PRIVILEGE);
   }
 
+  public static boolean canManageFeatures(@Nonnull QueryContext context) {
+    return AuthUtil.isAuthorized(
+        context.getAuthorizer(), context.getActorUrn(), PoliciesConfig.MANAGE_FEATURES_PRIVILEGE);
+  }
+
   public static boolean isAuthorized(
       @Nonnull Authorizer authorizer,
       @Nonnull String actor,
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ResolverUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ResolverUtils.java
index 3617eb47259797..d34fd9f32d322e 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ResolverUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ResolverUtils.java
@@ -7,7 +7,6 @@
 import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableSet;
-import com.linkedin.common.urn.Urn;
 import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.data.template.StringArray;
 import com.linkedin.datahub.graphql.QueryContext;
@@ -23,7 +22,6 @@
 import com.linkedin.metadata.query.filter.CriterionArray;
 import com.linkedin.metadata.query.filter.Filter;
 import com.linkedin.metadata.search.utils.ESUtils;
-import com.linkedin.metadata.search.utils.QueryUtils;
 import com.linkedin.metadata.service.ViewService;
 import com.linkedin.view.DataHubViewInfo;
 import graphql.schema.DataFetchingEnvironment;
@@ -72,7 +70,7 @@ public static <T> T bindArgument(Object argument, Class<T> clazz) {
   @Nonnull
   public static String escapeForwardSlash(@Nonnull String input) {
     if (input.contains("/")) {
-      input = input.replace("/", "\\\\/");
+      input = input.replace("/", "\\/");
     }
     return input;
   }
@@ -222,27 +220,6 @@ private static String getFilterField(
     return ESUtils.toKeywordField(originalField, skipKeywordSuffix, aspectRetriever);
   }
 
-  public static Filter buildFilterWithUrns(@Nonnull Set<Urn> urns, @Nullable Filter inputFilters) {
-    Criterion urnMatchCriterion =
-        new Criterion()
-            .setField("urn")
-            .setValue("")
-            .setValues(
-                new StringArray(urns.stream().map(Object::toString).collect(Collectors.toList())));
-    if (inputFilters == null) {
-      return QueryUtils.newFilter(urnMatchCriterion);
-    }
-
-    // Add urn match criterion to each or clause
-    if (inputFilters.getOr() != null && !inputFilters.getOr().isEmpty()) {
-      for (ConjunctiveCriterion conjunctiveCriterion : inputFilters.getOr()) {
-        conjunctiveCriterion.getAnd().add(urnMatchCriterion);
-      }
-      return inputFilters;
-    }
-    return QueryUtils.newFilter(urnMatchCriterion);
-  }
-
   public static Filter viewFilter(
       OperationContext opContext, ViewService viewService, String viewUrn) {
     if (viewUrn == null) {
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/assertion/UpsertCustomAssertionResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/assertion/UpsertCustomAssertionResolver.java
index 026f486e32c116..29a9fff5e013a0 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/assertion/UpsertCustomAssertionResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/assertion/UpsertCustomAssertionResolver.java
@@ -101,7 +101,7 @@ private CustomAssertionInfo createCustomAssertionInfo(
 
     if (input.getFieldPath() != null) {
       customAssertionInfo.setField(
-          SchemaFieldUtils.generateSchemaFieldUrn(entityUrn.toString(), input.getFieldPath()));
+          SchemaFieldUtils.generateSchemaFieldUrn(entityUrn, input.getFieldPath()));
     }
     return customAssertionInfo;
   }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/DebugAccessResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/DebugAccessResolver.java
index 44604e92c35ded..8372b6b5126a3e 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/DebugAccessResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/DebugAccessResolver.java
@@ -33,6 +33,7 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -181,7 +182,7 @@ private Set<Urn> getPoliciesFor(
             Constants.POLICY_ENTITY_NAME,
             "",
             buildFilterToGetPolicies(user, groups, roles),
-            sortCriterion,
+            Collections.singletonList(sortCriterion),
             0,
             10000)
         .getEntities()
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/ListAccessTokensResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/ListAccessTokensResolver.java
index dc57ed3c673c16..e0ecebbbc7bc2e 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/ListAccessTokensResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/ListAccessTokensResolver.java
@@ -59,10 +59,11 @@ public CompletableFuture<ListAccessTokenResult> get(DataFetchingEnvironment envi
           if (AuthorizationUtils.canManageTokens(context)
               || isListingSelfTokens(filters, context)) {
             try {
-              final SortCriterion sortCriterion =
-                  new SortCriterion()
-                      .setField(EXPIRES_AT_FIELD_NAME)
-                      .setOrder(SortOrder.DESCENDING);
+              final List<SortCriterion> sortCriteria =
+                  Collections.singletonList(
+                      new SortCriterion()
+                          .setField(EXPIRES_AT_FIELD_NAME)
+                          .setOrder(SortOrder.DESCENDING));
               final SearchResult searchResult =
                   _entityClient.search(
                       context
@@ -74,7 +75,7 @@ public CompletableFuture<ListAccessTokenResult> get(DataFetchingEnvironment envi
                           filters,
                           Collections.emptyList(),
                           context.getOperationContext().getAspectRetriever()),
-                      sortCriterion,
+                      sortCriteria,
                       start,
                       count);
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/RevokeAccessTokenResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/RevokeAccessTokenResolver.java
index 53ae6d4509e7df..eb152087699024 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/RevokeAccessTokenResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/RevokeAccessTokenResolver.java
@@ -41,7 +41,7 @@ public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) throw
           final QueryContext context = environment.getContext();
           final String tokenId = bindArgument(environment.getArgument("tokenId"), String.class);
 
-          log.info("User {} revoking access token {}", context.getActorUrn(), tokenId);
+          log.info("User {} revoking access token", context.getActorUrn());
 
           if (isAuthorizedToRevokeToken(context, tokenId)) {
             try {
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/config/AppConfigResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/config/AppConfigResolver.java
index fb1672d54dc971..259d05c631557d 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/config/AppConfigResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/config/AppConfigResolver.java
@@ -186,6 +186,7 @@ public CompletableFuture<AppConfig> get(final DataFetchingEnvironment environmen
             .setNestedDomainsEnabled(_featureFlags.isNestedDomainsEnabled())
             .setPlatformBrowseV2(_featureFlags.isPlatformBrowseV2())
             .setDataContractsEnabled(_featureFlags.isDataContractsEnabled())
+            .setEditableDatasetNameEnabled(_featureFlags.isEditableDatasetNameEnabled())
             .setShowSeparateSiblings(_featureFlags.isShowSeparateSiblings())
             .build();
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/container/ContainerEntitiesResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/container/ContainerEntitiesResolver.java
index 15927eef236cab..5a3207633c07c8 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/container/ContainerEntitiesResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/container/ContainerEntitiesResolver.java
@@ -19,6 +19,7 @@
 import com.linkedin.metadata.query.filter.Filter;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import lombok.extern.slf4j.Slf4j;
@@ -92,7 +93,7 @@ public CompletableFuture<SearchResults> get(final DataFetchingEnvironment enviro
                                         new CriterionArray(ImmutableList.of(filterCriterion))))),
                     start,
                     count,
-                    null,
+                    Collections.emptyList(),
                     null));
 
           } catch (Exception e) {
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/dataproduct/ListDataProductAssetsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/dataproduct/ListDataProductAssetsResolver.java
index 320d89cdec164a..5c43fafb678c5c 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/dataproduct/ListDataProductAssetsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/dataproduct/ListDataProductAssetsResolver.java
@@ -1,7 +1,7 @@
 package com.linkedin.datahub.graphql.resolvers.dataproduct;
 
 import static com.linkedin.datahub.graphql.resolvers.ResolverUtils.bindArgument;
-import static com.linkedin.datahub.graphql.resolvers.ResolverUtils.buildFilterWithUrns;
+import static com.linkedin.metadata.search.utils.QueryUtils.buildFilterWithUrns;
 
 import com.google.common.collect.ImmutableList;
 import com.linkedin.common.urn.Urn;
@@ -11,6 +11,8 @@
 import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
 import com.linkedin.datahub.graphql.generated.DataProduct;
 import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.datahub.graphql.generated.ExtraProperty;
+import com.linkedin.datahub.graphql.generated.FacetFilterInput;
 import com.linkedin.datahub.graphql.generated.SearchAcrossEntitiesInput;
 import com.linkedin.datahub.graphql.generated.SearchResults;
 import com.linkedin.datahub.graphql.resolvers.ResolverUtils;
@@ -30,8 +32,12 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -44,6 +50,7 @@
 public class ListDataProductAssetsResolver
     implements DataFetcher<CompletableFuture<SearchResults>> {
 
+  private static final String OUTPUT_PORTS_FILTER_FIELD = "isOutputPort";
   private static final int DEFAULT_START = 0;
   private static final int DEFAULT_COUNT = 10;
 
@@ -63,6 +70,7 @@ public CompletableFuture<SearchResults> get(DataFetchingEnvironment environment)
 
     // 1. Get urns of assets belonging to Data Product using an aspect query
     List<Urn> assetUrns = new ArrayList<>();
+    Set<String> outputPorts = Collections.EMPTY_SET;
     try {
       final EntityResponse entityResponse =
           _entityClient.getV2(
@@ -86,6 +94,11 @@ public CompletableFuture<SearchResults> get(DataFetchingEnvironment environment)
               dataProductProperties.getAssets().stream()
                   .map(DataProductAssociation::getDestinationUrn)
                   .collect(Collectors.toList()));
+          outputPorts =
+              dataProductProperties.getAssets().stream()
+                  .filter(DataProductAssociation::isOutputPort)
+                  .map(dpa -> dpa.getDestinationUrn().toString())
+                  .collect(Collectors.toSet());
         }
       }
     } catch (Exception e) {
@@ -117,6 +130,7 @@ public CompletableFuture<SearchResults> get(DataFetchingEnvironment environment)
     final int start = input.getStart() != null ? input.getStart() : DEFAULT_START;
     final int count = input.getCount() != null ? input.getCount() : DEFAULT_COUNT;
 
+    Set<String> finalOutputPorts = outputPorts;
     return GraphQLConcurrencyUtils.supplyAsync(
         () -> {
           // if no assets in data product properties, exit early before search and return empty
@@ -130,13 +144,21 @@ public CompletableFuture<SearchResults> get(DataFetchingEnvironment environment)
             return results;
           }
 
+          List<FacetFilterInput> filters = input.getFilters();
+          final List<Urn> urnsToFilterOn = getUrnsToFilterOn(assetUrns, finalOutputPorts, filters);
+          // need to remove output ports filter so we don't send to elastic
+          if (filters != null) {
+            filters.removeIf(f -> f.getField().equals(OUTPUT_PORTS_FILTER_FIELD));
+          }
           // add urns from the aspect to our filters
           final Filter baseFilter =
               ResolverUtils.buildFilter(
-                  input.getFilters(),
+                  filters,
                   input.getOrFilters(),
                   context.getOperationContext().getAspectRetriever());
-          final Filter finalFilter = buildFilterWithUrns(new HashSet<>(assetUrns), baseFilter);
+          final Filter finalFilter =
+              buildFilterWithUrns(
+                  context.getDataHubAppConfig(), new HashSet<>(urnsToFilterOn), baseFilter);
 
           final SearchFlags searchFlags;
           com.linkedin.datahub.graphql.generated.SearchFlags inputFlags = input.getSearchFlags();
@@ -155,18 +177,34 @@ public CompletableFuture<SearchResults> get(DataFetchingEnvironment environment)
                 start,
                 count);
 
-            return UrnSearchResultsMapper.map(
-                context,
-                _entityClient.searchAcrossEntities(
-                    context
-                        .getOperationContext()
-                        .withSearchFlags(flags -> searchFlags != null ? searchFlags : flags),
-                    finalEntityNames,
-                    sanitizedQuery,
-                    finalFilter,
-                    start,
-                    count,
-                    null));
+            SearchResults results =
+                UrnSearchResultsMapper.map(
+                    context,
+                    _entityClient.searchAcrossEntities(
+                        context
+                            .getOperationContext()
+                            .withSearchFlags(flags -> searchFlags != null ? searchFlags : flags),
+                        finalEntityNames,
+                        sanitizedQuery,
+                        finalFilter,
+                        start,
+                        count,
+                        null,
+                        null));
+            results
+                .getSearchResults()
+                .forEach(
+                    searchResult -> {
+                      if (finalOutputPorts.contains(searchResult.getEntity().getUrn())) {
+                        if (searchResult.getExtraProperties() == null) {
+                          searchResult.setExtraProperties(new ArrayList<>());
+                        }
+                        searchResult
+                            .getExtraProperties()
+                            .add(new ExtraProperty("isOutputPort", "true"));
+                      }
+                    });
+            return results;
           } catch (Exception e) {
             log.error(
                 "Failed to execute search for data product assets: entity types {}, query {}, filters: {}, start: {}, count: {}",
@@ -186,4 +224,37 @@ public CompletableFuture<SearchResults> get(DataFetchingEnvironment environment)
         this.getClass().getSimpleName(),
         "get");
   }
+
+  /**
+   * Check to see if our filters list has a hardcoded filter for output ports. If so, let this
+   * filter determine which urns we filter search results on. Otherwise, if no output port filter is
+   * found, return all asset urns as per usual.
+   */
+  @Nonnull
+  private List<Urn> getUrnsToFilterOn(
+      @Nonnull final List<Urn> assetUrns,
+      @Nonnull final Set<String> outputPortUrns,
+      @Nullable final List<FacetFilterInput> filters) {
+    Optional<FacetFilterInput> isOutputPort =
+        filters != null
+            ? filters.stream()
+                .filter(f -> f.getField().equals(OUTPUT_PORTS_FILTER_FIELD))
+                .findFirst()
+            : Optional.empty();
+
+    // optionally get entities that explicitly are or are not output ports
+    List<Urn> urnsToFilterOn = assetUrns;
+    if (isOutputPort.isPresent()) {
+      if (isOutputPort.get().getValue().equals("true")) {
+        urnsToFilterOn = outputPortUrns.stream().map(UrnUtils::getUrn).collect(Collectors.toList());
+      } else {
+        urnsToFilterOn =
+            assetUrns.stream()
+                .filter(u -> !outputPortUrns.contains(u.toString()))
+                .collect(Collectors.toList());
+      }
+    }
+
+    return urnsToFilterOn;
+  }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/DomainEntitiesResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/DomainEntitiesResolver.java
index 75796f637525e5..6a880503802cb4 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/DomainEntitiesResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/DomainEntitiesResolver.java
@@ -19,6 +19,7 @@
 import com.linkedin.metadata.query.filter.Filter;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
@@ -98,7 +99,7 @@ public CompletableFuture<SearchResults> get(final DataFetchingEnvironment enviro
                                 new ConjunctiveCriterion().setAnd(criteria))),
                     start,
                     count,
-                    null,
+                    Collections.emptyList(),
                     null));
 
           } catch (Exception e) {
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/ListDomainsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/ListDomainsResolver.java
index 0c16470c642b71..e6d4238bc70546 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/ListDomainsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/ListDomainsResolver.java
@@ -22,6 +22,7 @@
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -66,9 +67,10 @@ public CompletableFuture<ListDomainsResult> get(final DataFetchingEnvironment en
                     Constants.DOMAIN_ENTITY_NAME,
                     query,
                     filter,
-                    new SortCriterion()
-                        .setField(DOMAIN_CREATED_TIME_INDEX_FIELD_NAME)
-                        .setOrder(SortOrder.DESCENDING),
+                    Collections.singletonList(
+                        new SortCriterion()
+                            .setField(DOMAIN_CREATED_TIME_INDEX_FIELD_NAME)
+                            .setOrder(SortOrder.DESCENDING)),
                     start,
                     count);
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/group/ListGroupsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/group/ListGroupsResolver.java
index fce404a6baa16b..0632af68998dc9 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/group/ListGroupsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/group/ListGroupsResolver.java
@@ -21,6 +21,7 @@
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -64,9 +65,10 @@ public CompletableFuture<ListGroupsResult> get(final DataFetchingEnvironment env
                       CORP_GROUP_ENTITY_NAME,
                       query,
                       null,
-                      new SortCriterion()
-                          .setField(CORP_GROUP_CREATED_TIME_INDEX_FIELD_NAME)
-                          .setOrder(SortOrder.DESCENDING),
+                      Collections.singletonList(
+                          new SortCriterion()
+                              .setField(CORP_GROUP_CREATED_TIME_INDEX_FIELD_NAME)
+                              .setOrder(SortOrder.DESCENDING)),
                       start,
                       count);
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/incident/EntityIncidentsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/incident/EntityIncidentsResolver.java
index 2d4b24243073a5..d79634c27d881c 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/incident/EntityIncidentsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/incident/EntityIncidentsResolver.java
@@ -21,6 +21,7 @@
 import graphql.schema.DataFetchingEnvironment;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -60,13 +61,13 @@ public CompletableFuture<EntityIncidentsResult> get(DataFetchingEnvironment envi
             // Index!
             // We use the search index so that we can easily sort by the last updated time.
             final Filter filter = buildIncidentsEntityFilter(entityUrn, maybeState);
-            final SortCriterion sortCriterion = buildIncidentsSortCriterion();
+            final List<SortCriterion> sortCriteria = buildIncidentsSortCriteria();
             final SearchResult searchResult =
                 _entityClient.filter(
                     context.getOperationContext(),
                     Constants.INCIDENT_ENTITY_NAME,
                     filter,
-                    sortCriterion,
+                    sortCriteria,
                     start,
                     count);
 
@@ -118,10 +119,10 @@ private Filter buildIncidentsEntityFilter(
     return QueryUtils.newFilter(criterionMap);
   }
 
-  private SortCriterion buildIncidentsSortCriterion() {
+  private List<SortCriterion> buildIncidentsSortCriteria() {
     final SortCriterion sortCriterion = new SortCriterion();
     sortCriterion.setField(CREATED_TIME_SEARCH_INDEX_FIELD_NAME);
     sortCriterion.setOrder(SortOrder.DESCENDING);
-    return sortCriterion;
+    return Collections.singletonList(sortCriterion);
   }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/execution/IngestionSourceExecutionRequestsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/execution/IngestionSourceExecutionRequestsResolver.java
index 4a3b75deddc452..a4c2ab42227d9c 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/execution/IngestionSourceExecutionRequestsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/execution/IngestionSourceExecutionRequestsResolver.java
@@ -23,6 +23,7 @@
 import com.linkedin.metadata.search.SearchResult;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -76,9 +77,10 @@ public CompletableFuture<IngestionSourceExecutionRequests> get(
                                 new ConjunctiveCriterion()
                                     .setAnd(
                                         new CriterionArray(ImmutableList.of(filterCriterion))))),
-                    new SortCriterion()
-                        .setField(REQUEST_TIME_MS_FIELD_NAME)
-                        .setOrder(SortOrder.DESCENDING),
+                    Collections.singletonList(
+                        new SortCriterion()
+                            .setField(REQUEST_TIME_MS_FIELD_NAME)
+                            .setOrder(SortOrder.DESCENDING)),
                     start,
                     count);
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/DeleteSecretResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/DeleteSecretResolver.java
index f557b9889f604d..da81d560c6dbd6 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/DeleteSecretResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/DeleteSecretResolver.java
@@ -23,16 +23,16 @@ public DeleteSecretResolver(final EntityClient entityClient) {
   public CompletableFuture<String> get(final DataFetchingEnvironment environment) throws Exception {
     final QueryContext context = environment.getContext();
     if (IngestionAuthUtils.canManageSecrets(context)) {
-      final String secretUrn = environment.getArgument("urn");
-      final Urn urn = Urn.createFromString(secretUrn);
+      final String inputUrn = environment.getArgument("urn");
+      final Urn urn = Urn.createFromString(inputUrn);
       return GraphQLConcurrencyUtils.supplyAsync(
           () -> {
             try {
               _entityClient.deleteEntity(context.getOperationContext(), urn);
-              return secretUrn;
+              return inputUrn;
             } catch (Exception e) {
               throw new RuntimeException(
-                  String.format("Failed to perform delete against secret with urn %s", secretUrn),
+                  String.format("Failed to perform delete against secret with urn %s", inputUrn),
                   e);
             }
           },
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/ListSecretsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/ListSecretsResolver.java
index 106a2d0d1e18e2..bf8d7c800ccae6 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/ListSecretsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/ListSecretsResolver.java
@@ -26,6 +26,7 @@
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -73,9 +74,10 @@ public CompletableFuture<ListSecretsResult> get(final DataFetchingEnvironment en
                       Constants.SECRETS_ENTITY_NAME,
                       query,
                       null,
-                      new SortCriterion()
-                          .setField(DOMAIN_CREATED_TIME_INDEX_FIELD_NAME)
-                          .setOrder(SortOrder.DESCENDING),
+                      Collections.singletonList(
+                          new SortCriterion()
+                              .setField(DOMAIN_CREATED_TIME_INDEX_FIELD_NAME)
+                              .setOrder(SortOrder.DESCENDING)),
                       start,
                       count);
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/SecretUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/SecretUtils.java
index 225a5801adec94..87a3e5cb79ebfc 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/SecretUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/SecretUtils.java
@@ -25,7 +25,7 @@ static String encrypt(String value, String secret) {
       } catch (NoSuchAlgorithmException e) {
         e.printStackTrace();
       }
-      Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+      Cipher cipher = Cipher.getInstance("AES");
       cipher.init(Cipher.ENCRYPT_MODE, secretKey);
       return Base64.getEncoder()
           .encodeToString(cipher.doFinal(value.getBytes(StandardCharsets.UTF_8)));
@@ -48,7 +48,7 @@ static String decrypt(String encryptedValue, String secret) {
       } catch (NoSuchAlgorithmException e) {
         e.printStackTrace();
       }
-      Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5PADDING");
+      Cipher cipher = Cipher.getInstance("AES");
       cipher.init(Cipher.DECRYPT_MODE, secretKey);
       return new String(cipher.doFinal(Base64.getDecoder().decode(encryptedValue)));
     } catch (Exception e) {
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/source/UpsertIngestionSourceResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/source/UpsertIngestionSourceResolver.java
index 77fabd7167300e..12266db05b6d10 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/source/UpsertIngestionSourceResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/source/UpsertIngestionSourceResolver.java
@@ -25,12 +25,16 @@
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.net.URISyntaxException;
+import java.time.DateTimeException;
+import java.time.ZoneId;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.support.CronExpression;
 
 /** Creates or updates an ingestion source. Requires the MANAGE_INGESTION privilege. */
 @Slf4j
@@ -46,55 +50,51 @@ public UpsertIngestionSourceResolver(final EntityClient entityClient) {
   public CompletableFuture<String> get(final DataFetchingEnvironment environment) throws Exception {
     final QueryContext context = environment.getContext();
 
-    return GraphQLConcurrencyUtils.supplyAsync(
-        () -> {
-          if (IngestionAuthUtils.canManageIngestion(context)) {
-
-            final Optional<String> ingestionSourceUrn =
-                Optional.ofNullable(environment.getArgument("urn"));
-            final UpdateIngestionSourceInput input =
-                bindArgument(environment.getArgument("input"), UpdateIngestionSourceInput.class);
+    if (!IngestionAuthUtils.canManageIngestion(context)) {
+      throw new AuthorizationException(
+          "Unauthorized to perform this action. Please contact your DataHub administrator.");
+    }
+    final Optional<String> ingestionSourceUrn = Optional.ofNullable(environment.getArgument("urn"));
+    final UpdateIngestionSourceInput input =
+        bindArgument(environment.getArgument("input"), UpdateIngestionSourceInput.class);
 
-            // Create the policy info.
-            final DataHubIngestionSourceInfo info = mapIngestionSourceInfo(input);
-            final MetadataChangeProposal proposal;
-            if (ingestionSourceUrn.isPresent()) {
-              // Update existing ingestion source
-              try {
-                proposal =
-                    buildMetadataChangeProposalWithUrn(
-                        Urn.createFromString(ingestionSourceUrn.get()),
-                        INGESTION_INFO_ASPECT_NAME,
-                        info);
-              } catch (URISyntaxException e) {
-                throw new DataHubGraphQLException(
-                    String.format("Malformed urn %s provided.", ingestionSourceUrn.get()),
-                    DataHubGraphQLErrorCode.BAD_REQUEST);
-              }
-            } else {
-              // Create new ingestion source
-              // Since we are creating a new Ingestion Source, we need to generate a unique UUID.
-              final UUID uuid = UUID.randomUUID();
-              final String uuidStr = uuid.toString();
-              final DataHubIngestionSourceKey key = new DataHubIngestionSourceKey();
-              key.setId(uuidStr);
-              proposal =
-                  buildMetadataChangeProposalWithKey(
-                      key, INGESTION_SOURCE_ENTITY_NAME, INGESTION_INFO_ASPECT_NAME, info);
-            }
+    // Create the policy info.
+    final DataHubIngestionSourceInfo info = mapIngestionSourceInfo(input);
+    final MetadataChangeProposal proposal;
+    if (ingestionSourceUrn.isPresent()) {
+      // Update existing ingestion source
+      try {
+        proposal =
+            buildMetadataChangeProposalWithUrn(
+                Urn.createFromString(ingestionSourceUrn.get()), INGESTION_INFO_ASPECT_NAME, info);
+      } catch (URISyntaxException e) {
+        throw new DataHubGraphQLException(
+            String.format("Malformed urn %s provided.", ingestionSourceUrn.get()),
+            DataHubGraphQLErrorCode.BAD_REQUEST);
+      }
+    } else {
+      // Create new ingestion source
+      // Since we are creating a new Ingestion Source, we need to generate a unique UUID.
+      final UUID uuid = UUID.randomUUID();
+      final String uuidStr = uuid.toString();
+      final DataHubIngestionSourceKey key = new DataHubIngestionSourceKey();
+      key.setId(uuidStr);
+      proposal =
+          buildMetadataChangeProposalWithKey(
+              key, INGESTION_SOURCE_ENTITY_NAME, INGESTION_INFO_ASPECT_NAME, info);
+    }
 
-            try {
-              return _entityClient.ingestProposal(context.getOperationContext(), proposal, false);
-            } catch (Exception e) {
-              throw new RuntimeException(
-                  String.format(
-                      "Failed to perform update against ingestion source with urn %s",
-                      input.toString()),
-                  e);
-            }
+    return GraphQLConcurrencyUtils.supplyAsync(
+        () -> {
+          try {
+            return _entityClient.ingestProposal(context.getOperationContext(), proposal, false);
+          } catch (Exception e) {
+            throw new RuntimeException(
+                String.format(
+                    "Failed to perform update against ingestion source with urn %s",
+                    input.toString()),
+                e);
           }
-          throw new AuthorizationException(
-              "Unauthorized to perform this action. Please contact your DataHub administrator.");
         },
         this.getClass().getSimpleName(),
         "get");
@@ -137,9 +137,38 @@ private DataHubIngestionSourceConfig mapConfig(final UpdateIngestionSourceConfig
 
   private DataHubIngestionSourceSchedule mapSchedule(
       final UpdateIngestionSourceScheduleInput input) {
+
+    final String modifiedCronInterval = adjustCronInterval(input.getInterval());
+    try {
+      CronExpression.parse(modifiedCronInterval);
+    } catch (IllegalArgumentException e) {
+      throw new DataHubGraphQLException(
+          String.format("Invalid cron schedule `%s`: %s", input.getInterval(), e.getMessage()),
+          DataHubGraphQLErrorCode.BAD_REQUEST);
+    }
+    try {
+      ZoneId.of(input.getTimezone());
+    } catch (DateTimeException e) {
+      throw new DataHubGraphQLException(
+          String.format("Invalid timezone `%s`: %s", input.getTimezone(), e.getMessage()),
+          DataHubGraphQLErrorCode.BAD_REQUEST);
+    }
+
     final DataHubIngestionSourceSchedule result = new DataHubIngestionSourceSchedule();
     result.setInterval(input.getInterval());
     result.setTimezone(input.getTimezone());
     return result;
   }
+
+  // Copied from IngestionScheduler.java
+  private String adjustCronInterval(final String origCronInterval) {
+    Objects.requireNonNull(origCronInterval, "origCronInterval must not be null");
+    // Typically we support 5-character cron. Spring's lib only supports 6 character cron so we make
+    // an adjustment here.
+    final String[] originalCronParts = origCronInterval.split(" ");
+    if (originalCronParts.length == 5) {
+      return String.format("0 %s", origCronInterval);
+    }
+    return origCronInterval;
+  }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/jobs/DataJobRunsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/jobs/DataJobRunsResolver.java
index 591712ef3f55ba..09039e530631d0 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/jobs/DataJobRunsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/jobs/DataJobRunsResolver.java
@@ -26,6 +26,7 @@
 import graphql.schema.DataFetchingEnvironment;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -61,13 +62,13 @@ public CompletableFuture<DataProcessInstanceResult> get(DataFetchingEnvironment
             // Index!
             // We use the search index so that we can easily sort by the last updated time.
             final Filter filter = buildTaskRunsEntityFilter(entityUrn);
-            final SortCriterion sortCriterion = buildTaskRunsSortCriterion();
+            final List<SortCriterion> sortCriteria = buildTaskRunsSortCriteria();
             final SearchResult gmsResult =
                 _entityClient.filter(
                     context.getOperationContext(),
                     Constants.DATA_PROCESS_INSTANCE_ENTITY_NAME,
                     filter,
-                    sortCriterion,
+                    sortCriteria,
                     start,
                     count);
             final List<Urn> dataProcessInstanceUrns =
@@ -123,10 +124,10 @@ private Filter buildTaskRunsEntityFilter(final String entityUrn) {
     return filter;
   }
 
-  private SortCriterion buildTaskRunsSortCriterion() {
+  private List<SortCriterion> buildTaskRunsSortCriteria() {
     final SortCriterion sortCriterion = new SortCriterion();
     sortCriterion.setField(CREATED_TIME_SEARCH_INDEX_FIELD_NAME);
     sortCriterion.setOrder(SortOrder.DESCENDING);
-    return sortCriterion;
+    return Collections.singletonList(sortCriterion);
   }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/jobs/EntityRunsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/jobs/EntityRunsResolver.java
index 163fc30fb6e6c6..82c5b73d871525 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/jobs/EntityRunsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/jobs/EntityRunsResolver.java
@@ -27,6 +27,7 @@
 import graphql.schema.DataFetchingEnvironment;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -67,13 +68,13 @@ public CompletableFuture<DataProcessInstanceResult> get(DataFetchingEnvironment
             // Index!
             // We use the search index so that we can easily sort by the last updated time.
             final Filter filter = buildTaskRunsEntityFilter(entityUrn, direction);
-            final SortCriterion sortCriterion = buildTaskRunsSortCriterion();
+            final List<SortCriterion> sortCriteria = buildTaskRunsSortCriteria();
             final SearchResult gmsResult =
                 _entityClient.filter(
                     context.getOperationContext(),
                     Constants.DATA_PROCESS_INSTANCE_ENTITY_NAME,
                     filter,
-                    sortCriterion,
+                    sortCriteria,
                     start,
                     count);
             final List<Urn> dataProcessInstanceUrns =
@@ -133,10 +134,10 @@ private Filter buildTaskRunsEntityFilter(
     return filter;
   }
 
-  private SortCriterion buildTaskRunsSortCriterion() {
+  private List<SortCriterion> buildTaskRunsSortCriteria() {
     final SortCriterion sortCriterion = new SortCriterion();
     sortCriterion.setField(CREATED_TIME_SEARCH_INDEX_FIELD_NAME);
     sortCriterion.setOrder(SortOrder.DESCENDING);
-    return sortCriterion;
+    return Collections.singletonList(sortCriterion);
   }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/load/EntityRelationshipsResultResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/load/EntityRelationshipsResultResolver.java
index f775853dd59567..fd72edb2972e36 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/load/EntityRelationshipsResultResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/load/EntityRelationshipsResultResolver.java
@@ -5,6 +5,7 @@
 
 import com.linkedin.common.EntityRelationship;
 import com.linkedin.common.EntityRelationships;
+import com.linkedin.common.urn.Urn;
 import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
 import com.linkedin.datahub.graphql.generated.Entity;
@@ -12,11 +13,13 @@
 import com.linkedin.datahub.graphql.generated.RelationshipsInput;
 import com.linkedin.datahub.graphql.types.common.mappers.AuditStampMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.UrnToEntityMapper;
+import com.linkedin.metadata.entity.EntityService;
 import com.linkedin.metadata.graph.GraphClient;
 import com.linkedin.metadata.query.filter.RelationshipDirection;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
@@ -29,8 +32,16 @@ public class EntityRelationshipsResultResolver
 
   private final GraphClient _graphClient;
 
+  private final EntityService _entityService;
+
   public EntityRelationshipsResultResolver(final GraphClient graphClient) {
+    this(graphClient, null);
+  }
+
+  public EntityRelationshipsResultResolver(
+      final GraphClient graphClient, final EntityService entityService) {
     _graphClient = graphClient;
+    _entityService = entityService;
   }
 
   @Override
@@ -47,13 +58,16 @@ public CompletableFuture<EntityRelationshipsResult> get(DataFetchingEnvironment
     final Integer count = input.getCount(); // Optional!
     final RelationshipDirection resolvedDirection =
         RelationshipDirection.valueOf(relationshipDirection.toString());
+    final boolean includeSoftDelete = input.getIncludeSoftDelete();
+
     return GraphQLConcurrencyUtils.supplyAsync(
         () ->
             mapEntityRelationships(
                 context,
                 fetchEntityRelationships(
                     urn, relationshipTypes, resolvedDirection, start, count, context.getActorUrn()),
-                resolvedDirection),
+                resolvedDirection,
+                includeSoftDelete),
         this.getClass().getSimpleName(),
         "get");
   }
@@ -72,13 +86,28 @@ private EntityRelationships fetchEntityRelationships(
   private EntityRelationshipsResult mapEntityRelationships(
       @Nullable final QueryContext context,
       final EntityRelationships entityRelationships,
-      final RelationshipDirection relationshipDirection) {
+      final RelationshipDirection relationshipDirection,
+      final boolean includeSoftDelete) {
     final EntityRelationshipsResult result = new EntityRelationshipsResult();
 
+    final Set<Urn> existentUrns;
+    if (context != null && _entityService != null && !includeSoftDelete) {
+      Set<Urn> allRelatedUrns =
+          entityRelationships.getRelationships().stream()
+              .map(EntityRelationship::getEntity)
+              .collect(Collectors.toSet());
+      existentUrns = _entityService.exists(context.getOperationContext(), allRelatedUrns, false);
+    } else {
+      existentUrns = null;
+    }
+
     List<EntityRelationship> viewable =
         entityRelationships.getRelationships().stream()
             .filter(
-                rel -> context == null || canView(context.getOperationContext(), rel.getEntity()))
+                rel ->
+                    (existentUrns == null || existentUrns.contains(rel.getEntity()))
+                        && (context == null
+                            || canView(context.getOperationContext(), rel.getEntity())))
             .collect(Collectors.toList());
 
     result.setStart(entityRelationships.getStart());
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/MutationUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/MutationUtils.java
index 8b798b243ca864..7608007e9dda98 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/MutationUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/MutationUtils.java
@@ -1,6 +1,7 @@
 package com.linkedin.datahub.graphql.resolvers.mutate;
 
 import static com.linkedin.metadata.Constants.*;
+import static com.linkedin.metadata.utils.SystemMetadataUtils.createDefaultSystemMetadata;
 
 import com.linkedin.common.urn.Urn;
 import com.linkedin.data.template.RecordTemplate;
@@ -84,7 +85,7 @@ private static MetadataChangeProposal setProposalProperties(
     proposal.setChangeType(ChangeType.UPSERT);
 
     // Assumes proposal is generated first from the builder methods above so SystemMetadata is empty
-    SystemMetadata systemMetadata = new SystemMetadata();
+    SystemMetadata systemMetadata = createDefaultSystemMetadata();
     StringMap properties = new StringMap();
     properties.put(APP_SOURCE, UI_SOURCE);
     systemMetadata.setProperties(properties);
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateNameResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateNameResolver.java
index 1d90720fc69023..ad6dbbe635ed1f 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateNameResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateNameResolver.java
@@ -4,9 +4,11 @@
 import static com.linkedin.datahub.graphql.resolvers.mutate.MutationUtils.persistAspect;
 
 import com.linkedin.businessattribute.BusinessAttributeInfo;
+import com.linkedin.common.AuditStamp;
 import com.linkedin.common.urn.CorpuserUrn;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.data.template.SetMode;
 import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.authorization.AuthorizationUtils;
 import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
@@ -20,6 +22,7 @@
 import com.linkedin.datahub.graphql.resolvers.mutate.util.DomainUtils;
 import com.linkedin.datahub.graphql.resolvers.mutate.util.GlossaryUtils;
 import com.linkedin.dataproduct.DataProductProperties;
+import com.linkedin.dataset.EditableDatasetProperties;
 import com.linkedin.domain.DomainProperties;
 import com.linkedin.domain.Domains;
 import com.linkedin.entity.client.EntityClient;
@@ -70,6 +73,8 @@ public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) throw
               return updateDataProductName(targetUrn, input, context);
             case Constants.BUSINESS_ATTRIBUTE_ENTITY_NAME:
               return updateBusinessAttributeName(targetUrn, input, environment.getContext());
+            case Constants.DATASET_ENTITY_NAME:
+              return updateDatasetName(targetUrn, input, environment.getContext());
             default:
               throw new RuntimeException(
                   String.format(
@@ -236,6 +241,37 @@ private Boolean updateGroupName(Urn targetUrn, UpdateNameInput input, QueryConte
         "Unauthorized to perform this action. Please contact your DataHub administrator.");
   }
 
+  // udpates editable dataset properties aspect's name field
+  private Boolean updateDatasetName(Urn targetUrn, UpdateNameInput input, QueryContext context) {
+    if (AuthorizationUtils.canEditProperties(targetUrn, context)) {
+      try {
+        if (input.getName() != null) {
+          final EditableDatasetProperties editableDatasetProperties =
+              new EditableDatasetProperties();
+          editableDatasetProperties.setName(input.getName());
+          final AuditStamp auditStamp = new AuditStamp();
+          Urn actor = UrnUtils.getUrn(context.getActorUrn());
+          auditStamp.setActor(actor, SetMode.IGNORE_NULL);
+          auditStamp.setTime(System.currentTimeMillis());
+          editableDatasetProperties.setLastModified(auditStamp);
+          persistAspect(
+              context.getOperationContext(),
+              targetUrn,
+              Constants.EDITABLE_DATASET_PROPERTIES_ASPECT_NAME,
+              editableDatasetProperties,
+              actor,
+              _entityService);
+        }
+        return true;
+      } catch (Exception e) {
+        throw new RuntimeException(
+            String.format("Failed to perform update against input %s", input), e);
+      }
+    }
+    throw new AuthorizationException(
+        "Unauthorized to perform this action. Please contact your DataHub administrator.");
+  }
+
   private Boolean updateDataProductName(
       Urn targetUrn, UpdateNameInput input, QueryContext context) {
     try {
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/FormUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/FormUtils.java
index 17718f39c12387..d118c04d19393d 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/FormUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/FormUtils.java
@@ -202,7 +202,7 @@ public static FormActorAssignment mapFormActorAssignment(
     if (input.getGroups() != null) {
       UrnArray groupUrns = new UrnArray();
       input.getGroups().forEach(group -> groupUrns.add(UrnUtils.getUrn(group)));
-      result.setUsers(groupUrns);
+      result.setGroups(groupUrns);
     }
 
     return result;
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/OwnerUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/OwnerUtils.java
index 29056eb71a7a3a..ddb795189c0e3d 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/OwnerUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/OwnerUtils.java
@@ -171,7 +171,7 @@ public static boolean isOwnerEqual(
     if (!owner.getOwner().equals(ownerUrn)) {
       return false;
     }
-    if (owner.getTypeUrn() != null) {
+    if (owner.getTypeUrn() != null && ownershipTypeUrn != null) {
       return owner.getTypeUrn().equals(ownershipTypeUrn);
     }
     if (ownershipTypeUrn == null) {
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ownership/ListOwnershipTypesResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ownership/ListOwnershipTypesResolver.java
index 9f6951e44dd735..da0d5dd07a94f0 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ownership/ListOwnershipTypesResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ownership/ListOwnershipTypesResolver.java
@@ -67,7 +67,7 @@ public CompletableFuture<ListOwnershipTypesResult> get(DataFetchingEnvironment e
                         filters,
                         Collections.emptyList(),
                         context.getOperationContext().getAspectRetriever()),
-                    DEFAULT_SORT_CRITERION,
+                    Collections.singletonList(DEFAULT_SORT_CRITERION),
                     start,
                     count);
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/post/CreatePostResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/post/CreatePostResolver.java
index 8b4253501dedc7..312950e44ffbda 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/post/CreatePostResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/post/CreatePostResolver.java
@@ -5,15 +5,13 @@
 import com.datahub.authentication.Authentication;
 import com.datahub.authentication.post.PostService;
 import com.linkedin.common.Media;
+import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.authorization.AuthorizationUtils;
 import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
 import com.linkedin.datahub.graphql.exception.AuthorizationException;
-import com.linkedin.datahub.graphql.generated.CreatePostInput;
-import com.linkedin.datahub.graphql.generated.PostContentType;
-import com.linkedin.datahub.graphql.generated.PostType;
-import com.linkedin.datahub.graphql.generated.UpdateMediaInput;
-import com.linkedin.datahub.graphql.generated.UpdatePostContentInput;
+import com.linkedin.datahub.graphql.generated.*;
+import com.linkedin.metadata.utils.SchemaFieldUtils;
 import com.linkedin.post.PostContent;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
@@ -46,6 +44,18 @@ public CompletableFuture<Boolean> get(final DataFetchingEnvironment environment)
     final String description = content.getDescription();
     final UpdateMediaInput updateMediaInput = content.getMedia();
     final Authentication authentication = context.getAuthentication();
+    final String targetResource = input.getResourceUrn();
+    final String targetSubresource = input.getSubResource();
+
+    String targetUrn;
+    if (targetSubresource != null) {
+      targetUrn =
+          SchemaFieldUtils.generateSchemaFieldUrn(
+                  UrnUtils.getUrn(targetResource), targetSubresource)
+              .toString();
+    } else {
+      targetUrn = targetResource;
+    }
 
     Media media =
         updateMediaInput == null
@@ -59,7 +69,7 @@ public CompletableFuture<Boolean> get(final DataFetchingEnvironment environment)
         () -> {
           try {
             return _postService.createPost(
-                context.getOperationContext(), type.toString(), postContent);
+                context.getOperationContext(), type.toString(), postContent, targetUrn);
           } catch (Exception e) {
             throw new RuntimeException("Failed to create a new post", e);
           }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/post/ListPostsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/post/ListPostsResolver.java
index 12e4047c2dc4e5..dc7797882371b7 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/post/ListPostsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/post/ListPostsResolver.java
@@ -18,7 +18,9 @@
 import com.linkedin.metadata.search.SearchResult;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -49,10 +51,11 @@ public CompletableFuture<ListPostsResult> get(final DataFetchingEnvironment envi
     return GraphQLConcurrencyUtils.supplyAsync(
         () -> {
           try {
-            final SortCriterion sortCriterion =
-                new SortCriterion()
-                    .setField(LAST_MODIFIED_FIELD_NAME)
-                    .setOrder(SortOrder.DESCENDING);
+            final List<SortCriterion> sortCriteria =
+                Collections.singletonList(
+                    new SortCriterion()
+                        .setField(LAST_MODIFIED_FIELD_NAME)
+                        .setOrder(SortOrder.DESCENDING));
 
             // First, get all Post Urns.
             final SearchResult gmsResult =
@@ -61,7 +64,7 @@ public CompletableFuture<ListPostsResult> get(final DataFetchingEnvironment envi
                     POST_ENTITY_NAME,
                     query,
                     null,
-                    sortCriterion,
+                    sortCriteria,
                     start,
                     count);
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolver.java
index 95be3a68e895c8..aa411f019a4c08 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolver.java
@@ -61,8 +61,9 @@ public CompletableFuture<ListQueriesResult> get(final DataFetchingEnvironment en
     return GraphQLConcurrencyUtils.supplyAsync(
         () -> {
           try {
-            final SortCriterion sortCriterion =
-                new SortCriterion().setField(CREATED_AT_FIELD).setOrder(SortOrder.DESCENDING);
+            final List<SortCriterion> sortCriteria =
+                Collections.singletonList(
+                    new SortCriterion().setField(CREATED_AT_FIELD).setOrder(SortOrder.DESCENDING));
 
             // First, get all Query Urns.
             final SearchResult gmsResult =
@@ -74,7 +75,7 @@ public CompletableFuture<ListQueriesResult> get(final DataFetchingEnvironment en
                     QUERY_ENTITY_NAME,
                     query,
                     buildFilters(input, context.getOperationContext().getAspectRetriever()),
-                    sortCriterion,
+                    sortCriteria,
                     start,
                     count);
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolver.java
index 04a72b14eeb021..19bccaf2650866 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolver.java
@@ -22,6 +22,7 @@
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -94,7 +95,7 @@ public CompletableFuture<AggregateResults> get(DataFetchingEnvironment environme
                         : inputFilter,
                     0,
                     0, // 0 entity count because we don't want resolved entities
-                    null,
+                    Collections.emptyList(),
                     facets));
           } catch (Exception e) {
             log.error(
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/GetQuickFiltersResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/GetQuickFiltersResolver.java
index a61d9111321ca7..b07e3fa9126412 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/GetQuickFiltersResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/GetQuickFiltersResolver.java
@@ -25,6 +25,7 @@
 import graphql.schema.DataFetchingEnvironment;
 import io.datahubproject.metadata.context.OperationContext;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
@@ -107,7 +108,7 @@ private SearchResult getSearchResults(
             : null,
         0,
         0,
-        null,
+        Collections.emptyList(),
         null);
   }
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossEntitiesResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossEntitiesResolver.java
index 287e339ddee50c..0dbed92b7d58e7 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossEntitiesResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossEntitiesResolver.java
@@ -18,8 +18,10 @@
 import com.linkedin.view.DataHubViewInfo;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -65,10 +67,24 @@ public CompletableFuture<SearchResults> get(DataFetchingEnvironment environment)
                   context.getOperationContext().getAspectRetriever());
 
           SearchFlags searchFlags = mapInputFlags(context, input.getSearchFlags());
-          SortCriterion sortCriterion =
-              input.getSortInput() != null
-                  ? mapSortCriterion(input.getSortInput().getSortCriterion())
-                  : null;
+          List<SortCriterion> sortCriteria;
+          if (input.getSortInput() != null) {
+            if (input.getSortInput().getSortCriteria() != null) {
+              sortCriteria =
+                  input.getSortInput().getSortCriteria().stream()
+                      .map(SearchUtils::mapSortCriterion)
+                      .collect(Collectors.toList());
+            } else {
+              sortCriteria =
+                  input.getSortInput().getSortCriterion() != null
+                      ? Collections.singletonList(
+                          mapSortCriterion(input.getSortInput().getSortCriterion()))
+                      : Collections.emptyList();
+            }
+
+          } else {
+            sortCriteria = Collections.emptyList();
+          }
 
           try {
             log.debug(
@@ -100,7 +116,7 @@ public CompletableFuture<SearchResults> get(DataFetchingEnvironment environment)
                         : baseFilter,
                     start,
                     count,
-                    sortCriterion));
+                    sortCriteria));
           } catch (Exception e) {
             log.error(
                 "Failed to execute search for multiple entities: entity types {}, query {}, filters: {}, start: {}, count: {}",
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchResolver.java
index 5fb2f8f14b293c..7a48e305dbfe49 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchResolver.java
@@ -20,6 +20,7 @@
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import io.opentelemetry.extension.annotations.WithSpan;
+import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -89,7 +90,7 @@ public CompletableFuture<SearchResults> get(DataFetchingEnvironment environment)
                         input.getFilters(),
                         input.getOrFilters(),
                         context.getOperationContext().getAspectRetriever()),
-                    null,
+                    Collections.emptyList(),
                     start,
                     count));
           } catch (Exception e) {
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/settings/docPropagation/DocPropagationSettingsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/settings/docPropagation/DocPropagationSettingsResolver.java
new file mode 100644
index 00000000000000..0641d6aca63704
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/settings/docPropagation/DocPropagationSettingsResolver.java
@@ -0,0 +1,59 @@
+package com.linkedin.datahub.graphql.resolvers.settings.docPropagation;
+
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
+import com.linkedin.datahub.graphql.generated.DocPropagationSettings;
+import com.linkedin.metadata.service.SettingsService;
+import com.linkedin.settings.global.GlobalSettingsInfo;
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.Nonnull;
+import lombok.extern.slf4j.Slf4j;
+
+/** Retrieves the Global Settings related to the Actions feature. */
+@Slf4j
+public class DocPropagationSettingsResolver
+    implements DataFetcher<CompletableFuture<DocPropagationSettings>> {
+
+  private final SettingsService _settingsService;
+
+  public DocPropagationSettingsResolver(final SettingsService settingsService) {
+    _settingsService = Objects.requireNonNull(settingsService, "settingsService must not be null");
+  }
+
+  @Override
+  public CompletableFuture<DocPropagationSettings> get(final DataFetchingEnvironment environment)
+      throws Exception {
+    final QueryContext context = environment.getContext();
+    return GraphQLConcurrencyUtils.supplyAsync(
+        () -> {
+          try {
+            final GlobalSettingsInfo globalSettings =
+                _settingsService.getGlobalSettings(context.getOperationContext());
+            final DocPropagationSettings defaultSettings = new DocPropagationSettings();
+            // TODO: Enable by default. Currently the automation trusts the settings aspect, which
+            // does not have this.
+            defaultSettings.setDocColumnPropagation(false);
+            return globalSettings != null && globalSettings.hasDocPropagation()
+                ? mapDocPropagationSettings(globalSettings.getDocPropagation())
+                : defaultSettings;
+          } catch (Exception e) {
+            throw new RuntimeException("Failed to retrieve Action Settings", e);
+          }
+        },
+        this.getClass().getSimpleName(),
+        "get");
+  }
+
+  private static DocPropagationSettings mapDocPropagationSettings(
+      @Nonnull final com.linkedin.settings.global.DocPropagationFeatureSettings settings) {
+    final DocPropagationSettings result = new DocPropagationSettings();
+
+    // Map docColumnPropagation settings field
+    result.setDocColumnPropagation(settings.isColumnPropagationEnabled());
+
+    return result;
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/settings/docPropagation/UpdateDocPropagationSettingsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/settings/docPropagation/UpdateDocPropagationSettingsResolver.java
new file mode 100644
index 00000000000000..198c36faad0bd8
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/settings/docPropagation/UpdateDocPropagationSettingsResolver.java
@@ -0,0 +1,77 @@
+package com.linkedin.datahub.graphql.resolvers.settings.docPropagation;
+
+import static com.linkedin.datahub.graphql.resolvers.ResolverUtils.*;
+
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.authorization.AuthorizationUtils;
+import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
+import com.linkedin.datahub.graphql.exception.AuthorizationException;
+import com.linkedin.datahub.graphql.generated.UpdateDocPropagationSettingsInput;
+import com.linkedin.metadata.service.SettingsService;
+import com.linkedin.settings.global.DocPropagationFeatureSettings;
+import com.linkedin.settings.global.GlobalSettingsInfo;
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.Nonnull;
+
+/** Resolver responsible for updating the actions settings. */
+public class UpdateDocPropagationSettingsResolver
+    implements DataFetcher<CompletableFuture<Boolean>> {
+
+  private final SettingsService _settingsService;
+
+  public UpdateDocPropagationSettingsResolver(@Nonnull final SettingsService settingsService) {
+    _settingsService = Objects.requireNonNull(settingsService, "settingsService must not be null");
+  }
+
+  @Override
+  public CompletableFuture<Boolean> get(final DataFetchingEnvironment environment)
+      throws Exception {
+    final QueryContext context = environment.getContext();
+    final UpdateDocPropagationSettingsInput input =
+        bindArgument(environment.getArgument("input"), UpdateDocPropagationSettingsInput.class);
+
+    return GraphQLConcurrencyUtils.supplyAsync(
+        () -> {
+          if (AuthorizationUtils.canManageFeatures(context)) {
+            try {
+              // First, fetch the existing global settings. This does a R-M-F.
+              final GlobalSettingsInfo maybeGlobalSettings =
+                  _settingsService.getGlobalSettings(context.getOperationContext());
+
+              final GlobalSettingsInfo newGlobalSettings =
+                  maybeGlobalSettings != null ? maybeGlobalSettings : new GlobalSettingsInfo();
+
+              final DocPropagationFeatureSettings newDocPropagationSettings =
+                  newGlobalSettings.hasDocPropagation()
+                      ? newGlobalSettings.getDocPropagation()
+                      : new DocPropagationFeatureSettings().setEnabled(true);
+
+              // Next, patch the actions settings.
+              updateDocPropagationSettings(newDocPropagationSettings, input);
+              newGlobalSettings.setDocPropagation(newDocPropagationSettings);
+
+              // Finally, write back to GMS.
+              _settingsService.updateGlobalSettings(
+                  context.getOperationContext(), newGlobalSettings);
+              return true;
+            } catch (Exception e) {
+              throw new RuntimeException(
+                  String.format("Failed to update action settings! %s", input), e);
+            }
+          }
+          throw new AuthorizationException(
+              "Unauthorized to perform this action. Please contact your DataHub administrator.");
+        },
+        this.getClass().getSimpleName(),
+        "get");
+  }
+
+  private static void updateDocPropagationSettings(
+      @Nonnull final com.linkedin.settings.global.DocPropagationFeatureSettings settings,
+      @Nonnull final UpdateDocPropagationSettingsInput input) {
+    settings.setColumnPropagationEnabled(input.getDocColumnPropagation());
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/view/ListGlobalViewsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/view/ListGlobalViewsResolver.java
index 952e55ca117f2d..265f4d5f5d56e2 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/view/ListGlobalViewsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/view/ListGlobalViewsResolver.java
@@ -74,7 +74,7 @@ public CompletableFuture<ListViewsResult> get(final DataFetchingEnvironment envi
                     Constants.DATAHUB_VIEW_ENTITY_NAME,
                     query,
                     buildFilters(context.getOperationContext().getAspectRetriever()),
-                    DEFAULT_SORT_CRITERION,
+                    Collections.singletonList(DEFAULT_SORT_CRITERION),
                     start,
                     count);
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/view/ListMyViewsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/view/ListMyViewsResolver.java
index 32eb0e46bb6160..abfdeb2d608693 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/view/ListMyViewsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/view/ListMyViewsResolver.java
@@ -79,7 +79,7 @@ public CompletableFuture<ListViewsResult> get(final DataFetchingEnvironment envi
                         viewType,
                         context.getActorUrn(),
                         context.getOperationContext().getAspectRetriever()),
-                    DEFAULT_SORT_CRITERION,
+                    Collections.singletonList(DEFAULT_SORT_CRITERION),
                     start,
                     count);
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/InputFieldsMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/InputFieldsMapper.java
index 49c2d17ce09585..269fb7d4ddf793 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/InputFieldsMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/InputFieldsMapper.java
@@ -5,10 +5,13 @@
 import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.generated.InputField;
 import com.linkedin.datahub.graphql.types.dataset.mappers.SchemaFieldMapper;
+import java.net.URISyntaxException;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class InputFieldsMapper {
 
   public static final InputFieldsMapper INSTANCE = new InputFieldsMapper();
@@ -31,13 +34,24 @@ public com.linkedin.datahub.graphql.generated.InputFields apply(
             .map(
                 field -> {
                   InputField fieldResult = new InputField();
+                  Urn parentUrn = entityUrn;
 
-                  if (field.hasSchemaField()) {
-                    fieldResult.setSchemaField(
-                        SchemaFieldMapper.map(context, field.getSchemaField(), entityUrn));
-                  }
                   if (field.hasSchemaFieldUrn()) {
                     fieldResult.setSchemaFieldUrn(field.getSchemaFieldUrn().toString());
+                    try {
+                      parentUrn =
+                          Urn.createFromString(field.getSchemaFieldUrn().getEntityKey().get(0));
+                    } catch (URISyntaxException e) {
+                      log.error(
+                          "Field urn resolution: failed to extract parentUrn successfully from {}. Falling back to {}",
+                          field.getSchemaFieldUrn(),
+                          entityUrn,
+                          e);
+                    }
+                  }
+                  if (field.hasSchemaField()) {
+                    fieldResult.setSchemaField(
+                        SchemaFieldMapper.map(context, field.getSchemaField(), parentUrn));
                   }
                   return fieldResult;
                 })
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DocumentationMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DocumentationMapper.java
new file mode 100644
index 00000000000000..dcb4921d353981
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DocumentationMapper.java
@@ -0,0 +1,54 @@
+package com.linkedin.datahub.graphql.types.common.mappers;
+
+import com.linkedin.common.urn.Urn;
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.generated.DataHubConnection;
+import com.linkedin.datahub.graphql.generated.Documentation;
+import com.linkedin.datahub.graphql.generated.DocumentationAssociation;
+import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class DocumentationMapper
+    implements ModelMapper<com.linkedin.common.Documentation, Documentation> {
+
+  public static final DocumentationMapper INSTANCE = new DocumentationMapper();
+
+  public static Documentation map(
+      @Nullable final QueryContext context,
+      @Nonnull final com.linkedin.common.Documentation metadata) {
+    return INSTANCE.apply(context, metadata);
+  }
+
+  @Override
+  public Documentation apply(
+      @Nullable final QueryContext context,
+      @Nonnull final com.linkedin.common.Documentation input) {
+    final Documentation result = new Documentation();
+    result.setDocumentations(
+        input.getDocumentations().stream()
+            .map(docAssociation -> mapDocAssociation(context, docAssociation))
+            .collect(Collectors.toList()));
+    return result;
+  }
+
+  private DocumentationAssociation mapDocAssociation(
+      @Nullable final QueryContext context,
+      @Nonnull final com.linkedin.common.DocumentationAssociation association) {
+    final DocumentationAssociation result = new DocumentationAssociation();
+    result.setDocumentation(association.getDocumentation());
+    if (association.getAttribution() != null) {
+      result.setAttribution(MetadataAttributionMapper.map(context, association.getAttribution()));
+    }
+    return result;
+  }
+
+  private DataHubConnection mapConnectionEntity(@Nonnull final Urn urn) {
+    DataHubConnection connection = new DataHubConnection();
+    connection.setUrn(urn.toString());
+    connection.setType(EntityType.DATAHUB_CONNECTION);
+    return connection;
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/MetadataAttributionMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/MetadataAttributionMapper.java
new file mode 100644
index 00000000000000..55fb7ad6f3a2b8
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/MetadataAttributionMapper.java
@@ -0,0 +1,35 @@
+package com.linkedin.datahub.graphql.types.common.mappers;
+
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.generated.MetadataAttribution;
+import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class MetadataAttributionMapper
+    implements ModelMapper<com.linkedin.common.MetadataAttribution, MetadataAttribution> {
+
+  public static final MetadataAttributionMapper INSTANCE = new MetadataAttributionMapper();
+
+  public static MetadataAttribution map(
+      @Nullable final QueryContext context,
+      @Nonnull final com.linkedin.common.MetadataAttribution metadata) {
+    return INSTANCE.apply(context, metadata);
+  }
+
+  @Override
+  public MetadataAttribution apply(
+      @Nullable final QueryContext context,
+      @Nonnull final com.linkedin.common.MetadataAttribution input) {
+    final MetadataAttribution result = new MetadataAttribution();
+    result.setTime(input.getTime());
+    result.setActor(UrnToEntityMapper.map(context, input.getActor()));
+    if (input.getSource() != null) {
+      result.setSource(UrnToEntityMapper.map(context, input.getSource()));
+    }
+    if (input.getSourceDetail() != null) {
+      result.setSourceDetail(StringMapMapper.map(context, input.getSourceDetail()));
+    }
+    return result;
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetMapper.java
index 89d5aa8621bf08..a7b5f6de0c183d 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetMapper.java
@@ -222,6 +222,7 @@ private void mapDatasetProperties(
     properties.setQualifiedName(gmsProperties.getQualifiedName());
     dataset.setProperties(properties);
     dataset.setDescription(properties.getDescription());
+    dataset.setName(properties.getName());
     if (gmsProperties.getUri() != null) {
       dataset.setUri(gmsProperties.getUri().toString());
     }
@@ -248,6 +249,9 @@ private void mapEditableDatasetProperties(@Nonnull Dataset dataset, @Nonnull Dat
         new EditableDatasetProperties(dataMap);
     final DatasetEditableProperties editableProperties = new DatasetEditableProperties();
     editableProperties.setDescription(editableDatasetProperties.getDescription());
+    if (editableDatasetProperties.getName() != null) {
+      editableProperties.setName(editableDatasetProperties.getName());
+    }
     dataset.setEditableProperties(editableProperties);
   }
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java
index 122298bcab6547..104dc0e1043413 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java
@@ -111,8 +111,13 @@ public Collection<MetadataChangeProposal> apply(
 
     if (datasetUpdateInput.getEditableProperties() != null) {
       final EditableDatasetProperties editableDatasetProperties = new EditableDatasetProperties();
-      editableDatasetProperties.setDescription(
-          datasetUpdateInput.getEditableProperties().getDescription());
+      if (datasetUpdateInput.getEditableProperties().getDescription() != null) {
+        editableDatasetProperties.setDescription(
+            datasetUpdateInput.getEditableProperties().getDescription());
+      }
+      if (datasetUpdateInput.getEditableProperties().getName() != null) {
+        editableDatasetProperties.setName(datasetUpdateInput.getEditableProperties().getName());
+      }
       editableDatasetProperties.setLastModified(auditStamp);
       editableDatasetProperties.setCreated(auditStamp);
       proposals.add(
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/SchemaFieldMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/SchemaFieldMapper.java
index 3674186ac23fe6..23d94ff85bd3d4 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/SchemaFieldMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/SchemaFieldMapper.java
@@ -91,8 +91,7 @@ private SchemaFieldEntity createSchemaFieldEntity(
       @Nonnull final com.linkedin.schema.SchemaField input, @Nonnull Urn entityUrn) {
     SchemaFieldEntity schemaFieldEntity = new SchemaFieldEntity();
     schemaFieldEntity.setUrn(
-        SchemaFieldUtils.generateSchemaFieldUrn(entityUrn.toString(), input.getFieldPath())
-            .toString());
+        SchemaFieldUtils.generateSchemaFieldUrn(entityUrn, input.getFieldPath()).toString());
     schemaFieldEntity.setType(EntityType.SCHEMA_FIELD);
     return schemaFieldEntity;
   }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeMapper.java
index 26835f9e57dcd8..77457a814bd677 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeMapper.java
@@ -15,40 +15,49 @@ public class EntityTypeMapper {
 
   static final Map<EntityType, String> ENTITY_TYPE_TO_NAME =
       ImmutableMap.<EntityType, String>builder()
+          .put(EntityType.DOMAIN, Constants.DOMAIN_ENTITY_NAME)
           .put(EntityType.DATASET, Constants.DATASET_ENTITY_NAME)
-          .put(EntityType.ROLE, Constants.ROLE_ENTITY_NAME)
           .put(EntityType.CORP_USER, Constants.CORP_USER_ENTITY_NAME)
           .put(EntityType.CORP_GROUP, Constants.CORP_GROUP_ENTITY_NAME)
           .put(EntityType.DATA_PLATFORM, Constants.DATA_PLATFORM_ENTITY_NAME)
+          .put(EntityType.ER_MODEL_RELATIONSHIP, Constants.ER_MODEL_RELATIONSHIP_ENTITY_NAME)
           .put(EntityType.DASHBOARD, Constants.DASHBOARD_ENTITY_NAME)
+          .put(EntityType.NOTEBOOK, Constants.NOTEBOOK_ENTITY_NAME)
           .put(EntityType.CHART, Constants.CHART_ENTITY_NAME)
-          .put(EntityType.TAG, Constants.TAG_ENTITY_NAME)
           .put(EntityType.DATA_FLOW, Constants.DATA_FLOW_ENTITY_NAME)
           .put(EntityType.DATA_JOB, Constants.DATA_JOB_ENTITY_NAME)
-          .put(EntityType.DATA_PROCESS_INSTANCE, Constants.DATA_PROCESS_INSTANCE_ENTITY_NAME)
+          .put(EntityType.TAG, Constants.TAG_ENTITY_NAME)
           .put(EntityType.GLOSSARY_TERM, Constants.GLOSSARY_TERM_ENTITY_NAME)
           .put(EntityType.GLOSSARY_NODE, Constants.GLOSSARY_NODE_ENTITY_NAME)
+          .put(EntityType.CONTAINER, Constants.CONTAINER_ENTITY_NAME)
           .put(EntityType.MLMODEL, Constants.ML_MODEL_ENTITY_NAME)
           .put(EntityType.MLMODEL_GROUP, Constants.ML_MODEL_GROUP_ENTITY_NAME)
           .put(EntityType.MLFEATURE_TABLE, Constants.ML_FEATURE_TABLE_ENTITY_NAME)
           .put(EntityType.MLFEATURE, Constants.ML_FEATURE_ENTITY_NAME)
           .put(EntityType.MLPRIMARY_KEY, Constants.ML_PRIMARY_KEY_ENTITY_NAME)
-          .put(EntityType.CONTAINER, Constants.CONTAINER_ENTITY_NAME)
-          .put(EntityType.DOMAIN, Constants.DOMAIN_ENTITY_NAME)
-          .put(EntityType.NOTEBOOK, Constants.NOTEBOOK_ENTITY_NAME)
+          .put(EntityType.INGESTION_SOURCE, Constants.INGESTION_SOURCE_ENTITY_NAME)
+          .put(EntityType.EXECUTION_REQUEST, Constants.EXECUTION_REQUEST_ENTITY_NAME)
+          .put(EntityType.ASSERTION, Constants.ASSERTION_ENTITY_NAME)
+          .put(EntityType.DATA_PROCESS_INSTANCE, Constants.DATA_PROCESS_INSTANCE_ENTITY_NAME)
           .put(EntityType.DATA_PLATFORM_INSTANCE, Constants.DATA_PLATFORM_INSTANCE_ENTITY_NAME)
+          .put(EntityType.ACCESS_TOKEN, Constants.ACCESS_TOKEN_ENTITY_NAME)
           .put(EntityType.TEST, Constants.TEST_ENTITY_NAME)
-          .put(EntityType.ER_MODEL_RELATIONSHIP, Constants.ER_MODEL_RELATIONSHIP_ENTITY_NAME)
+          .put(EntityType.DATAHUB_POLICY, Constants.POLICY_ENTITY_NAME)
+          .put(EntityType.DATAHUB_ROLE, Constants.DATAHUB_ROLE_ENTITY_NAME)
+          .put(EntityType.POST, Constants.POST_ENTITY_NAME)
+          .put(EntityType.SCHEMA_FIELD, Constants.SCHEMA_FIELD_ENTITY_NAME)
           .put(EntityType.DATAHUB_VIEW, Constants.DATAHUB_VIEW_ENTITY_NAME)
+          .put(EntityType.QUERY, Constants.QUERY_ENTITY_NAME)
           .put(EntityType.DATA_PRODUCT, Constants.DATA_PRODUCT_ENTITY_NAME)
-          .put(EntityType.SCHEMA_FIELD, Constants.SCHEMA_FIELD_ENTITY_NAME)
+          .put(EntityType.CUSTOM_OWNERSHIP_TYPE, Constants.OWNERSHIP_TYPE_ENTITY_NAME)
+          .put(EntityType.INCIDENT, Constants.INCIDENT_ENTITY_NAME)
+          .put(EntityType.ROLE, Constants.ROLE_ENTITY_NAME)
           .put(EntityType.STRUCTURED_PROPERTY, Constants.STRUCTURED_PROPERTY_ENTITY_NAME)
-          .put(EntityType.ASSERTION, Constants.ASSERTION_ENTITY_NAME)
+          .put(EntityType.FORM, Constants.FORM_ENTITY_NAME)
+          .put(EntityType.DATA_TYPE, Constants.DATA_TYPE_ENTITY_NAME)
+          .put(EntityType.ENTITY_TYPE, Constants.ENTITY_TYPE_ENTITY_NAME)
           .put(EntityType.RESTRICTED, Constants.RESTRICTED_ENTITY_NAME)
           .put(EntityType.BUSINESS_ATTRIBUTE, Constants.BUSINESS_ATTRIBUTE_ENTITY_NAME)
-          .put(EntityType.QUERY, Constants.QUERY_ENTITY_NAME)
-          .put(EntityType.POST, Constants.POST_ENTITY_NAME)
-          .put(EntityType.FORM, Constants.FORM_ENTITY_NAME)
           .build();
 
   private static final Map<String, EntityType> ENTITY_NAME_TO_TYPE =
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java
index 9e9bf86e5fe7fe..334faf753cb8b5 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java
@@ -20,34 +20,63 @@ public class EntityTypeUrnMapper {
 
   static final Map<String, String> ENTITY_NAME_TO_ENTITY_TYPE_URN =
       ImmutableMap.<String, String>builder()
+          .put(Constants.DOMAIN_ENTITY_NAME, "urn:li:entityType:datahub.domain")
           .put(Constants.DATASET_ENTITY_NAME, "urn:li:entityType:datahub.dataset")
-          .put(Constants.ROLE_ENTITY_NAME, "urn:li:entityType:datahub.role")
           .put(Constants.CORP_USER_ENTITY_NAME, "urn:li:entityType:datahub.corpuser")
           .put(Constants.CORP_GROUP_ENTITY_NAME, "urn:li:entityType:datahub.corpGroup")
           .put(Constants.DATA_PLATFORM_ENTITY_NAME, "urn:li:entityType:datahub.dataPlatform")
+          .put(
+              Constants.ER_MODEL_RELATIONSHIP_ENTITY_NAME,
+              "urn:li:entityType:datahub.erModelRelationship")
           .put(Constants.DASHBOARD_ENTITY_NAME, "urn:li:entityType:datahub.dashboard")
+          .put(Constants.NOTEBOOK_ENTITY_NAME, "urn:li:entityType:datahub.notebook")
           .put(Constants.CHART_ENTITY_NAME, "urn:li:entityType:datahub.chart")
-          .put(Constants.TAG_ENTITY_NAME, "urn:li:entityType:datahub.tag")
           .put(Constants.DATA_FLOW_ENTITY_NAME, "urn:li:entityType:datahub.dataFlow")
           .put(Constants.DATA_JOB_ENTITY_NAME, "urn:li:entityType:datahub.dataJob")
+          .put(Constants.TAG_ENTITY_NAME, "urn:li:entityType:datahub.tag")
           .put(Constants.GLOSSARY_TERM_ENTITY_NAME, "urn:li:entityType:datahub.glossaryTerm")
           .put(Constants.GLOSSARY_NODE_ENTITY_NAME, "urn:li:entityType:datahub.glossaryNode")
+          .put(Constants.CONTAINER_ENTITY_NAME, "urn:li:entityType:datahub.container")
           .put(Constants.ML_MODEL_ENTITY_NAME, "urn:li:entityType:datahub.mlModel")
           .put(Constants.ML_MODEL_GROUP_ENTITY_NAME, "urn:li:entityType:datahub.mlModelGroup")
           .put(Constants.ML_FEATURE_TABLE_ENTITY_NAME, "urn:li:entityType:datahub.mlFeatureTable")
           .put(Constants.ML_FEATURE_ENTITY_NAME, "urn:li:entityType:datahub.mlFeature")
           .put(Constants.ML_PRIMARY_KEY_ENTITY_NAME, "urn:li:entityType:datahub.mlPrimaryKey")
-          .put(Constants.CONTAINER_ENTITY_NAME, "urn:li:entityType:datahub.container")
-          .put(Constants.DOMAIN_ENTITY_NAME, "urn:li:entityType:datahub.domain")
-          .put(Constants.NOTEBOOK_ENTITY_NAME, "urn:li:entityType:datahub.notebook")
+          .put(
+              Constants.INGESTION_SOURCE_ENTITY_NAME,
+              "urn:li:entityType:datahub.dataHubIngestionSource")
+          .put(
+              Constants.EXECUTION_REQUEST_ENTITY_NAME,
+              "urn:li:entityType:datahub.dataHubExecutionRequest")
+          .put(Constants.ASSERTION_ENTITY_NAME, "urn:li:entityType:datahub.assertion")
+          .put(
+              Constants.DATA_PROCESS_INSTANCE_ENTITY_NAME,
+              "urn:li:entityType:datahub.dataProcessInstance")
           .put(
               Constants.DATA_PLATFORM_INSTANCE_ENTITY_NAME,
               "urn:li:entityType:datahub.dataPlatformInstance")
+          .put(Constants.ACCESS_TOKEN_ENTITY_NAME, "urn:li:entityType:datahub.dataHubAccessToken")
           .put(Constants.TEST_ENTITY_NAME, "urn:li:entityType:datahub.test")
+          .put(Constants.POLICY_ENTITY_NAME, "urn:li:entityType:datahub.dataHubPolicy")
+          .put(Constants.DATAHUB_ROLE_ENTITY_NAME, "urn:li:entityType:datahub.dataHubRole")
+          .put(Constants.POST_ENTITY_NAME, "urn:li:entityType:datahub.post")
+          .put(Constants.SCHEMA_FIELD_ENTITY_NAME, "urn:li:entityType:datahub.schemaField")
           .put(Constants.DATAHUB_VIEW_ENTITY_NAME, "urn:li:entityType:datahub.dataHubView")
+          .put(Constants.QUERY_ENTITY_NAME, "urn:li:entityType:datahub.query")
           .put(Constants.DATA_PRODUCT_ENTITY_NAME, "urn:li:entityType:datahub.dataProduct")
-          .put(Constants.ASSERTION_ENTITY_NAME, "urn:li:entityType:datahub.assertion")
-          .put(Constants.SCHEMA_FIELD_ENTITY_NAME, "urn:li:entityType:datahub.schemaField")
+          .put(Constants.OWNERSHIP_TYPE_ENTITY_NAME, "urn:li:entityType:datahub.ownershipType")
+          .put(Constants.INCIDENT_ENTITY_NAME, "urn:li:entityType:datahub.incident")
+          .put(Constants.ROLE_ENTITY_NAME, "urn:li:entityType:datahub.role")
+          .put(
+              Constants.STRUCTURED_PROPERTY_ENTITY_NAME,
+              "urn:li:entityType:datahub.structuredProperty")
+          .put(Constants.FORM_ENTITY_NAME, "urn:li:entityType:datahub.form")
+          .put(Constants.DATA_TYPE_ENTITY_NAME, "urn:li:entityType:datahub.dataType")
+          .put(Constants.ENTITY_TYPE_ENTITY_NAME, "urn:li:entityType:datahub.entityType")
+          .put(Constants.RESTRICTED_ENTITY_NAME, "urn:li:entityType:datahub.restricted")
+          .put(
+              Constants.BUSINESS_ATTRIBUTE_ENTITY_NAME,
+              "urn:li:entityType:datahub.businessAttribute")
           .build();
 
   private static final Map<String, String> ENTITY_TYPE_URN_TO_NAME =
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java
index 7dd12d62765c60..0eb74210971d9f 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java
@@ -5,9 +5,11 @@
 
 import com.linkedin.common.UrnArray;
 import com.linkedin.common.urn.Urn;
+import com.linkedin.data.template.StringMap;
 import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.generated.AggregationMetadata;
 import com.linkedin.datahub.graphql.generated.EntityPath;
+import com.linkedin.datahub.graphql.generated.ExtraProperty;
 import com.linkedin.datahub.graphql.generated.FacetMetadata;
 import com.linkedin.datahub.graphql.generated.MatchedField;
 import com.linkedin.datahub.graphql.generated.SearchResult;
@@ -35,7 +37,24 @@ public static SearchResult mapResult(
     return new SearchResult(
         UrnToEntityMapper.map(context, searchEntity.getEntity()),
         getInsightsFromFeatures(searchEntity.getFeatures()),
-        getMatchedFieldEntry(context, searchEntity.getMatchedFields()));
+        getMatchedFieldEntry(context, searchEntity.getMatchedFields()),
+        getExtraProperties(searchEntity.getExtraFields()));
+  }
+
+  private static List<ExtraProperty> getExtraProperties(@Nullable StringMap extraFields) {
+    if (extraFields == null) {
+      return List.of();
+    } else {
+      return extraFields.entrySet().stream()
+          .map(
+              entry -> {
+                ExtraProperty extraProperty = new ExtraProperty();
+                extraProperty.setName(entry.getKey());
+                extraProperty.setValue(entry.getValue());
+                return extraProperty;
+              })
+          .collect(Collectors.toList());
+    }
   }
 
   public static FacetMetadata mapFacet(
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldMapper.java
index 85a6b9108cb54e..b1f27357d45504 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldMapper.java
@@ -1,14 +1,15 @@
 package com.linkedin.datahub.graphql.types.schemafield;
 
-import static com.linkedin.metadata.Constants.BUSINESS_ATTRIBUTE_ASPECT;
-import static com.linkedin.metadata.Constants.STRUCTURED_PROPERTIES_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.*;
 
 import com.linkedin.businessattribute.BusinessAttributes;
+import com.linkedin.common.Documentation;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.generated.SchemaFieldEntity;
 import com.linkedin.datahub.graphql.types.businessattribute.mappers.BusinessAttributesMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.DocumentationMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.UrnToEntityMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.util.MappingHelper;
 import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
@@ -46,6 +47,10 @@ public SchemaFieldEntity apply(
         (((schemaField, dataMap) ->
             schemaField.setBusinessAttributes(
                 BusinessAttributesMapper.map(new BusinessAttributes(dataMap), entityUrn)))));
+    mappingHelper.mapToResult(
+        DOCUMENTATION_ASPECT_NAME,
+        (entity, dataMap) ->
+            entity.setDocumentation(DocumentationMapper.map(context, new Documentation(dataMap))));
     return result;
   }
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldType.java
index f9fd7c7b819c56..2fa26d8cf2cdd7 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldType.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldType.java
@@ -1,8 +1,6 @@
 package com.linkedin.datahub.graphql.types.schemafield;
 
-import static com.linkedin.metadata.Constants.BUSINESS_ATTRIBUTE_ASPECT;
-import static com.linkedin.metadata.Constants.SCHEMA_FIELD_ENTITY_NAME;
-import static com.linkedin.metadata.Constants.STRUCTURED_PROPERTIES_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.*;
 
 import com.google.common.collect.ImmutableSet;
 import com.linkedin.common.urn.Urn;
@@ -32,7 +30,8 @@ public class SchemaFieldType
     implements com.linkedin.datahub.graphql.types.EntityType<SchemaFieldEntity, String> {
 
   public static final Set<String> ASPECTS_TO_FETCH =
-      ImmutableSet.of(STRUCTURED_PROPERTIES_ASPECT_NAME, BUSINESS_ATTRIBUTE_ASPECT);
+      ImmutableSet.of(
+          STRUCTURED_PROPERTIES_ASPECT_NAME, BUSINESS_ATTRIBUTE_ASPECT, DOCUMENTATION_ASPECT_NAME);
 
   private final EntityClient _entityClient;
   private final FeatureFlags _featureFlags;
diff --git a/datahub-graphql-core/src/main/resources/app.graphql b/datahub-graphql-core/src/main/resources/app.graphql
index 23c2468bae19a1..262d2384d84ada 100644
--- a/datahub-graphql-core/src/main/resources/app.graphql
+++ b/datahub-graphql-core/src/main/resources/app.graphql
@@ -17,6 +17,11 @@ extend type Query {
     Requires the 'Manage Global Views' Platform Privilege.
     """
     globalViewsSettings: GlobalViewsSettings
+
+    """
+    Fetch the global settings related to the docs propagation feature.
+    """
+    docPropagationSettings: DocPropagationSettings
 }
 
 extend type Mutation {
@@ -25,6 +30,11 @@ extend type Mutation {
   Requires the 'Manage Global Views' Platform Privilege.
   """
   updateGlobalViewsSettings(input: UpdateGlobalViewsSettingsInput!): Boolean!
+
+  """
+  Update the doc propagation settings.
+  """
+  updateDocPropagationSettings(input: UpdateDocPropagationSettingsInput!): Boolean!
 }
 
 """
@@ -469,7 +479,7 @@ type FeatureFlagsConfig {
   platformBrowseV2: Boolean!
 
   """
-  Whether we should show CTAs in the UI related to moving to Managed DataHub by Acryl.
+  Whether we should show CTAs in the UI related to moving to DataHub Cloud by Acryl.
   """
   showAcrylInfo: Boolean!
   """
@@ -498,6 +508,11 @@ type FeatureFlagsConfig {
   """
   dataContractsEnabled: Boolean!
 
+  """
+  Whether dataset names are editable
+  """
+  editableDatasetNameEnabled: Boolean!
+
   """
   If turned on, all siblings will be separated with no way to get to a "combined" sibling view
   """
@@ -525,3 +540,23 @@ type GlobalViewsSettings {
   """
   defaultView: String
 }
+
+"""
+Input required to update doc propagation settings.
+"""
+input UpdateDocPropagationSettingsInput {
+  """
+  The default doc propagation setting for the platform.
+  """
+  docColumnPropagation: Boolean
+}
+
+"""
+Global (platform-level) settings related to the doc propagation feature
+"""
+type DocPropagationSettings {
+  """
+  The default doc propagation setting for the platform.
+  """
+  docColumnPropagation: Boolean
+}
\ No newline at end of file
diff --git a/datahub-graphql-core/src/main/resources/common.graphql b/datahub-graphql-core/src/main/resources/common.graphql
new file mode 100644
index 00000000000000..bac56c97f61cf7
--- /dev/null
+++ b/datahub-graphql-core/src/main/resources/common.graphql
@@ -0,0 +1,49 @@
+"""
+Object containing the documentation aspect for an entity
+"""
+type Documentation {
+    """
+    Structured properties on this entity
+    """
+    documentations: [DocumentationAssociation!]!
+}
+
+"""
+Object containing the documentation aspect for an entity
+"""
+type DocumentationAssociation {
+    """
+    Structured properties on this entity
+    """
+    documentation: String!
+
+    """
+    Information about who, why, and how this metadata was applied
+    """
+    attribution: MetadataAttribution
+}
+
+"""
+Information about who, why, and how this metadata was applied
+"""
+type MetadataAttribution {
+    """
+    The time this metadata was applied
+    """
+    time: Long!
+
+    """
+    The actor responsible for this metadata application
+    """
+    actor: Entity!
+
+    """
+    The source of this metadata application. If propagated, this will be an action.
+    """
+    source: Entity
+
+    """
+    Extra details about how this metadata was applied
+    """
+    sourceDetail: [StringMapEntry!]
+}
diff --git a/datahub-graphql-core/src/main/resources/entity.graphql b/datahub-graphql-core/src/main/resources/entity.graphql
index 246ace2fc0f5f1..52e81f8094dea6 100644
--- a/datahub-graphql-core/src/main/resources/entity.graphql
+++ b/datahub-graphql-core/src/main/resources/entity.graphql
@@ -68,6 +68,17 @@ type Query {
     Fetch a Tag by primary key (urn)
     """
     tag(urn: String!): Tag
+
+    """
+    Fetch a View by primary key (urn)
+    """
+    view(urn: String!): DataHubView
+
+    """
+    Fetch a Form by primary key (urn)
+    """
+    form(urn: String!): Form
+
     """
     Fetch a Role by primary key (urn)
     """
@@ -890,7 +901,7 @@ type Mutation {
     """
     Creates a filter for a form to apply it to certain entities. Entities that match this filter will have
     a given form applied to them.
-    This feature is ONLY supported in Acryl DataHub.
+    This feature is ONLY supported in DataHub Cloud.
     """
     createDynamicFormAssignment(input: CreateDynamicFormAssignmentInput!): Boolean
 
@@ -1267,6 +1278,11 @@ input RelationshipsInput {
   The number of results to be returned
   """
   count: Int
+
+  """
+  Whether to include soft-deleted, related, entities
+  """
+  includeSoftDelete: Boolean = true
 }
 
 """
@@ -3220,6 +3236,11 @@ type SchemaFieldEntity implements Entity {
     Business Attribute associated with the field
     """
     businessAttributes: BusinessAttributes
+
+    """
+    Documentation aspect for this schema field
+    """
+    documentation: Documentation
 }
 
 """
@@ -3461,6 +3482,11 @@ type DatasetEditableProperties {
     Description of the Dataset
     """
     description: String
+
+    """
+    Editable name of the Dataset
+    """
+    name: String
 }
 
 """
@@ -4829,6 +4855,10 @@ input DatasetEditablePropertiesUpdate {
     Writable description aka documentation for a Dataset
     """
     description: String!
+    """
+    Editable name of the Dataset
+    """
+    name: String
 }
 
 """
@@ -11244,6 +11274,21 @@ input CreatePostInput {
     The content of the post
     """
     content: UpdatePostContentInput!
+
+    """
+    Optional target URN for the post
+    """
+    resourceUrn: String
+
+    """
+    An optional type of a sub resource to attach the Tag to
+    """
+    subResourceType: SubResourceType
+
+    """
+    Optional target subresource for the post
+    """
+    subResource: String
 }
 
 """
diff --git a/datahub-graphql-core/src/main/resources/search.graphql b/datahub-graphql-core/src/main/resources/search.graphql
index c7b5e61e9831c8..84e81e9096a3b9 100644
--- a/datahub-graphql-core/src/main/resources/search.graphql
+++ b/datahub-graphql-core/src/main/resources/search.graphql
@@ -582,6 +582,18 @@ type SearchResults {
   suggestions: [SearchSuggestion!]
 }
 
+type ExtraProperty {
+  """
+  Name of the extra property
+  """
+  name: String!
+
+  """
+  Value of the extra property
+  """
+  value: String!
+}
+
 """
 An individual search result hit
 """
@@ -600,6 +612,11 @@ type SearchResult {
   Matched field hint
   """
   matchedFields: [MatchedField!]!
+
+  """
+  Additional properties about the search result. Used for rendering in the UI
+  """
+  extraProperties: [ExtraProperty!]
 }
 
 """
@@ -1372,7 +1389,12 @@ input SearchSortInput {
   """
   A criterion to sort search results on
   """
-  sortCriterion: SortCriterion!
+  sortCriterion: SortCriterion @deprecated(reason: "Use sortCriteria instead")
+
+  """
+  A list of values to sort search results on
+  """
+  sortCriteria: [SortCriterion!]
 }
 
 """
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/TestUtils.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/TestUtils.java
index 0df5d162bab442..522e4be0ec5ec2 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/TestUtils.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/TestUtils.java
@@ -12,14 +12,19 @@
 import com.datahub.plugins.auth.authorization.Authorizer;
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.entity.client.EntityClient;
 import com.linkedin.metadata.entity.EntityService;
 import com.linkedin.metadata.entity.ebean.batch.AspectsBatchImpl;
 import com.linkedin.metadata.entity.ebean.batch.ChangeItemImpl;
 import com.linkedin.mxe.MetadataChangeProposal;
+import com.linkedin.r2.RemoteInvocationException;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.test.metadata.context.TestOperationContexts;
 import java.util.List;
+import java.util.stream.Collectors;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
+import org.testng.Assert;
 
 public class TestUtils {
 
@@ -120,53 +125,89 @@ public static QueryContext getMockDenyContext(String actorUrn, AuthorizationRequ
   }
 
   public static void verifyIngestProposal(
-      EntityService<ChangeItemImpl> mockService,
-      int numberOfInvocations,
-      MetadataChangeProposal proposal) {
+      EntityService<?> mockService, int numberOfInvocations, MetadataChangeProposal proposal) {
     verifyIngestProposal(mockService, numberOfInvocations, List.of(proposal));
   }
 
   public static void verifyIngestProposal(
-      EntityService<ChangeItemImpl> mockService,
+      EntityService<?> mockService,
       int numberOfInvocations,
       List<MetadataChangeProposal> proposals) {
 
-    AspectsBatchImpl batch =
-        AspectsBatchImpl.builder()
-            .mcps(
-                proposals,
-                mock(AuditStamp.class),
-                TestOperationContexts.emptyRetrieverContext(null))
-            .build();
+    ArgumentCaptor<AspectsBatchImpl> batchCaptor = ArgumentCaptor.forClass(AspectsBatchImpl.class);
+
     Mockito.verify(mockService, Mockito.times(numberOfInvocations))
-        .ingestProposal(any(), Mockito.eq(batch), Mockito.eq(false));
+        .ingestProposal(any(), batchCaptor.capture(), Mockito.eq(false));
+
+    // check has time
+    Assert.assertTrue(
+        batchCaptor.getValue().getItems().stream()
+            .allMatch(prop -> prop.getSystemMetadata().getLastObserved() > 0L));
+
+    // check without time
+    Assert.assertEquals(
+        batchCaptor.getValue().getItems().stream()
+            .map(m -> m.getSystemMetadata().setLastObserved(0))
+            .collect(Collectors.toList()),
+        proposals.stream()
+            .map(m -> m.getSystemMetadata().setLastObserved(0))
+            .collect(Collectors.toList()));
   }
 
   public static void verifySingleIngestProposal(
-      EntityService<ChangeItemImpl> mockService,
+      EntityService<?> mockService,
       int numberOfInvocations,
-      MetadataChangeProposal proposal) {
+      MetadataChangeProposal expectedProposal) {
+    ArgumentCaptor<MetadataChangeProposal> proposalCaptor =
+        ArgumentCaptor.forClass(MetadataChangeProposal.class);
+
     Mockito.verify(mockService, Mockito.times(numberOfInvocations))
-        .ingestProposal(any(), Mockito.eq(proposal), any(AuditStamp.class), Mockito.eq(false));
+        .ingestProposal(any(), proposalCaptor.capture(), any(AuditStamp.class), Mockito.eq(false));
+
+    // check has time
+    Assert.assertTrue(proposalCaptor.getValue().getSystemMetadata().getLastObserved() > 0L);
+
+    // check without time
+    proposalCaptor.getValue().getSystemMetadata().setLastObserved(0L);
+    expectedProposal.getSystemMetadata().setLastObserved(0L);
+    Assert.assertEquals(proposalCaptor.getValue(), expectedProposal);
   }
 
-  public static void verifyIngestProposal(
-      EntityService<ChangeItemImpl> mockService, int numberOfInvocations) {
+  public static void verifyIngestProposal(EntityService<?> mockService, int numberOfInvocations) {
     Mockito.verify(mockService, Mockito.times(numberOfInvocations))
         .ingestProposal(any(), any(AspectsBatchImpl.class), Mockito.eq(false));
   }
 
   public static void verifySingleIngestProposal(
-      EntityService<ChangeItemImpl> mockService, int numberOfInvocations) {
+      EntityService<?> mockService, int numberOfInvocations) {
     Mockito.verify(mockService, Mockito.times(numberOfInvocations))
         .ingestProposal(
             any(), any(MetadataChangeProposal.class), any(AuditStamp.class), Mockito.eq(false));
   }
 
-  public static void verifyNoIngestProposal(EntityService<ChangeItemImpl> mockService) {
+  public static void verifyNoIngestProposal(EntityService<?> mockService) {
     Mockito.verify(mockService, Mockito.times(0))
         .ingestProposal(any(), any(AspectsBatchImpl.class), Mockito.anyBoolean());
   }
 
+  public static void verifyIngestProposal(
+      EntityClient mockClient, int numberOfInvocations, MetadataChangeProposal expectedProposal)
+      throws RemoteInvocationException {
+
+    ArgumentCaptor<MetadataChangeProposal> proposalCaptor =
+        ArgumentCaptor.forClass(MetadataChangeProposal.class);
+
+    Mockito.verify(mockClient, Mockito.times(numberOfInvocations))
+        .ingestProposal(any(), proposalCaptor.capture(), Mockito.eq(false));
+
+    // check has time
+    Assert.assertTrue(proposalCaptor.getValue().getSystemMetadata().getLastObserved() > 0L);
+
+    // check without time
+    proposalCaptor.getValue().getSystemMetadata().setLastObserved(0L);
+    expectedProposal.getSystemMetadata().setLastObserved(0L);
+    Assert.assertEquals(proposalCaptor.getValue(), expectedProposal);
+  }
+
   private TestUtils() {}
 }
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ResolverUtilsTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ResolverUtilsTest.java
index f98284e92ede58..b01aacaaab65ca 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ResolverUtilsTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ResolverUtilsTest.java
@@ -1,6 +1,7 @@
 package com.linkedin.datahub.graphql.resolvers;
 
 import static com.linkedin.datahub.graphql.resolvers.ResolverUtils.*;
+import static com.linkedin.metadata.search.utils.QueryUtils.buildFilterWithUrns;
 import static org.mockito.Mockito.mock;
 import static org.testng.AssertJUnit.assertEquals;
 
@@ -13,6 +14,8 @@
 import com.linkedin.datahub.graphql.generated.FacetFilterInput;
 import com.linkedin.datahub.graphql.generated.FilterOperator;
 import com.linkedin.metadata.aspect.AspectRetriever;
+import com.linkedin.metadata.config.DataHubAppConfiguration;
+import com.linkedin.metadata.config.MetadataChangeProposalConfig;
 import com.linkedin.metadata.query.filter.Condition;
 import com.linkedin.metadata.query.filter.ConjunctiveCriterion;
 import com.linkedin.metadata.query.filter.ConjunctiveCriterionArray;
@@ -102,7 +105,18 @@ public void testBuildFilterWithUrns() throws Exception {
         new ConjunctiveCriterionArray(
             ImmutableList.of(new ConjunctiveCriterion().setAnd(andCriterionArray))));
 
-    Filter finalFilter = buildFilterWithUrns(urns, filter);
+    DataHubAppConfiguration appConfig = new DataHubAppConfiguration();
+    appConfig.setMetadataChangeProposal(new MetadataChangeProposalConfig());
+    appConfig
+        .getMetadataChangeProposal()
+        .setSideEffects(new MetadataChangeProposalConfig.SideEffectsConfig());
+    appConfig
+        .getMetadataChangeProposal()
+        .getSideEffects()
+        .setSchemaField(new MetadataChangeProposalConfig.SideEffectConfig());
+    appConfig.getMetadataChangeProposal().getSideEffects().getSchemaField().setEnabled(true);
+
+    Filter finalFilter = buildFilterWithUrns(appConfig, urns, filter);
 
     Criterion urnsCriterion =
         new Criterion()
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/assertion/DeleteAssertionResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/assertion/DeleteAssertionResolverTest.java
index 4dd09c1e5cfd5f..948088175e8e63 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/assertion/DeleteAssertionResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/assertion/DeleteAssertionResolverTest.java
@@ -31,7 +31,7 @@ public class DeleteAssertionResolverTest {
   public void testGetSuccess() throws Exception {
     EntityClient mockClient = Mockito.mock(EntityClient.class);
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ASSERTION_URN)), eq(true)))
         .thenReturn(true);
     Mockito.when(
@@ -77,7 +77,7 @@ public void testGetSuccess() throws Exception {
   public void testGetSuccessNoAssertionInfoFound() throws Exception {
     EntityClient mockClient = Mockito.mock(EntityClient.class);
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ASSERTION_URN)), eq(true)))
         .thenReturn(true);
     Mockito.when(
@@ -117,7 +117,7 @@ public void testGetSuccessAssertionAlreadyRemoved() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ASSERTION_URN)), eq(true)))
         .thenReturn(false);
 
@@ -149,7 +149,7 @@ public void testGetSuccessAssertionAlreadyRemoved() throws Exception {
   public void testGetUnauthorized() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ASSERTION_URN)), eq(true)))
         .thenReturn(true);
     Mockito.when(
@@ -186,7 +186,7 @@ public void testGetEntityClientException() throws Exception {
         .when(mockClient)
         .deleteEntity(any(), Mockito.any());
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ASSERTION_URN)), eq(true)))
         .thenReturn(true);
 
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/auth/ListAccessTokensResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/auth/ListAccessTokensResolverTest.java
index 6c876226a45e60..020f74475ea607 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/auth/ListAccessTokensResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/auth/ListAccessTokensResolverTest.java
@@ -12,11 +12,11 @@
 import com.linkedin.datahub.graphql.generated.ListAccessTokenResult;
 import com.linkedin.entity.client.EntityClient;
 import com.linkedin.metadata.Constants;
-import com.linkedin.metadata.query.filter.SortCriterion;
 import com.linkedin.metadata.search.SearchEntityArray;
 import com.linkedin.metadata.search.SearchResult;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.Collections;
+import java.util.List;
 import org.mockito.Mockito;
 import org.testng.annotations.Test;
 
@@ -47,7 +47,7 @@ public void testGetSuccess() throws Exception {
                 Mockito.eq(Constants.ACCESS_TOKEN_ENTITY_NAME),
                 Mockito.eq(""),
                 Mockito.eq(buildFilter(filters, Collections.emptyList(), null)),
-                Mockito.any(SortCriterion.class),
+                Mockito.any(List.class),
                 Mockito.eq(input.getStart()),
                 Mockito.eq(input.getCount())))
         .thenReturn(
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/businessattribute/AddBusinessAttributeResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/businessattribute/AddBusinessAttributeResolverTest.java
index 1a0e558e309d7b..280adcf896d5e9 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/businessattribute/AddBusinessAttributeResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/businessattribute/AddBusinessAttributeResolverTest.java
@@ -29,7 +29,7 @@ public class AddBusinessAttributeResolverTest {
       "urn:li:businessAttribute:7d0c4283-de02-4043-aaf2-698b04274658";
   private static final String RESOURCE_URN =
       "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,SampleCypressHiveDataset,PROD),field_bar)";
-  private EntityService mockService;
+  private EntityService<?> mockService;
   private QueryContext mockContext;
   private DataFetchingEnvironment mockEnv;
 
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/businessattribute/CreateBusinessAttributeResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/businessattribute/CreateBusinessAttributeResolverTest.java
index 574b81bb86630f..2623a6b25811ad 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/businessattribute/CreateBusinessAttributeResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/businessattribute/CreateBusinessAttributeResolverTest.java
@@ -56,7 +56,7 @@ public class CreateBusinessAttributeResolverTest {
           TEST_BUSINESS_ATTRIBUTE_DESCRIPTION,
           SchemaFieldDataType.BOOLEAN);
   private EntityClient mockClient;
-  private EntityService mockService;
+  private EntityService<?> mockService;
   private QueryContext mockContext;
   private DataFetchingEnvironment mockEnv;
   private BusinessAttributeService businessAttributeService;
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/businessattribute/RemoveBusinessAttributeResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/businessattribute/RemoveBusinessAttributeResolverTest.java
index 32a12d3ee8607e..3e7df667160624 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/businessattribute/RemoveBusinessAttributeResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/businessattribute/RemoveBusinessAttributeResolverTest.java
@@ -31,7 +31,7 @@ public class RemoveBusinessAttributeResolverTest {
       "urn:li:businessAttribute:7d0c4283-de02-4043-aaf2-698b04274658";
   private static final String RESOURCE_URN =
       "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,SampleCypressHiveDataset,PROD),field_bar)";
-  private EntityService mockService;
+  private EntityService<?> mockService;
   private QueryContext mockContext;
   private DataFetchingEnvironment mockEnv;
 
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/container/ContainerEntitiesResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/container/ContainerEntitiesResolverTest.java
index c63c9bccab68b5..48732727762eea 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/container/ContainerEntitiesResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/container/ContainerEntitiesResolverTest.java
@@ -62,7 +62,7 @@ public void testGetSuccess() throws Exception {
                                         new CriterionArray(ImmutableList.of(filterCriterion)))))),
                 Mockito.eq(0),
                 Mockito.eq(20),
-                Mockito.eq(null),
+                Mockito.eq(Collections.emptyList()),
                 Mockito.eq(null)))
         .thenReturn(
             new SearchResult()
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/datacontract/DataContractUtilsTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/datacontract/DataContractUtilsTest.java
index 18ede7c306e424..646c72422aa618 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/datacontract/DataContractUtilsTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/datacontract/DataContractUtilsTest.java
@@ -12,6 +12,7 @@
 import com.linkedin.common.urn.Urn;
 import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.metadata.config.DataHubAppConfiguration;
 import graphql.Assert;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.test.metadata.context.TestOperationContexts;
@@ -56,6 +57,11 @@ public OperationContext getOperationContext() {
                 return TestOperationContexts.userContextNoSearchAuthorization(
                     getAuthorizer(), getAuthentication());
               }
+
+              @Override
+              public DataHubAppConfiguration getDataHubAppConfig() {
+                return new DataHubAppConfiguration();
+              }
             },
             testUrn);
     Assert.assertTrue(result);
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/datacontract/UpsertDataContractResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/datacontract/UpsertDataContractResolverTest.java
index 601fc56b251495..bf01b54c7ed726 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/datacontract/UpsertDataContractResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/datacontract/UpsertDataContractResolverTest.java
@@ -2,6 +2,7 @@
 
 import static com.linkedin.datahub.graphql.TestUtils.*;
 import static com.linkedin.datahub.graphql.resolvers.datacontract.EntityDataContractResolver.*;
+import static com.linkedin.metadata.utils.SystemMetadataUtils.createDefaultSystemMetadata;
 import static org.mockito.ArgumentMatchers.any;
 import static org.testng.Assert.*;
 
@@ -43,14 +44,19 @@
 import com.linkedin.metadata.utils.EntityKeyUtils;
 import com.linkedin.metadata.utils.GenericRecordUtils;
 import com.linkedin.mxe.MetadataChangeProposal;
-import com.linkedin.mxe.SystemMetadata;
 import com.linkedin.r2.RemoteInvocationException;
 import graphql.schema.DataFetchingEnvironment;
 import io.datahubproject.metadata.context.OperationContext;
 import java.util.Collections;
+import java.util.List;
 import java.util.concurrent.CompletionException;
+import java.util.stream.Collectors;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
 import org.testng.Assert;
+import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 public class UpsertDataContractResolverTest {
@@ -83,9 +89,15 @@ public class UpsertDataContractResolverTest {
 
   private static final Urn TEST_ACTOR_URN = UrnUtils.getUrn("urn:li:corpuser:test");
 
+  @Captor private ArgumentCaptor<List<MetadataChangeProposal>> proposalCaptor;
+
+  @BeforeTest
+  public void init() {
+    MockitoAnnotations.openMocks(this);
+  }
+
   @Test
   public void testGetSuccessCreate() throws Exception {
-
     // Expected results
     final DataContractKey key = new DataContractKey();
     key.setId("test-id");
@@ -127,7 +139,8 @@ public void testGetSuccessCreate() throws Exception {
     propertiesProposal.setEntityUrn(dataContractUrn);
     propertiesProposal.setEntityType(Constants.DATA_CONTRACT_ENTITY_NAME);
     propertiesProposal.setSystemMetadata(
-        new SystemMetadata().setProperties(new StringMap(ImmutableMap.of("appSource", "ui"))));
+        createDefaultSystemMetadata()
+            .setProperties(new StringMap(ImmutableMap.of("appSource", "ui"))));
     propertiesProposal.setAspectName(Constants.DATA_CONTRACT_PROPERTIES_ASPECT_NAME);
     propertiesProposal.setAspect(GenericRecordUtils.serializeAspect(props));
     propertiesProposal.setChangeType(ChangeType.UPSERT);
@@ -136,16 +149,29 @@ public void testGetSuccessCreate() throws Exception {
     statusProposal.setEntityUrn(dataContractUrn);
     statusProposal.setEntityType(Constants.DATA_CONTRACT_ENTITY_NAME);
     statusProposal.setSystemMetadata(
-        new SystemMetadata().setProperties(new StringMap(ImmutableMap.of("appSource", "ui"))));
+        createDefaultSystemMetadata()
+            .setProperties(new StringMap(ImmutableMap.of("appSource", "ui"))));
     statusProposal.setAspectName(Constants.DATA_CONTRACT_STATUS_ASPECT_NAME);
     statusProposal.setAspect(GenericRecordUtils.serializeAspect(status));
     statusProposal.setChangeType(ChangeType.UPSERT);
 
     Mockito.verify(mockClient, Mockito.times(1))
         .batchIngestProposals(
-            any(OperationContext.class),
-            Mockito.eq(ImmutableList.of(propertiesProposal, statusProposal)),
-            Mockito.eq(false));
+            any(OperationContext.class), proposalCaptor.capture(), Mockito.eq(false));
+
+    // check has time
+    Assert.assertTrue(
+        proposalCaptor.getValue().stream()
+            .allMatch(prop -> prop.getSystemMetadata().getLastObserved() > 0L));
+
+    // check without time
+    Assert.assertEquals(
+        proposalCaptor.getValue().stream()
+            .map(m -> m.getSystemMetadata().setLastObserved(0))
+            .collect(Collectors.toList()),
+        List.of(propertiesProposal, statusProposal).stream()
+            .map(m -> m.getSystemMetadata().setLastObserved(0))
+            .collect(Collectors.toList()));
 
     Assert.assertEquals(result.getUrn(), TEST_CONTRACT_URN.toString());
   }
@@ -188,7 +214,8 @@ public void testGetSuccessUpdate() throws Exception {
     propertiesProposal.setEntityUrn(TEST_CONTRACT_URN);
     propertiesProposal.setEntityType(Constants.DATA_CONTRACT_ENTITY_NAME);
     propertiesProposal.setSystemMetadata(
-        new SystemMetadata().setProperties(new StringMap(ImmutableMap.of("appSource", "ui"))));
+        createDefaultSystemMetadata()
+            .setProperties(new StringMap(ImmutableMap.of("appSource", "ui"))));
     propertiesProposal.setAspectName(Constants.DATA_CONTRACT_PROPERTIES_ASPECT_NAME);
     propertiesProposal.setAspect(GenericRecordUtils.serializeAspect(props));
     propertiesProposal.setChangeType(ChangeType.UPSERT);
@@ -197,16 +224,29 @@ public void testGetSuccessUpdate() throws Exception {
     statusProposal.setEntityUrn(TEST_CONTRACT_URN);
     statusProposal.setEntityType(Constants.DATA_CONTRACT_ENTITY_NAME);
     statusProposal.setSystemMetadata(
-        new SystemMetadata().setProperties(new StringMap(ImmutableMap.of("appSource", "ui"))));
+        createDefaultSystemMetadata()
+            .setProperties(new StringMap(ImmutableMap.of("appSource", "ui"))));
     statusProposal.setAspectName(Constants.DATA_CONTRACT_STATUS_ASPECT_NAME);
     statusProposal.setAspect(GenericRecordUtils.serializeAspect(status));
     statusProposal.setChangeType(ChangeType.UPSERT);
 
     Mockito.verify(mockClient, Mockito.times(1))
         .batchIngestProposals(
-            any(OperationContext.class),
-            Mockito.eq(ImmutableList.of(propertiesProposal, statusProposal)),
-            Mockito.eq(false));
+            any(OperationContext.class), proposalCaptor.capture(), Mockito.eq(false));
+
+    // check has time
+    Assert.assertTrue(
+        proposalCaptor.getValue().stream()
+            .allMatch(prop -> prop.getSystemMetadata().getLastObserved() > 0L));
+
+    // check without time
+    Assert.assertEquals(
+        proposalCaptor.getValue().stream()
+            .map(m -> m.getSystemMetadata().setLastObserved(0))
+            .collect(Collectors.toList()),
+        List.of(propertiesProposal, statusProposal).stream()
+            .map(m -> m.getSystemMetadata().setLastObserved(0))
+            .collect(Collectors.toList()));
 
     Assert.assertEquals(result.getUrn(), TEST_CONTRACT_URN.toString());
   }
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/delete/BatchUpdateSoftDeletedResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/delete/BatchUpdateSoftDeletedResolverTest.java
index 02c9212e7f563d..48b3dc5f6db943 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/delete/BatchUpdateSoftDeletedResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/delete/BatchUpdateSoftDeletedResolverTest.java
@@ -33,7 +33,7 @@ public class BatchUpdateSoftDeletedResolverTest {
 
   @Test
   public void testGetSuccessNoExistingStatus() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -84,7 +84,7 @@ public void testGetSuccessNoExistingStatus() throws Exception {
   public void testGetSuccessExistingStatus() throws Exception {
     final Status originalStatus = new Status().setRemoved(true);
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -133,7 +133,7 @@ public void testGetSuccessExistingStatus() throws Exception {
 
   @Test
   public void testGetFailureResourceDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -173,7 +173,7 @@ public void testGetFailureResourceDoesNotExist() throws Exception {
 
   @Test
   public void testGetUnauthorized() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     BatchUpdateSoftDeletedResolver resolver = new BatchUpdateSoftDeletedResolver(mockService);
 
@@ -193,7 +193,7 @@ public void testGetUnauthorized() throws Exception {
 
   @Test
   public void testGetEntityClientException() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.doThrow(RuntimeException.class)
         .when(mockService)
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/BatchUpdateDeprecationResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/BatchUpdateDeprecationResolverTest.java
index b7324d210fc212..265a1a2e0af5ba 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/BatchUpdateDeprecationResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/BatchUpdateDeprecationResolverTest.java
@@ -34,7 +34,7 @@ public class BatchUpdateDeprecationResolverTest {
 
   @Test
   public void testGetSuccessNoExistingDeprecation() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -99,7 +99,7 @@ public void testGetSuccessExistingDeprecation() throws Exception {
             .setNote("")
             .setActor(UrnUtils.getUrn("urn:li:corpuser:test"));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -158,7 +158,7 @@ public void testGetSuccessExistingDeprecation() throws Exception {
 
   @Test
   public void testGetFailureResourceDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -202,7 +202,7 @@ public void testGetFailureResourceDoesNotExist() throws Exception {
 
   @Test
   public void testGetUnauthorized() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     BatchUpdateDeprecationResolver resolver = new BatchUpdateDeprecationResolver(mockService);
 
@@ -226,7 +226,7 @@ public void testGetUnauthorized() throws Exception {
 
   @Test
   public void testGetEntityClientException() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.doThrow(RuntimeException.class)
         .when(mockService)
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/UpdateDeprecationResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/UpdateDeprecationResolverTest.java
index 09894ccf49f227..ab180724da46df 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/UpdateDeprecationResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/UpdateDeprecationResolverTest.java
@@ -59,7 +59,7 @@ public void testGetSuccessNoExistingDeprecation() throws Exception {
                     .setUrn(Urn.createFromString(TEST_ENTITY_URN))
                     .setAspects(new EnvelopedAspectMap(Collections.emptyMap()))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
         .thenReturn(true);
 
@@ -83,7 +83,7 @@ public void testGetSuccessNoExistingDeprecation() throws Exception {
         MutationUtils.buildMetadataChangeProposalWithUrn(
             UrnUtils.getUrn(TEST_ENTITY_URN), DEPRECATION_ASPECT_NAME, newDeprecation);
 
-    Mockito.verify(mockClient, Mockito.times(1)).ingestProposal(any(), eq(proposal), eq(false));
+    verifyIngestProposal(mockClient, 1, proposal);
 
     Mockito.verify(mockService, Mockito.times(1))
         .exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true));
@@ -120,7 +120,7 @@ public void testGetSuccessExistingDeprecation() throws Exception {
                                 new EnvelopedAspect()
                                     .setValue(new Aspect(originalDeprecation.data())))))));
 
-    EntityService mockService = Mockito.mock(EntityService.class);
+    EntityService<?> mockService = Mockito.mock(EntityService.class);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
         .thenReturn(true);
 
@@ -144,7 +144,7 @@ public void testGetSuccessExistingDeprecation() throws Exception {
         MutationUtils.buildMetadataChangeProposalWithUrn(
             UrnUtils.getUrn(TEST_ENTITY_URN), DEPRECATION_ASPECT_NAME, newDeprecation);
 
-    Mockito.verify(mockClient, Mockito.times(1)).ingestProposal(any(), eq(proposal), eq(false));
+    verifyIngestProposal(mockClient, 1, proposal);
 
     Mockito.verify(mockService, Mockito.times(1))
         .exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true));
@@ -169,7 +169,7 @@ public void testGetFailureEntityDoesNotExist() throws Exception {
                     .setUrn(Urn.createFromString(TEST_ENTITY_URN))
                     .setAspects(new EnvelopedAspectMap(Collections.emptyMap()))));
 
-    EntityService mockService = Mockito.mock(EntityService.class);
+    EntityService<?> mockService = Mockito.mock(EntityService.class);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
         .thenReturn(false);
 
@@ -190,7 +190,7 @@ public void testGetFailureEntityDoesNotExist() throws Exception {
   public void testGetUnauthorized() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = Mockito.mock(EntityService.class);
+    EntityService<?> mockService = Mockito.mock(EntityService.class);
     UpdateDeprecationResolver resolver = new UpdateDeprecationResolver(mockClient, mockService);
 
     // Execute resolver
@@ -206,7 +206,7 @@ public void testGetUnauthorized() throws Exception {
   @Test
   public void testGetEntityClientException() throws Exception {
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = Mockito.mock(EntityService.class);
+    EntityService<?> mockService = Mockito.mock(EntityService.class);
     Mockito.doThrow(RemoteInvocationException.class)
         .when(mockClient)
         .ingestProposal(any(), Mockito.any(), anyBoolean());
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/BatchSetDomainResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/BatchSetDomainResolverTest.java
index 9fec8b2fd9572c..1a9272c1335cf9 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/BatchSetDomainResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/BatchSetDomainResolverTest.java
@@ -39,7 +39,7 @@ public class BatchSetDomainResolverTest {
 
   @Test
   public void testGetSuccessNoExistingDomains() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -105,7 +105,7 @@ public void testGetSuccessExistingDomains() throws Exception {
         new Domains()
             .setDomains(new UrnArray(ImmutableList.of(Urn.createFromString(TEST_DOMAIN_1_URN))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -176,7 +176,7 @@ public void testGetSuccessUnsetDomains() throws Exception {
         new Domains()
             .setDomains(new UrnArray(ImmutableList.of(Urn.createFromString(TEST_DOMAIN_1_URN))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -233,7 +233,7 @@ public void testGetSuccessUnsetDomains() throws Exception {
 
   @Test
   public void testGetFailureDomainDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -268,7 +268,7 @@ public void testGetFailureDomainDoesNotExist() throws Exception {
 
   @Test
   public void testGetFailureResourceDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -312,7 +312,7 @@ public void testGetFailureResourceDoesNotExist() throws Exception {
 
   @Test
   public void testGetUnauthorized() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     BatchSetDomainResolver resolver = new BatchSetDomainResolver(mockService);
 
@@ -334,7 +334,7 @@ public void testGetUnauthorized() throws Exception {
 
   @Test
   public void testGetEntityClientException() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.doThrow(RuntimeException.class)
         .when(mockService)
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/CreateDomainResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/CreateDomainResolverTest.java
index 1d6c4519358b45..c0d74225a9cf1d 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/CreateDomainResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/CreateDomainResolverTest.java
@@ -53,7 +53,7 @@ public class CreateDomainResolverTest {
   public void testGetSuccess() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     CreateDomainResolver resolver = new CreateDomainResolver(mockClient, mockService);
 
     Mockito.when(mockClient.exists(any(), Mockito.eq(TEST_DOMAIN_URN))).thenReturn(false);
@@ -103,7 +103,7 @@ public void testGetSuccess() throws Exception {
   @Test
   public void testGetSuccessNoParentDomain() throws Exception {
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = Mockito.mock(EntityService.class);
+    EntityService<?> mockService = Mockito.mock(EntityService.class);
     CreateDomainResolver resolver = new CreateDomainResolver(mockClient, mockService);
 
     Mockito.when(mockClient.exists(any(), Mockito.eq(TEST_DOMAIN_URN))).thenReturn(false);
@@ -146,7 +146,7 @@ public void testGetSuccessNoParentDomain() throws Exception {
   @Test
   public void testGetInvalidParent() throws Exception {
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = Mockito.mock(EntityService.class);
+    EntityService<?> mockService = Mockito.mock(EntityService.class);
     CreateDomainResolver resolver = new CreateDomainResolver(mockClient, mockService);
 
     Mockito.when(mockClient.exists(any(), Mockito.eq(TEST_DOMAIN_URN))).thenReturn(false);
@@ -164,7 +164,7 @@ public void testGetInvalidParent() throws Exception {
   @Test
   public void testGetNameConflict() throws Exception {
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = Mockito.mock(EntityService.class);
+    EntityService<?> mockService = Mockito.mock(EntityService.class);
     CreateDomainResolver resolver = new CreateDomainResolver(mockClient, mockService);
 
     Mockito.when(mockClient.exists(any(), Mockito.eq(TEST_DOMAIN_URN))).thenReturn(false);
@@ -218,7 +218,7 @@ public void testGetNameConflict() throws Exception {
   public void testGetUnauthorized() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     CreateDomainResolver resolver = new CreateDomainResolver(mockClient, mockService);
 
     // Execute resolver
@@ -235,7 +235,7 @@ public void testGetUnauthorized() throws Exception {
   public void testGetEntityClientException() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.doThrow(RemoteInvocationException.class)
         .when(mockClient)
         .ingestProposal(any(), Mockito.any(), Mockito.eq(false));
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/DomainEntitiesResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/DomainEntitiesResolverTest.java
index f970f9e2ea431d..ad5d7f1ef6b06f 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/DomainEntitiesResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/DomainEntitiesResolverTest.java
@@ -68,7 +68,7 @@ public void testGetSuccess() throws Exception {
                                         new CriterionArray(ImmutableList.of(filterCriterion)))))),
                 Mockito.eq(0),
                 Mockito.eq(20),
-                Mockito.eq(null),
+                Mockito.eq(Collections.emptyList()),
                 Mockito.eq(null)))
         .thenReturn(
             new SearchResult()
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/ListDomainsResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/ListDomainsResolverTest.java
index 53a16ed5f6cc8a..c3b1a8c564855a 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/ListDomainsResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/ListDomainsResolverTest.java
@@ -20,6 +20,7 @@
 import com.linkedin.metadata.search.SearchResult;
 import com.linkedin.r2.RemoteInvocationException;
 import graphql.schema.DataFetchingEnvironment;
+import java.util.Collections;
 import java.util.concurrent.CompletionException;
 import org.mockito.Mockito;
 import org.testng.annotations.Test;
@@ -47,9 +48,10 @@ public void testGetSuccess() throws Exception {
                 Mockito.eq(""),
                 Mockito.eq(DomainUtils.buildParentDomainFilter(TEST_PARENT_DOMAIN_URN)),
                 Mockito.eq(
-                    new SortCriterion()
-                        .setField(DOMAIN_CREATED_TIME_INDEX_FIELD_NAME)
-                        .setOrder(SortOrder.DESCENDING)),
+                    Collections.singletonList(
+                        new SortCriterion()
+                            .setField(DOMAIN_CREATED_TIME_INDEX_FIELD_NAME)
+                            .setOrder(SortOrder.DESCENDING))),
                 Mockito.eq(0),
                 Mockito.eq(20)))
         .thenReturn(
@@ -90,9 +92,10 @@ public void testGetSuccessNoParentDomain() throws Exception {
                 Mockito.eq(""),
                 Mockito.eq(DomainUtils.buildParentDomainFilter(null)),
                 Mockito.eq(
-                    new SortCriterion()
-                        .setField(DOMAIN_CREATED_TIME_INDEX_FIELD_NAME)
-                        .setOrder(SortOrder.DESCENDING)),
+                    Collections.singletonList(
+                        new SortCriterion()
+                            .setField(DOMAIN_CREATED_TIME_INDEX_FIELD_NAME)
+                            .setOrder(SortOrder.DESCENDING))),
                 Mockito.eq(0),
                 Mockito.eq(20)))
         .thenReturn(
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/MoveDomainResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/MoveDomainResolverTest.java
index ae1dffbd5d0db8..07fad314747db8 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/MoveDomainResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/MoveDomainResolverTest.java
@@ -40,7 +40,7 @@ public class MoveDomainResolverTest {
   private static final CorpuserUrn TEST_ACTOR_URN = new CorpuserUrn("test");
 
   private MetadataChangeProposal setupTests(
-      DataFetchingEnvironment mockEnv, EntityService mockService, EntityClient mockClient)
+      DataFetchingEnvironment mockEnv, EntityService<?> mockService, EntityClient mockClient)
       throws Exception {
     QueryContext mockContext = getMockAllowContext();
     Mockito.when(mockContext.getAuthentication()).thenReturn(Mockito.mock(Authentication.class));
@@ -77,7 +77,7 @@ private MetadataChangeProposal setupTests(
 
   @Test
   public void testGetSuccess() throws Exception {
-    EntityService mockService = Mockito.mock(EntityService.class);
+    EntityService<?> mockService = Mockito.mock(EntityService.class);
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     Mockito.when(
             mockService.exists(
@@ -100,7 +100,7 @@ public void testGetSuccess() throws Exception {
 
   @Test
   public void testGetFailureEntityDoesNotExist() throws Exception {
-    EntityService mockService = Mockito.mock(EntityService.class);
+    EntityService<?> mockService = Mockito.mock(EntityService.class);
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(PARENT_DOMAIN_URN)), eq(true)))
         .thenReturn(true);
@@ -127,7 +127,7 @@ public void testGetFailureEntityDoesNotExist() throws Exception {
 
   @Test
   public void testGetFailureParentDoesNotExist() throws Exception {
-    EntityService mockService = Mockito.mock(EntityService.class);
+    EntityService<?> mockService = Mockito.mock(EntityService.class);
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(PARENT_DOMAIN_URN)), eq(true)))
         .thenReturn(false);
@@ -143,7 +143,7 @@ public void testGetFailureParentDoesNotExist() throws Exception {
 
   @Test
   public void testGetFailureParentIsNotDomain() throws Exception {
-    EntityService mockService = Mockito.mock(EntityService.class);
+    EntityService<?> mockService = Mockito.mock(EntityService.class);
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(PARENT_DOMAIN_URN)), eq(true)))
         .thenReturn(true);
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/SetDomainResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/SetDomainResolverTest.java
index 031ac1da8480bf..5437f1c860fde6 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/SetDomainResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/SetDomainResolverTest.java
@@ -59,7 +59,7 @@ public void testGetSuccessNoExistingDomains() throws Exception {
                     .setUrn(Urn.createFromString(TEST_ENTITY_URN))
                     .setAspects(new EnvelopedAspectMap(Collections.emptyMap()))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
         .thenReturn(true);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_NEW_DOMAIN_URN)), eq(true)))
@@ -82,8 +82,7 @@ public void testGetSuccessNoExistingDomains() throws Exception {
         MutationUtils.buildMetadataChangeProposalWithUrn(
             UrnUtils.getUrn(TEST_ENTITY_URN), DOMAINS_ASPECT_NAME, newDomains);
 
-    Mockito.verify(mockClient, Mockito.times(1))
-        .ingestProposal(any(), Mockito.eq(proposal), Mockito.eq(false));
+    verifyIngestProposal(mockClient, 1, proposal);
 
     Mockito.verify(mockService, Mockito.times(1))
         .exists(any(), Mockito.eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true));
@@ -122,7 +121,7 @@ public void testGetSuccessExistingDomains() throws Exception {
                                 new EnvelopedAspect()
                                     .setValue(new Aspect(originalDomains.data())))))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
         .thenReturn(true);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_NEW_DOMAIN_URN)), eq(true)))
@@ -145,8 +144,7 @@ public void testGetSuccessExistingDomains() throws Exception {
         MutationUtils.buildMetadataChangeProposalWithUrn(
             UrnUtils.getUrn(TEST_ENTITY_URN), DOMAINS_ASPECT_NAME, newDomains);
 
-    Mockito.verify(mockClient, Mockito.times(1))
-        .ingestProposal(any(), Mockito.eq(proposal), Mockito.eq(false));
+    verifyIngestProposal(mockClient, 1, proposal);
 
     Mockito.verify(mockService, Mockito.times(1))
         .exists(any(), Mockito.eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true));
@@ -175,7 +173,7 @@ public void testGetFailureDomainDoesNotExist() throws Exception {
                     .setUrn(Urn.createFromString(TEST_ENTITY_URN))
                     .setAspects(new EnvelopedAspectMap(Collections.emptyMap()))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
         .thenReturn(true);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_NEW_DOMAIN_URN)), eq(true)))
@@ -214,7 +212,7 @@ public void testGetFailureEntityDoesNotExist() throws Exception {
                     .setUrn(Urn.createFromString(TEST_ENTITY_URN))
                     .setAspects(new EnvelopedAspectMap(Collections.emptyMap()))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
         .thenReturn(false);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_NEW_DOMAIN_URN)), eq(true)))
@@ -237,7 +235,7 @@ public void testGetFailureEntityDoesNotExist() throws Exception {
   public void testGetUnauthorized() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     SetDomainResolver resolver = new SetDomainResolver(mockClient, mockService);
 
     // Execute resolver
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/UnsetDomainResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/UnsetDomainResolverTest.java
index b9910e6ca3c85e..1c61963703a2ab 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/UnsetDomainResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/domain/UnsetDomainResolverTest.java
@@ -58,7 +58,7 @@ public void testGetSuccessNoExistingDomains() throws Exception {
                     .setUrn(Urn.createFromString(TEST_ENTITY_URN))
                     .setAspects(new EnvelopedAspectMap(Collections.emptyMap()))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
         .thenReturn(true);
 
@@ -76,8 +76,7 @@ public void testGetSuccessNoExistingDomains() throws Exception {
         MutationUtils.buildMetadataChangeProposalWithUrn(
             UrnUtils.getUrn(TEST_ENTITY_URN), DOMAINS_ASPECT_NAME, newDomains);
 
-    Mockito.verify(mockClient, Mockito.times(1))
-        .ingestProposal(any(), Mockito.eq(proposal), Mockito.eq(false));
+    verifyIngestProposal(mockClient, 1, proposal);
 
     Mockito.verify(mockService, Mockito.times(1))
         .exists(any(), Mockito.eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true));
@@ -113,7 +112,7 @@ public void testGetSuccessExistingDomains() throws Exception {
                                 new EnvelopedAspect()
                                     .setValue(new Aspect(originalDomains.data())))))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
         .thenReturn(true);
 
@@ -131,8 +130,7 @@ public void testGetSuccessExistingDomains() throws Exception {
         MutationUtils.buildMetadataChangeProposalWithUrn(
             UrnUtils.getUrn(TEST_ENTITY_URN), DOMAINS_ASPECT_NAME, newDomains);
 
-    Mockito.verify(mockClient, Mockito.times(1))
-        .ingestProposal(any(), Mockito.eq(proposal), Mockito.eq(false));
+    verifyIngestProposal(mockClient, 1, proposal);
 
     Mockito.verify(mockService, Mockito.times(1))
         .exists(any(), Mockito.eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true));
@@ -158,7 +156,7 @@ public void testGetFailureEntityDoesNotExist() throws Exception {
                     .setUrn(Urn.createFromString(TEST_ENTITY_URN))
                     .setAspects(new EnvelopedAspectMap(Collections.emptyMap()))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
         .thenReturn(false);
 
@@ -178,7 +176,7 @@ public void testGetFailureEntityDoesNotExist() throws Exception {
   public void testGetUnauthorized() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     UnsetDomainResolver resolver = new UnsetDomainResolver(mockClient, mockService);
 
     // Execute resolver
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/embed/UpdateEmbedResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/embed/UpdateEmbedResolverTest.java
index 2bb9dff29a5643..c45e620a46a73d 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/embed/UpdateEmbedResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/embed/UpdateEmbedResolverTest.java
@@ -39,7 +39,7 @@ public class UpdateEmbedResolverTest {
 
   @Test
   public void testGetSuccessNoExistingEmbed() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -68,7 +68,6 @@ public void testGetSuccessNoExistingEmbed() throws Exception {
             Urn.createFromString(TEST_ENTITY_URN), EMBED_ASPECT_NAME, newEmbed);
 
     verifySingleIngestProposal(mockService, 1, proposal);
-    ;
 
     Mockito.verify(mockService, Mockito.times(1))
         .exists(any(), Mockito.eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true));
@@ -79,7 +78,7 @@ public void testGetSuccessExistingEmbed() throws Exception {
     Embed originalEmbed = new Embed().setRenderUrl("https://otherurl.com");
 
     // Create resolver
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -132,7 +131,7 @@ public void testGetFailureEntityDoesNotExist() throws Exception {
                     .setUrn(Urn.createFromString(TEST_ENTITY_URN))
                     .setAspects(new EnvelopedAspectMap(Collections.emptyMap()))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
         .thenReturn(false);
 
@@ -154,7 +153,7 @@ public void testGetFailureEntityDoesNotExist() throws Exception {
   @Test
   public void testGetUnauthorized() throws Exception {
     // Create resolver
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     UpdateEmbedResolver resolver = new UpdateEmbedResolver(mockService);
 
     // Execute resolver
@@ -171,7 +170,7 @@ public void testGetUnauthorized() throws Exception {
   @Test
   public void testGetEntityClientException() throws Exception {
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.doThrow(RemoteInvocationException.class)
         .when(mockClient)
         .ingestProposal(any(), Mockito.any());
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/AddRelatedTermsResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/AddRelatedTermsResolverTest.java
index ffa9e4a728dda4..a8920fa9e5b3c2 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/AddRelatedTermsResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/AddRelatedTermsResolverTest.java
@@ -28,7 +28,7 @@ public class AddRelatedTermsResolverTest {
   private static final String DATASET_URN = "urn:li:dataset:(test,test,test)";
 
   private EntityService setUpService() {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(
             mockService.getAspect(
                 any(),
@@ -41,7 +41,7 @@ private EntityService setUpService() {
 
   @Test
   public void testGetSuccessIsRelatedNonExistent() throws Exception {
-    EntityService mockService = setUpService();
+    EntityService<?> mockService = setUpService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
 
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
@@ -75,7 +75,7 @@ public void testGetSuccessIsRelatedNonExistent() throws Exception {
 
   @Test
   public void testGetSuccessHasRelatedNonExistent() throws Exception {
-    EntityService mockService = setUpService();
+    EntityService<?> mockService = setUpService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
 
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
@@ -109,7 +109,7 @@ public void testGetSuccessHasRelatedNonExistent() throws Exception {
 
   @Test
   public void testGetFailAddSelfAsRelatedTerm() throws Exception {
-    EntityService mockService = setUpService();
+    EntityService<?> mockService = setUpService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
 
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
@@ -131,7 +131,7 @@ public void testGetFailAddSelfAsRelatedTerm() throws Exception {
 
   @Test
   public void testGetFailAddNonTermAsRelatedTerm() throws Exception {
-    EntityService mockService = setUpService();
+    EntityService<?> mockService = setUpService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
 
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
@@ -153,7 +153,7 @@ public void testGetFailAddNonTermAsRelatedTerm() throws Exception {
 
   @Test
   public void testGetFailAddNonExistentTermAsRelatedTerm() throws Exception {
-    EntityService mockService = setUpService();
+    EntityService<?> mockService = setUpService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
 
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
@@ -177,7 +177,7 @@ public void testGetFailAddNonExistentTermAsRelatedTerm() throws Exception {
 
   @Test
   public void testGetFailAddToNonExistentUrn() throws Exception {
-    EntityService mockService = setUpService();
+    EntityService<?> mockService = setUpService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
 
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
@@ -201,7 +201,7 @@ public void testGetFailAddToNonExistentUrn() throws Exception {
 
   @Test
   public void testGetFailAddToNonTerm() throws Exception {
-    EntityService mockService = setUpService();
+    EntityService<?> mockService = setUpService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
 
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(DATASET_URN)), eq(true)))
@@ -225,7 +225,7 @@ public void testGetFailAddToNonTerm() throws Exception {
 
   @Test
   public void testFailNoPermissions() throws Exception {
-    EntityService mockService = setUpService();
+    EntityService<?> mockService = setUpService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
 
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryNodeResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryNodeResolverTest.java
index 1a7e74c36733ca..0f2fa7f88cd9b6 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryNodeResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryNodeResolverTest.java
@@ -2,8 +2,8 @@
 
 import static com.linkedin.datahub.graphql.TestUtils.getMockAllowContext;
 import static com.linkedin.datahub.graphql.TestUtils.getMockEntityService;
+import static com.linkedin.datahub.graphql.TestUtils.verifyIngestProposal;
 import static com.linkedin.metadata.Constants.*;
-import static org.mockito.ArgumentMatchers.any;
 
 import com.datahub.authentication.Authentication;
 import com.linkedin.common.urn.GlossaryNodeUrn;
@@ -63,7 +63,7 @@ private MetadataChangeProposal setupTest(
   @Test
   public void testGetSuccess() throws Exception {
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
     final MetadataChangeProposal proposal =
         setupTest(mockEnv, TEST_INPUT, "test-description", parentNodeUrn);
@@ -71,14 +71,13 @@ public void testGetSuccess() throws Exception {
     CreateGlossaryNodeResolver resolver = new CreateGlossaryNodeResolver(mockClient, mockService);
     resolver.get(mockEnv).get();
 
-    Mockito.verify(mockClient, Mockito.times(1))
-        .ingestProposal(any(), Mockito.eq(proposal), Mockito.eq(false));
+    verifyIngestProposal(mockClient, 1, proposal);
   }
 
   @Test
   public void testGetSuccessNoDescription() throws Exception {
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
     final MetadataChangeProposal proposal =
         setupTest(mockEnv, TEST_INPUT_NO_DESCRIPTION, "", parentNodeUrn);
@@ -86,14 +85,13 @@ public void testGetSuccessNoDescription() throws Exception {
     CreateGlossaryNodeResolver resolver = new CreateGlossaryNodeResolver(mockClient, mockService);
     resolver.get(mockEnv).get();
 
-    Mockito.verify(mockClient, Mockito.times(1))
-        .ingestProposal(any(), Mockito.eq(proposal), Mockito.eq(false));
+    verifyIngestProposal(mockClient, 1, proposal);
   }
 
   @Test
   public void testGetSuccessNoParentNode() throws Exception {
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
     final MetadataChangeProposal proposal =
         setupTest(mockEnv, TEST_INPUT_NO_PARENT_NODE, "test-description", null);
@@ -101,7 +99,6 @@ public void testGetSuccessNoParentNode() throws Exception {
     CreateGlossaryNodeResolver resolver = new CreateGlossaryNodeResolver(mockClient, mockService);
     resolver.get(mockEnv).get();
 
-    Mockito.verify(mockClient, Mockito.times(1))
-        .ingestProposal(any(), Mockito.eq(proposal), Mockito.eq(false));
+    verifyIngestProposal(mockClient, 1, proposal);
   }
 }
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryTermResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryTermResolverTest.java
index 728a840d97e94e..8a51d8ea100092 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryTermResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/CreateGlossaryTermResolverTest.java
@@ -2,6 +2,7 @@
 
 import static com.linkedin.datahub.graphql.TestUtils.getMockAllowContext;
 import static com.linkedin.datahub.graphql.TestUtils.getMockEntityService;
+import static com.linkedin.datahub.graphql.TestUtils.verifyIngestProposal;
 import static com.linkedin.metadata.Constants.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -81,7 +82,7 @@ private MetadataChangeProposal setupTest(
   @Test
   public void testGetSuccess() throws Exception {
     EntityClient mockClient = initMockClient();
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
     final MetadataChangeProposal proposal =
         setupTest(mockEnv, TEST_INPUT, "test-description", parentNodeUrn);
@@ -89,14 +90,13 @@ public void testGetSuccess() throws Exception {
     CreateGlossaryTermResolver resolver = new CreateGlossaryTermResolver(mockClient, mockService);
     resolver.get(mockEnv).get();
 
-    Mockito.verify(mockClient, Mockito.times(1))
-        .ingestProposal(any(), Mockito.eq(proposal), Mockito.eq(false));
+    verifyIngestProposal(mockClient, 1, proposal);
   }
 
   @Test
   public void testGetSuccessNoDescription() throws Exception {
     EntityClient mockClient = initMockClient();
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
     final MetadataChangeProposal proposal =
         setupTest(mockEnv, TEST_INPUT_NO_DESCRIPTION, "", parentNodeUrn);
@@ -104,14 +104,13 @@ public void testGetSuccessNoDescription() throws Exception {
     CreateGlossaryTermResolver resolver = new CreateGlossaryTermResolver(mockClient, mockService);
     resolver.get(mockEnv).get();
 
-    Mockito.verify(mockClient, Mockito.times(1))
-        .ingestProposal(any(), Mockito.eq(proposal), Mockito.eq(false));
+    verifyIngestProposal(mockClient, 1, proposal);
   }
 
   @Test
   public void testGetSuccessNoParentNode() throws Exception {
     EntityClient mockClient = initMockClient();
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
     final MetadataChangeProposal proposal =
         setupTest(mockEnv, TEST_INPUT_NO_PARENT_NODE, "test-description", null);
@@ -119,8 +118,7 @@ public void testGetSuccessNoParentNode() throws Exception {
     CreateGlossaryTermResolver resolver = new CreateGlossaryTermResolver(mockClient, mockService);
     resolver.get(mockEnv).get();
 
-    Mockito.verify(mockClient, Mockito.times(1))
-        .ingestProposal(any(), Mockito.eq(proposal), Mockito.eq(false));
+    verifyIngestProposal(mockClient, 1, proposal);
   }
 
   @Test
@@ -157,7 +155,7 @@ public void testGetFailureExistingTermSameName() throws Exception {
                 Mockito.eq(Collections.singleton(GLOSSARY_TERM_INFO_ASPECT_NAME))))
         .thenReturn(result);
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
 
     CreateGlossaryEntityInput input =
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/DeleteGlossaryEntityResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/DeleteGlossaryEntityResolverTest.java
index 18c4b07ffeff04..9adc5d5e516e52 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/DeleteGlossaryEntityResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/DeleteGlossaryEntityResolverTest.java
@@ -25,7 +25,7 @@ public class DeleteGlossaryEntityResolverTest {
   @Test
   public void testGetSuccess() throws Exception {
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_TERM_URN)), eq(true)))
         .thenReturn(true);
@@ -50,7 +50,7 @@ public void testGetEntityClientException() throws Exception {
         .when(mockClient)
         .deleteEntity(any(), Mockito.any());
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_TERM_URN)), eq(true)))
         .thenReturn(true);
 
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/RemoveRelatedTermsResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/RemoveRelatedTermsResolverTest.java
index 5de7966dc15e99..85019a475865e1 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/RemoveRelatedTermsResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/RemoveRelatedTermsResolverTest.java
@@ -36,7 +36,7 @@ public void testGetSuccessIsA() throws Exception {
     GlossaryTermUrn term2Urn = GlossaryTermUrn.createFromString(TEST_TERM_2_URN);
     final GlossaryRelatedTerms relatedTerms = new GlossaryRelatedTerms();
     relatedTerms.setIsRelatedTerms(new GlossaryTermUrnArray(Arrays.asList(term1Urn, term2Urn)));
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(
             mockService.getAspect(
                 any(),
@@ -71,7 +71,7 @@ public void testGetSuccessHasA() throws Exception {
     GlossaryTermUrn term2Urn = GlossaryTermUrn.createFromString(TEST_TERM_2_URN);
     final GlossaryRelatedTerms relatedTerms = new GlossaryRelatedTerms();
     relatedTerms.setHasRelatedTerms(new GlossaryTermUrnArray(Arrays.asList(term1Urn, term2Urn)));
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(
             mockService.getAspect(
                 any(),
@@ -102,7 +102,7 @@ public void testGetSuccessHasA() throws Exception {
 
   @Test
   public void testFailAspectDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(
             mockService.getAspect(
                 any(),
@@ -135,7 +135,7 @@ public void testFailNoPermissions() throws Exception {
     GlossaryTermUrn term2Urn = GlossaryTermUrn.createFromString(TEST_TERM_2_URN);
     final GlossaryRelatedTerms relatedTerms = new GlossaryRelatedTerms();
     relatedTerms.setIsRelatedTerms(new GlossaryTermUrnArray(Arrays.asList(term1Urn, term2Urn)));
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(
             mockService.getAspect(
                 any(),
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/UpdateNameResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/UpdateNameResolverTest.java
index e6f4aae56127ce..b4a2655755a028 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/UpdateNameResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/UpdateNameResolverTest.java
@@ -42,7 +42,7 @@ public class UpdateNameResolverTest {
   private static final CorpuserUrn TEST_ACTOR_URN = new CorpuserUrn("test");
 
   private MetadataChangeProposal setupTests(
-      DataFetchingEnvironment mockEnv, EntityService mockService) throws Exception {
+      DataFetchingEnvironment mockEnv, EntityService<?> mockService) throws Exception {
     QueryContext mockContext = getMockAllowContext();
     Mockito.when(mockContext.getAuthentication()).thenReturn(Mockito.mock(Authentication.class));
     Mockito.when(mockContext.getActorUrn()).thenReturn(TEST_ACTOR_URN.toString());
@@ -65,7 +65,7 @@ private MetadataChangeProposal setupTests(
 
   @Test
   public void testGetSuccess() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     Mockito.when(
             mockService.exists(
@@ -83,7 +83,7 @@ public void testGetSuccess() throws Exception {
 
   @Test
   public void testGetSuccessForNode() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(NODE_URN)), eq(true)))
         .thenReturn(true);
@@ -117,7 +117,7 @@ public void testGetSuccessForNode() throws Exception {
 
   @Test
   public void testGetSuccessForDomain() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(DOMAIN_URN)), eq(true)))
         .thenReturn(true);
@@ -163,7 +163,7 @@ public void testGetSuccessForDomain() throws Exception {
 
   @Test
   public void testGetFailureEntityDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     Mockito.when(
             mockService.exists(
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/UpdateParentNodeResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/UpdateParentNodeResolverTest.java
index 39f9066bcddaa0..25a900d4d90696 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/UpdateParentNodeResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/glossary/UpdateParentNodeResolverTest.java
@@ -43,7 +43,7 @@ public class UpdateParentNodeResolverTest {
   private static final CorpuserUrn TEST_ACTOR_URN = new CorpuserUrn("test");
 
   private MetadataChangeProposal setupTests(
-      DataFetchingEnvironment mockEnv, EntityService mockService) throws Exception {
+      DataFetchingEnvironment mockEnv, EntityService<?> mockService) throws Exception {
     QueryContext mockContext = getMockAllowContext();
     Mockito.when(mockContext.getAuthentication()).thenReturn(Mockito.mock(Authentication.class));
     Mockito.when(mockContext.getActorUrn()).thenReturn(TEST_ACTOR_URN.toString());
@@ -67,7 +67,7 @@ private MetadataChangeProposal setupTests(
 
   @Test
   public void testGetSuccess() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TERM_URN)), eq(true)))
         .thenReturn(true);
@@ -89,7 +89,7 @@ public void testGetSuccess() throws Exception {
 
   @Test
   public void testGetSuccessForNode() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(NODE_URN)), eq(true)))
         .thenReturn(true);
@@ -129,7 +129,7 @@ public void testGetSuccessForNode() throws Exception {
 
   @Test
   public void testGetFailureEntityDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TERM_URN)), eq(true)))
         .thenReturn(false);
@@ -149,7 +149,7 @@ public void testGetFailureEntityDoesNotExist() throws Exception {
 
   @Test
   public void testGetFailureNodeDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TERM_URN)), eq(true)))
         .thenReturn(true);
@@ -169,7 +169,7 @@ public void testGetFailureNodeDoesNotExist() throws Exception {
 
   @Test
   public void testGetFailureParentIsNotNode() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TERM_URN)), eq(true)))
         .thenReturn(true);
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/incident/EntityIncidentsResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/incident/EntityIncidentsResolverTest.java
index 4be7eeba1d0180..4750143b8add8b 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/incident/EntityIncidentsResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/incident/EntityIncidentsResolverTest.java
@@ -37,6 +37,7 @@
 import com.linkedin.metadata.search.utils.QueryUtils;
 import graphql.schema.DataFetchingEnvironment;
 import io.datahubproject.metadata.context.OperationContext;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import org.mockito.Mockito;
@@ -92,7 +93,7 @@ public void testGetSuccess() throws Exception {
                 Mockito.any(),
                 Mockito.eq(Constants.INCIDENT_ENTITY_NAME),
                 Mockito.eq(expectedFilter),
-                Mockito.eq(expectedSort),
+                Mockito.eq(Collections.singletonList(expectedSort)),
                 Mockito.eq(0),
                 Mockito.eq(10)))
         .thenReturn(
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ingest/execution/IngestionSourceExecutionRequestsResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ingest/execution/IngestionSourceExecutionRequestsResolverTest.java
index c96dfe89adc5e1..fe4fe00454a261 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ingest/execution/IngestionSourceExecutionRequestsResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ingest/execution/IngestionSourceExecutionRequestsResolverTest.java
@@ -22,7 +22,6 @@
 import com.linkedin.execution.ExecutionRequestResult;
 import com.linkedin.metadata.Constants;
 import com.linkedin.metadata.query.filter.Filter;
-import com.linkedin.metadata.query.filter.SortCriterion;
 import com.linkedin.metadata.search.SearchEntity;
 import com.linkedin.metadata.search.SearchEntityArray;
 import com.linkedin.metadata.search.SearchResult;
@@ -30,6 +29,7 @@
 import graphql.schema.DataFetchingEnvironment;
 import io.datahubproject.metadata.context.OperationContext;
 import java.util.HashSet;
+import java.util.List;
 import org.mockito.Mockito;
 import org.testng.annotations.Test;
 
@@ -46,7 +46,7 @@ public void testGetSuccess() throws Exception {
                 any(),
                 Mockito.eq(Constants.EXECUTION_REQUEST_ENTITY_NAME),
                 Mockito.any(Filter.class),
-                Mockito.any(SortCriterion.class),
+                Mockito.any(List.class),
                 Mockito.eq(0),
                 Mockito.eq(10)))
         .thenReturn(
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/ListSecretsResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/ListSecretsResolverTest.java
index 82b8d895384caa..96a12dc3be5a76 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/ListSecretsResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/ListSecretsResolverTest.java
@@ -15,7 +15,6 @@
 import com.linkedin.entity.EnvelopedAspectMap;
 import com.linkedin.entity.client.EntityClient;
 import com.linkedin.metadata.Constants;
-import com.linkedin.metadata.query.filter.SortCriterion;
 import com.linkedin.metadata.search.SearchEntity;
 import com.linkedin.metadata.search.SearchEntityArray;
 import com.linkedin.metadata.search.SearchResult;
@@ -24,6 +23,7 @@
 import graphql.schema.DataFetchingEnvironment;
 import io.datahubproject.metadata.context.OperationContext;
 import java.util.HashSet;
+import java.util.List;
 import org.mockito.Mockito;
 import org.testng.annotations.Test;
 
@@ -44,7 +44,7 @@ public void testGetSuccess() throws Exception {
                 Mockito.eq(Constants.SECRETS_ENTITY_NAME),
                 Mockito.eq(""),
                 Mockito.eq(null),
-                Mockito.any(SortCriterion.class),
+                Mockito.any(List.class),
                 Mockito.eq(0),
                 Mockito.eq(20)))
         .thenReturn(
@@ -112,7 +112,7 @@ public void testGetUnauthorized() throws Exception {
             Mockito.any(),
             Mockito.eq(""),
             Mockito.eq(null),
-            Mockito.any(SortCriterion.class),
+            Mockito.any(List.class),
             Mockito.anyInt(),
             Mockito.anyInt());
   }
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ingest/source/UpsertIngestionSourceResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ingest/source/UpsertIngestionSourceResolverTest.java
index b453958e7af474..955188a4e4fed1 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ingest/source/UpsertIngestionSourceResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ingest/source/UpsertIngestionSourceResolverTest.java
@@ -1,5 +1,6 @@
 package com.linkedin.datahub.graphql.resolvers.ingest.source;
 
+import static com.linkedin.datahub.graphql.TestUtils.verifyIngestProposal;
 import static com.linkedin.datahub.graphql.resolvers.ingest.IngestTestUtils.*;
 import static com.linkedin.metadata.Constants.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -7,6 +8,7 @@
 import static org.testng.Assert.*;
 
 import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.exception.DataHubGraphQLException;
 import com.linkedin.datahub.graphql.generated.UpdateIngestionSourceConfigInput;
 import com.linkedin.datahub.graphql.generated.UpdateIngestionSourceInput;
 import com.linkedin.datahub.graphql.generated.UpdateIngestionSourceScheduleInput;
@@ -22,14 +24,17 @@
 
 public class UpsertIngestionSourceResolverTest {
 
-  private static final UpdateIngestionSourceInput TEST_INPUT =
-      new UpdateIngestionSourceInput(
-          "Test source",
-          "mysql",
-          "Test source description",
-          new UpdateIngestionSourceScheduleInput("* * * * *", "UTC"),
-          new UpdateIngestionSourceConfigInput(
-              "my test recipe", "0.8.18", "executor id", false, null));
+  private static final UpdateIngestionSourceInput TEST_INPUT = makeInput();
+
+  private static UpdateIngestionSourceInput makeInput() {
+    return new UpdateIngestionSourceInput(
+        "Test source",
+        "mysql",
+        "Test source description",
+        new UpdateIngestionSourceScheduleInput("* * * * *", "UTC"),
+        new UpdateIngestionSourceConfigInput(
+            "my test recipe", "0.8.18", "executor id", false, null));
+  }
 
   @Test
   public void testGetSuccess() throws Exception {
@@ -62,13 +67,11 @@ public void testGetSuccess() throws Exception {
             .setExecutorId(TEST_INPUT.getConfig().getExecutorId())
             .setDebugMode(TEST_INPUT.getConfig().getDebugMode()));
 
-    Mockito.verify(mockClient, Mockito.times(1))
-        .ingestProposal(
-            any(),
-            Mockito.eq(
-                MutationUtils.buildMetadataChangeProposalWithUrn(
-                    TEST_INGESTION_SOURCE_URN, INGESTION_INFO_ASPECT_NAME, info)),
-            Mockito.eq(false));
+    verifyIngestProposal(
+        mockClient,
+        1,
+        MutationUtils.buildMetadataChangeProposalWithUrn(
+            TEST_INGESTION_SOURCE_URN, INGESTION_INFO_ASPECT_NAME, info));
   }
 
   @Test
@@ -104,4 +107,54 @@ public void testGetEntityClientException() throws Exception {
 
     assertThrows(RuntimeException.class, () -> resolver.get(mockEnv).join());
   }
+
+  @Test
+  public void testUpsertWithInvalidCron() throws Exception {
+    final UpdateIngestionSourceInput input = makeInput();
+    input.setSchedule(new UpdateIngestionSourceScheduleInput("* * * * 123", "UTC"));
+
+    // Create resolver
+    EntityClient mockClient = Mockito.mock(EntityClient.class);
+    UpsertIngestionSourceResolver resolver = new UpsertIngestionSourceResolver(mockClient);
+
+    // Execute resolver
+    QueryContext mockContext = getMockAllowContext();
+    DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
+    Mockito.when(mockEnv.getArgument(Mockito.eq("urn")))
+        .thenReturn(TEST_INGESTION_SOURCE_URN.toString());
+    Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
+    Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
+
+    assertThrows(DataHubGraphQLException.class, () -> resolver.get(mockEnv).join());
+    Mockito.verify(mockClient, Mockito.times(0)).ingestProposal(any(), any(), anyBoolean());
+
+    input.setSchedule(new UpdateIngestionSourceScheduleInput("null", "UTC"));
+    assertThrows(DataHubGraphQLException.class, () -> resolver.get(mockEnv).join());
+    Mockito.verify(mockClient, Mockito.times(0)).ingestProposal(any(), any(), anyBoolean());
+  }
+
+  @Test
+  public void testUpsertWithInvalidTimezone() throws Exception {
+    final UpdateIngestionSourceInput input = makeInput();
+    input.setSchedule(new UpdateIngestionSourceScheduleInput("* * * * *", "Invalid"));
+
+    // Create resolver
+    EntityClient mockClient = Mockito.mock(EntityClient.class);
+    UpsertIngestionSourceResolver resolver = new UpsertIngestionSourceResolver(mockClient);
+
+    // Execute resolver
+    QueryContext mockContext = getMockAllowContext();
+    DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
+    Mockito.when(mockEnv.getArgument(Mockito.eq("urn")))
+        .thenReturn(TEST_INGESTION_SOURCE_URN.toString());
+    Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
+    Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
+
+    assertThrows(DataHubGraphQLException.class, () -> resolver.get(mockEnv).join());
+    Mockito.verify(mockClient, Mockito.times(0)).ingestProposal(any(), any(), anyBoolean());
+
+    input.setSchedule(new UpdateIngestionSourceScheduleInput("* * * * *", "America/Los_Angel"));
+    assertThrows(DataHubGraphQLException.class, () -> resolver.get(mockEnv).join());
+    Mockito.verify(mockClient, Mockito.times(0)).ingestProposal(any(), any(), anyBoolean());
+  }
 }
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/load/EntityRelationshipsResultResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/load/EntityRelationshipsResultResolverTest.java
new file mode 100644
index 00000000000000..d2799278c1238d
--- /dev/null
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/load/EntityRelationshipsResultResolverTest.java
@@ -0,0 +1,124 @@
+package com.linkedin.datahub.graphql.resolvers.load;
+
+import static com.linkedin.datahub.graphql.TestUtils.getMockAllowContext;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+
+import com.linkedin.common.EntityRelationship;
+import com.linkedin.common.EntityRelationshipArray;
+import com.linkedin.common.EntityRelationships;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.generated.*;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.graph.GraphClient;
+import graphql.schema.DataFetchingEnvironment;
+import java.net.URISyntaxException;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class EntityRelationshipsResultResolverTest {
+  private final Urn existentUser = Urn.createFromString("urn:li:corpuser:johndoe");
+  private final Urn softDeletedUser = Urn.createFromString("urn:li:corpuser:deletedUser");
+
+  private CorpUser existentEntity;
+  private CorpUser softDeletedEntity;
+
+  private EntityService _entityService;
+  private GraphClient _graphClient;
+
+  private EntityRelationshipsResultResolver resolver;
+  private RelationshipsInput input;
+  private DataFetchingEnvironment mockEnv;
+
+  public EntityRelationshipsResultResolverTest() throws URISyntaxException {}
+
+  @BeforeMethod
+  public void setupTest() {
+    _entityService = mock(EntityService.class);
+    _graphClient = mock(GraphClient.class);
+    resolver = new EntityRelationshipsResultResolver(_graphClient, _entityService);
+
+    mockEnv = mock(DataFetchingEnvironment.class);
+    QueryContext context = getMockAllowContext();
+    when(mockEnv.getContext()).thenReturn(context);
+
+    CorpGroup source = new CorpGroup();
+    source.setUrn("urn:li:corpGroup:group1");
+    when(mockEnv.getSource()).thenReturn(source);
+
+    when(_entityService.exists(any(), eq(Set.of(existentUser, softDeletedUser)), eq(true)))
+        .thenReturn(Set.of(existentUser, softDeletedUser));
+    when(_entityService.exists(any(), eq(Set.of(existentUser, softDeletedUser)), eq(false)))
+        .thenReturn(Set.of(existentUser));
+
+    input = new RelationshipsInput();
+    input.setStart(0);
+    input.setCount(10);
+    input.setDirection(RelationshipDirection.INCOMING);
+    input.setTypes(List.of("SomeType"));
+
+    EntityRelationships entityRelationships =
+        new EntityRelationships()
+            .setStart(0)
+            .setCount(2)
+            .setTotal(2)
+            .setRelationships(
+                new EntityRelationshipArray(
+                    new EntityRelationship().setEntity(existentUser).setType("SomeType"),
+                    new EntityRelationship().setEntity(softDeletedUser).setType("SomeType")));
+
+    // always expected INCOMING, and "SomeType" in all tests
+    when(_graphClient.getRelatedEntities(
+            eq(source.getUrn()),
+            eq(input.getTypes()),
+            same(com.linkedin.metadata.query.filter.RelationshipDirection.INCOMING),
+            eq(input.getStart()),
+            eq(input.getCount()),
+            any()))
+        .thenReturn(entityRelationships);
+
+    when(mockEnv.getArgument(eq("input"))).thenReturn(input);
+
+    existentEntity = new CorpUser();
+    existentEntity.setUrn(existentUser.toString());
+    existentEntity.setType(EntityType.CORP_USER);
+
+    softDeletedEntity = new CorpUser();
+    softDeletedEntity.setUrn(softDeletedUser.toString());
+    softDeletedEntity.setType(EntityType.CORP_USER);
+  }
+
+  @Test
+  public void testIncludeSoftDeleted() throws ExecutionException, InterruptedException {
+    EntityRelationshipsResult expected = new EntityRelationshipsResult();
+    expected.setRelationships(
+        List.of(resultRelationship(existentEntity), resultRelationship(softDeletedEntity)));
+    expected.setStart(0);
+    expected.setCount(2);
+    expected.setTotal(2);
+    assertEquals(resolver.get(mockEnv).get().toString(), expected.toString());
+  }
+
+  @Test
+  public void testExcludeSoftDeleted() throws ExecutionException, InterruptedException {
+    input.setIncludeSoftDelete(false);
+    EntityRelationshipsResult expected = new EntityRelationshipsResult();
+    expected.setRelationships(List.of(resultRelationship(existentEntity)));
+    expected.setStart(0);
+    expected.setCount(1);
+    expected.setTotal(1);
+    assertEquals(resolver.get(mockEnv).get().toString(), expected.toString());
+  }
+
+  private com.linkedin.datahub.graphql.generated.EntityRelationship resultRelationship(
+      Entity entity) {
+    return new com.linkedin.datahub.graphql.generated.EntityRelationship(
+        "SomeType", RelationshipDirection.INCOMING, entity, null);
+  }
+}
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/mutate/SiblingsUtilsTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/mutate/SiblingsUtilsTest.java
index 5965c8b790a760..e76317391ac34b 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/mutate/SiblingsUtilsTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/mutate/SiblingsUtilsTest.java
@@ -31,7 +31,7 @@ public class SiblingsUtilsTest {
   public void testGetSiblingUrns() {
     UrnArray siblingUrns =
         new UrnArray(UrnUtils.getUrn(TEST_DATASET_URN2), UrnUtils.getUrn(TEST_DATASET_URN3));
-    EntityService mockService = mock(EntityService.class);
+    EntityService<?> mockService = mock(EntityService.class);
     Mockito.when(
             mockService.getLatestAspect(
                 any(), eq(UrnUtils.getUrn(TEST_DATASET_URN1)), eq(SIBLINGS_ASPECT_NAME)))
@@ -45,7 +45,7 @@ public void testGetSiblingUrns() {
 
   @Test
   public void testGetSiblingUrnsWithoutSiblings() {
-    EntityService mockService = mock(EntityService.class);
+    EntityService<?> mockService = mock(EntityService.class);
     Mockito.when(
             mockService.getLatestAspect(
                 any(), eq(UrnUtils.getUrn(TEST_DATASET_URN1)), eq(SIBLINGS_ASPECT_NAME)))
@@ -59,7 +59,7 @@ public void testGetSiblingUrnsWithoutSiblings() {
 
   @Test
   public void testGetSiblingUrnsWithSiblingsAspect() {
-    EntityService mockService = mock(EntityService.class);
+    EntityService<?> mockService = mock(EntityService.class);
     Mockito.when(
             mockService.getLatestAspect(
                 any(), eq(UrnUtils.getUrn(TEST_DATASET_URN1)), eq(SIBLINGS_ASPECT_NAME)))
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateUserSettingResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateUserSettingResolverTest.java
index ce339fa2c75c7c..313c15c95c952f 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateUserSettingResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateUserSettingResolverTest.java
@@ -23,7 +23,7 @@ public class UpdateUserSettingResolverTest {
 
   @Test
   public void testWriteCorpUserSettings() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_USER_URN)), eq(true)))
         .thenReturn(true);
 
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/operation/ReportOperationResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/operation/ReportOperationResolverTest.java
index ad5f39d4b3c6d2..c4778cbbd40535 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/operation/ReportOperationResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/operation/ReportOperationResolverTest.java
@@ -57,8 +57,7 @@ public void testGetSuccess() throws Exception {
     Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
     resolver.get(mockEnv).get();
 
-    Mockito.verify(mockClient, Mockito.times(1))
-        .ingestProposal(any(), Mockito.eq(expectedProposal), Mockito.eq(false));
+    verifyIngestProposal(mockClient, 1, expectedProposal);
   }
 
   @Test
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/AddOwnersResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/AddOwnersResolverTest.java
index 40a2e45724381c..b239e0300ffcc5 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/AddOwnersResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/AddOwnersResolverTest.java
@@ -38,7 +38,7 @@ public class AddOwnersResolverTest {
 
   @Test
   public void testGetSuccessNoExistingOwners() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -101,7 +101,7 @@ public void testGetSuccessNoExistingOwners() throws Exception {
 
   @Test
   public void testGetSuccessExistingOwnerNewType() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     com.linkedin.common.Ownership oldOwnership =
         new Ownership()
@@ -167,7 +167,7 @@ public void testGetSuccessExistingOwnerNewType() throws Exception {
 
   @Test
   public void testGetSuccessDeprecatedTypeToOwnershipType() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     com.linkedin.common.Ownership oldOwnership =
         new Ownership()
@@ -230,7 +230,7 @@ public void testGetSuccessDeprecatedTypeToOwnershipType() throws Exception {
 
   @Test
   public void testGetSuccessMultipleOwnerTypes() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     com.linkedin.common.Ownership oldOwnership =
         new Ownership()
@@ -328,7 +328,7 @@ public void testGetSuccessMultipleOwnerTypes() throws Exception {
 
   @Test
   public void testGetFailureOwnerDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -366,7 +366,7 @@ public void testGetFailureOwnerDoesNotExist() throws Exception {
 
   @Test
   public void testGetFailureResourceDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -404,7 +404,7 @@ public void testGetFailureResourceDoesNotExist() throws Exception {
 
   @Test
   public void testGetUnauthorized() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     AddOwnersResolver resolver = new AddOwnersResolver(mockService);
 
@@ -429,7 +429,7 @@ public void testGetUnauthorized() throws Exception {
 
   @Test
   public void testGetEntityClientException() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.doThrow(RuntimeException.class)
         .when(mockService)
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/BatchAddOwnersResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/BatchAddOwnersResolverTest.java
index 2d7b67685cc697..8275f9f83ef83f 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/BatchAddOwnersResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/BatchAddOwnersResolverTest.java
@@ -38,7 +38,7 @@ public class BatchAddOwnersResolverTest {
 
   @Test
   public void testGetSuccessNoExistingOwners() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -126,7 +126,7 @@ public void testGetSuccessExistingOwners() throws Exception {
                         new Owner()
                             .setOwner(Urn.createFromString(TEST_OWNER_URN_1))
                             .setType(OwnershipType.TECHNICAL_OWNER))));
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -217,7 +217,7 @@ public void testGetSuccessExistingOwners() throws Exception {
 
   @Test
   public void testGetFailureOwnerDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -267,7 +267,7 @@ public void testGetFailureOwnerDoesNotExist() throws Exception {
 
   @Test
   public void testGetFailureResourceDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -326,7 +326,7 @@ public void testGetFailureResourceDoesNotExist() throws Exception {
 
   @Test
   public void testGetUnauthorized() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     BatchAddOwnersResolver resolver = new BatchAddOwnersResolver(mockService);
 
@@ -363,7 +363,7 @@ public void testGetUnauthorized() throws Exception {
 
   @Test
   public void testGetEntityClientException() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.doThrow(RuntimeException.class)
         .when(mockService)
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/BatchRemoveOwnersResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/BatchRemoveOwnersResolverTest.java
index 8fcedfa605e1bc..9ea9ac693b98ed 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/BatchRemoveOwnersResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/owner/BatchRemoveOwnersResolverTest.java
@@ -35,7 +35,7 @@ public class BatchRemoveOwnersResolverTest {
 
   @Test
   public void testGetSuccessNoExistingOwners() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -83,7 +83,7 @@ public void testGetSuccessNoExistingOwners() throws Exception {
 
   @Test
   public void testGetSuccessExistingOwners() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     final Ownership oldOwners1 =
         new Ownership()
@@ -150,7 +150,7 @@ public void testGetSuccessExistingOwners() throws Exception {
 
   @Test
   public void testGetFailureResourceDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -195,7 +195,7 @@ public void testGetFailureResourceDoesNotExist() throws Exception {
 
   @Test
   public void testGetUnauthorized() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     BatchRemoveOwnersResolver resolver = new BatchRemoveOwnersResolver(mockService);
 
@@ -218,7 +218,7 @@ public void testGetUnauthorized() throws Exception {
 
   @Test
   public void testGetEntityClientException() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.doThrow(RuntimeException.class)
         .when(mockService)
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/post/CreatePostResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/post/CreatePostResolverTest.java
index 7f14193737e00e..8e160237d095bf 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/post/CreatePostResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/post/CreatePostResolverTest.java
@@ -94,7 +94,7 @@ public void testCreatePost() throws Exception {
     input.setContent(content);
     when(_dataFetchingEnvironment.getArgument(eq("input"))).thenReturn(input);
     when(_postService.createPost(
-            any(), eq(PostType.HOME_PAGE_ANNOUNCEMENT.toString()), eq(postContentObj)))
+            any(), eq(PostType.HOME_PAGE_ANNOUNCEMENT.toString()), eq(postContentObj), any()))
         .thenReturn(true);
 
     assertTrue(_resolver.get(_dataFetchingEnvironment).join());
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolverTest.java
index 70b427a1606f12..ee728b17e8c621 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolverTest.java
@@ -69,9 +69,10 @@ public void testGetSuccess(final ListQueriesInput input) throws Exception {
                         : input.getQuery()),
                 Mockito.eq(buildFilter(input.getSource(), input.getDatasetUrn())),
                 Mockito.eq(
-                    new SortCriterion()
-                        .setField(ListQueriesResolver.CREATED_AT_FIELD)
-                        .setOrder(SortOrder.DESCENDING)),
+                    Collections.singletonList(
+                        new SortCriterion()
+                            .setField(ListQueriesResolver.CREATED_AT_FIELD)
+                            .setOrder(SortOrder.DESCENDING))),
                 Mockito.eq(input.getStart()),
                 Mockito.eq(input.getCount())))
         .thenReturn(
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolverTest.java
index 40062ed08977ac..d32eb9fcf120ca 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolverTest.java
@@ -324,7 +324,7 @@ public static void testErrorFetchingResults() throws Exception {
                 Mockito.any(),
                 Mockito.anyInt(),
                 Mockito.anyInt(),
-                Mockito.eq(null),
+                Mockito.eq(Collections.emptyList()),
                 Mockito.eq(null)))
         .thenThrow(new RemoteInvocationException());
 
@@ -397,7 +397,7 @@ private static EntityClient initMockEntityClient(
                 Mockito.eq(filter),
                 Mockito.eq(start),
                 Mockito.eq(limit),
-                Mockito.eq(null),
+                Mockito.eq(Collections.emptyList()),
                 Mockito.eq(facets)))
         .thenReturn(result);
     return client;
@@ -420,7 +420,7 @@ private static void verifyMockEntityClient(
             Mockito.eq(filter),
             Mockito.eq(start),
             Mockito.eq(limit),
-            Mockito.eq(null),
+            Mockito.eq(Collections.emptyList()),
             Mockito.eq(facets));
   }
 
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/GetQuickFiltersResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/GetQuickFiltersResolverTest.java
index 25e374c766deba..64042e82bbfe88 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/GetQuickFiltersResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/GetQuickFiltersResolverTest.java
@@ -24,6 +24,7 @@
 import com.linkedin.r2.RemoteInvocationException;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletionException;
 import java.util.stream.Collectors;
@@ -114,7 +115,7 @@ public static void testGetQuickFiltersFailure() throws Exception {
                 Mockito.any(),
                 Mockito.anyInt(),
                 Mockito.anyInt(),
-                Mockito.eq(null),
+                Mockito.eq(Collections.emptyList()),
                 Mockito.eq(null)))
         .thenThrow(new RemoteInvocationException());
 
@@ -300,7 +301,7 @@ private static EntityClient initMockEntityClient(
                 Mockito.eq(filter),
                 Mockito.eq(start),
                 Mockito.eq(limit),
-                Mockito.eq(null),
+                Mockito.eq(Collections.emptyList()),
                 Mockito.eq(null)))
         .thenReturn(result);
     return client;
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossEntitiesResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossEntitiesResolverTest.java
index bcbfda6c71bba2..30d6f2dc6f2836 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossEntitiesResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossEntitiesResolverTest.java
@@ -437,8 +437,8 @@ public static void testApplyViewErrorFetchingView() throws Exception {
                 Mockito.any(),
                 Mockito.anyInt(),
                 Mockito.anyInt(),
-                Mockito.eq(null),
-                Mockito.eq(null)))
+                Mockito.eq(Collections.emptyList()),
+                Mockito.eq(Collections.emptyList())))
         .thenThrow(new RemoteInvocationException());
 
     final SearchAcrossEntitiesResolver resolver =
@@ -485,7 +485,7 @@ private static EntityClient initMockEntityClient(
                 Mockito.eq(filter),
                 Mockito.eq(start),
                 Mockito.eq(limit),
-                Mockito.eq(null)))
+                Mockito.eq(Collections.emptyList())))
         .thenReturn(result);
     return client;
   }
@@ -506,7 +506,7 @@ private static void verifyMockEntityClient(
             Mockito.eq(filter),
             Mockito.eq(start),
             Mockito.eq(limit),
-            Mockito.eq(null));
+            Mockito.eq(Collections.emptyList()));
   }
 
   private static void verifyMockViewService(ViewService mockService, Urn viewUrn) {
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/SearchResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/SearchResolverTest.java
index a5310a052f613c..fbbf5cf314eda3 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/SearchResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/search/SearchResolverTest.java
@@ -18,6 +18,8 @@
 import com.linkedin.metadata.search.SearchResult;
 import com.linkedin.metadata.search.SearchResultMetadata;
 import graphql.schema.DataFetchingEnvironment;
+import java.util.Collections;
+import java.util.List;
 import org.mockito.Mockito;
 import org.testng.annotations.Test;
 
@@ -56,7 +58,7 @@ public void testDefaultSearchFlags() throws Exception {
         Constants.DATASET_ENTITY_NAME, // Verify that merged entity types were used.
         "",
         null,
-        null,
+        Collections.emptyList(),
         0,
         10,
         setConvertSchemaFieldsToDatasets(
@@ -97,7 +99,7 @@ public void testOverrideSearchFlags() throws Exception {
         Constants.DATASET_ENTITY_NAME, // Verify that merged entity types were used.
         "",
         null,
-        null,
+        Collections.emptyList(),
         1,
         11,
         setConvertSchemaFieldsToDatasets(
@@ -129,7 +131,7 @@ public void testNonWildCardSearchFlags() throws Exception {
         Constants.DATASET_ENTITY_NAME, // Verify that merged entity types were used.
         "not a wildcard",
         null, // Verify that view filter was used.
-        null,
+        Collections.emptyList(),
         0,
         10,
         setConvertSchemaFieldsToDatasets(
@@ -170,7 +172,7 @@ private void verifyMockSearchEntityClient(
       String entityName,
       String query,
       Filter filter,
-      SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int start,
       int limit,
       com.linkedin.metadata.query.SearchFlags searchFlags)
@@ -181,7 +183,7 @@ private void verifyMockSearchEntityClient(
             Mockito.eq(entityName),
             Mockito.eq(query),
             Mockito.eq(filter),
-            Mockito.eq(sortCriterion),
+            Mockito.eq(sortCriteria),
             Mockito.eq(start),
             Mockito.eq(limit));
   }
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/AddTagsResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/AddTagsResolverTest.java
index 4384d9e2650e4f..ee1d59cdf87c75 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/AddTagsResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/AddTagsResolverTest.java
@@ -35,7 +35,7 @@ public class AddTagsResolverTest {
 
   @Test
   public void testGetSuccessNoExistingTags() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -94,7 +94,7 @@ public void testGetSuccessExistingTags() throws Exception {
                     ImmutableList.of(
                         new TagAssociation().setTag(TagUrn.createFromString(TEST_TAG_1_URN)))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -146,7 +146,7 @@ public void testGetSuccessExistingTags() throws Exception {
 
   @Test
   public void testGetFailureTagDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -177,7 +177,7 @@ public void testGetFailureTagDoesNotExist() throws Exception {
 
   @Test
   public void testGetFailureResourceDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -208,7 +208,7 @@ public void testGetFailureResourceDoesNotExist() throws Exception {
 
   @Test
   public void testGetUnauthorized() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     AddTagsResolver resolver = new AddTagsResolver(mockService);
 
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/BatchAddTagsResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/BatchAddTagsResolverTest.java
index 0d22cd6e5eb2b1..5f6db4cb1e5a56 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/BatchAddTagsResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/BatchAddTagsResolverTest.java
@@ -39,7 +39,7 @@ public class BatchAddTagsResolverTest {
 
   @Test
   public void testGetSuccessNoExistingTags() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -115,7 +115,7 @@ public void testGetSuccessExistingTags() throws Exception {
                     ImmutableList.of(
                         new TagAssociation().setTag(TagUrn.createFromString(TEST_TAG_1_URN)))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -184,7 +184,7 @@ public void testGetSuccessExistingTags() throws Exception {
 
   @Test
   public void testGetFailureTagDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -218,7 +218,7 @@ public void testGetFailureTagDoesNotExist() throws Exception {
 
   @Test
   public void testGetFailureResourceDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -263,7 +263,7 @@ public void testGetFailureResourceDoesNotExist() throws Exception {
 
   @Test
   public void testGetUnauthorized() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     BatchAddTagsResolver resolver = new BatchAddTagsResolver(mockService);
 
@@ -286,7 +286,7 @@ public void testGetUnauthorized() throws Exception {
 
   @Test
   public void testGetEntityClientException() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.doThrow(RuntimeException.class)
         .when(mockService)
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/BatchRemoveTagsResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/BatchRemoveTagsResolverTest.java
index e6c33ea7341788..9f34c0da82744a 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/BatchRemoveTagsResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/BatchRemoveTagsResolverTest.java
@@ -42,7 +42,7 @@ public class BatchRemoveTagsResolverTest {
 
   @Test
   public void testGetSuccessNoExistingTags() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -104,7 +104,7 @@ public void testGetSuccessNoExistingTags() throws Exception {
 
   @Test
   public void testGetSuccessExistingTags() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     final GlobalTags oldTags1 =
         new GlobalTags()
@@ -177,7 +177,7 @@ public void testGetSuccessExistingTags() throws Exception {
 
   @Test
   public void testGetFailureResourceDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -222,7 +222,7 @@ public void testGetFailureResourceDoesNotExist() throws Exception {
 
   @Test
   public void testGetUnauthorized() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     BatchRemoveTagsResolver resolver = new BatchRemoveTagsResolver(mockService);
 
@@ -245,7 +245,7 @@ public void testGetUnauthorized() throws Exception {
 
   @Test
   public void testGetEntityClientException() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.doThrow(RuntimeException.class)
         .when(mockService)
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/CreateTagResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/CreateTagResolverTest.java
index cd9ac9f0b610a8..6c8984addb2651 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/CreateTagResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/CreateTagResolverTest.java
@@ -27,7 +27,7 @@ public class CreateTagResolverTest {
   @Test
   public void testGetSuccess() throws Exception {
     // Create resolver
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     Mockito.when(
             mockClient.ingestProposal(
@@ -53,14 +53,13 @@ public void testGetSuccess() throws Exception {
             key, TAG_ENTITY_NAME, TAG_PROPERTIES_ASPECT_NAME, props);
 
     // Not ideal to match against "any", but we don't know the auto-generated execution request id
-    Mockito.verify(mockClient, Mockito.times(1))
-        .ingestProposal(any(), Mockito.eq(proposal), Mockito.eq(false));
+    verifyIngestProposal(mockClient, 1, proposal);
   }
 
   @Test
   public void testGetUnauthorized() throws Exception {
     // Create resolver
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     CreateTagResolver resolver = new CreateTagResolver(mockClient, mockService);
 
@@ -77,7 +76,7 @@ public void testGetUnauthorized() throws Exception {
   @Test
   public void testGetEntityClientException() throws Exception {
     // Create resolver
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     EntityClient mockClient = Mockito.mock(EntityClient.class);
     Mockito.doThrow(RuntimeException.class)
         .when(mockClient)
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/SetTagColorResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/SetTagColorResolverTest.java
index 624e300b19f461..92f7a2688b43eb 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/SetTagColorResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/tag/SetTagColorResolverTest.java
@@ -38,7 +38,7 @@ public class SetTagColorResolverTest {
   public void testGetSuccessExistingProperties() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     // Test setting the domain
     final TagProperties oldTagProperties = new TagProperties().setName("Test Tag");
@@ -69,8 +69,7 @@ public void testGetSuccessExistingProperties() throws Exception {
         MutationUtils.buildMetadataChangeProposalWithUrn(
             UrnUtils.getUrn(TEST_ENTITY_URN), TAG_PROPERTIES_ASPECT_NAME, newTagProperties);
 
-    Mockito.verify(mockClient, Mockito.times(1))
-        .ingestProposal(any(), Mockito.eq(proposal), Mockito.eq(false));
+    verifyIngestProposal(mockClient, 1, proposal);
 
     Mockito.verify(mockService, Mockito.times(1))
         .exists(any(), Mockito.eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true));
@@ -80,7 +79,7 @@ public void testGetSuccessExistingProperties() throws Exception {
   public void testGetFailureNoExistingProperties() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     // Test setting the domain
     Mockito.when(
@@ -135,7 +134,7 @@ public void testGetFailureTagDoesNotExist() throws Exception {
                             ImmutableMap.of(
                                 Constants.TAG_PROPERTIES_ASPECT_NAME, oldTagPropertiesAspect)))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
         .thenReturn(false);
 
@@ -155,7 +154,7 @@ public void testGetFailureTagDoesNotExist() throws Exception {
   public void testGetUnauthorized() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
     SetTagColorResolver resolver = new SetTagColorResolver(mockClient, mockService);
 
     // Execute resolver
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/term/AddTermsResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/term/AddTermsResolverTest.java
index 9eeb525c3657e9..8f8a071ce89329 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/term/AddTermsResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/term/AddTermsResolverTest.java
@@ -32,7 +32,7 @@ public class AddTermsResolverTest {
 
   @Test
   public void testGetSuccessNoExistingTerms() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -82,7 +82,7 @@ public void testGetSuccessExistingTerms() throws Exception {
                         new GlossaryTermAssociation()
                             .setUrn(GlossaryTermUrn.createFromString(TEST_TERM_1_URN)))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -124,7 +124,7 @@ public void testGetSuccessExistingTerms() throws Exception {
 
   @Test
   public void testGetFailureTermDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -156,7 +156,7 @@ public void testGetFailureTermDoesNotExist() throws Exception {
 
   @Test
   public void testGetFailureResourceDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -188,7 +188,7 @@ public void testGetFailureResourceDoesNotExist() throws Exception {
 
   @Test
   public void testGetUnauthorized() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     AddTermsResolver resolver = new AddTermsResolver(mockService);
 
@@ -207,7 +207,7 @@ public void testGetUnauthorized() throws Exception {
 
   @Test
   public void testGetEntityClientException() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.doThrow(RuntimeException.class)
         .when(mockService)
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/term/BatchAddTermsResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/term/BatchAddTermsResolverTest.java
index 185bb5cc97953a..ced9e371814f7e 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/term/BatchAddTermsResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/term/BatchAddTermsResolverTest.java
@@ -35,7 +35,7 @@ public class BatchAddTermsResolverTest {
 
   @Test
   public void testGetSuccessNoExistingTerms() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -99,7 +99,7 @@ public void testGetSuccessExistingTerms() throws Exception {
                         new GlossaryTermAssociation()
                             .setUrn(GlossaryTermUrn.createFromString(TEST_GLOSSARY_TERM_1_URN)))));
 
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -155,7 +155,7 @@ public void testGetSuccessExistingTerms() throws Exception {
 
   @Test
   public void testGetFailureTagDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -189,7 +189,7 @@ public void testGetFailureTagDoesNotExist() throws Exception {
 
   @Test
   public void testGetFailureResourceDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -234,7 +234,7 @@ public void testGetFailureResourceDoesNotExist() throws Exception {
 
   @Test
   public void testGetUnauthorized() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     BatchAddTermsResolver resolver = new BatchAddTermsResolver(mockService);
 
@@ -256,7 +256,7 @@ public void testGetUnauthorized() throws Exception {
 
   @Test
   public void testGetEntityClientException() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.doThrow(RuntimeException.class)
         .when(mockService)
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/term/BatchRemoveTermsResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/term/BatchRemoveTermsResolverTest.java
index 9e269bed436d98..254a301159ac25 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/term/BatchRemoveTermsResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/term/BatchRemoveTermsResolverTest.java
@@ -35,7 +35,7 @@ public class BatchRemoveTermsResolverTest {
 
   @Test
   public void testGetSuccessNoExistingTerms() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -82,7 +82,7 @@ public void testGetSuccessNoExistingTerms() throws Exception {
 
   @Test
   public void testGetSuccessExistingTerms() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     final GlossaryTerms oldTerms1 =
         new GlossaryTerms()
@@ -148,7 +148,7 @@ public void testGetSuccessExistingTerms() throws Exception {
 
   @Test
   public void testGetFailureResourceDoesNotExist() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.when(
             mockService.getAspect(
@@ -192,7 +192,7 @@ public void testGetFailureResourceDoesNotExist() throws Exception {
 
   @Test
   public void testGetUnauthorized() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     BatchRemoveTermsResolver resolver = new BatchRemoveTermsResolver(mockService);
 
@@ -214,7 +214,7 @@ public void testGetUnauthorized() throws Exception {
 
   @Test
   public void testGetEntityClientException() throws Exception {
-    EntityService mockService = getMockEntityService();
+    EntityService<?> mockService = getMockEntityService();
 
     Mockito.doThrow(RuntimeException.class)
         .when(mockService)
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/utils/OwnerUtilsTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/utils/OwnerUtilsTest.java
index b4097d9dd045df..d524d8bfb9a6b3 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/utils/OwnerUtilsTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/utils/OwnerUtilsTest.java
@@ -59,6 +59,7 @@ public void testIsOwnerEqualOnlyOwnershipTypeUrn() throws URISyntaxException {
     Urn technicalOwnershipTypeUrn = new Urn(TECHNICAL_OWNER_OWNERSHIP_TYPE_URN);
     Urn businessOwnershipTypeUrn = new Urn(BUSINESS_OWNER_OWNERSHIP_TYPE_URN);
     Urn ownerUrn1 = new Urn("urn:li:corpuser:foo");
+    Urn ownerUrn2 = new Urn("urn:li:corpuser:bar");
 
     Owner ownerWithTechnicalOwnership = new Owner();
     ownerWithTechnicalOwnership.setOwner(ownerUrn1);
@@ -72,12 +73,17 @@ public void testIsOwnerEqualOnlyOwnershipTypeUrn() throws URISyntaxException {
     ownerWithoutOwnershipType.setOwner(ownerUrn1);
     ownerWithoutOwnershipType.setType(OwnershipType.NONE);
 
+    Owner owner2WithoutOwnershipType = new Owner();
+    owner2WithoutOwnershipType.setOwner(ownerUrn2);
+    owner2WithoutOwnershipType.setType(OwnershipType.NONE);
+
     assertTrue(
         OwnerUtils.isOwnerEqual(ownerWithTechnicalOwnership, ownerUrn1, technicalOwnershipTypeUrn));
     assertFalse(
         OwnerUtils.isOwnerEqual(ownerWithBusinessOwnership, ownerUrn1, technicalOwnershipTypeUrn));
-    assertFalse(OwnerUtils.isOwnerEqual(ownerWithTechnicalOwnership, ownerUrn1, null));
+    assertTrue(OwnerUtils.isOwnerEqual(ownerWithTechnicalOwnership, ownerUrn1, null));
     assertTrue(OwnerUtils.isOwnerEqual(ownerWithoutOwnershipType, ownerUrn1, null));
+    assertFalse(OwnerUtils.isOwnerEqual(owner2WithoutOwnershipType, ownerUrn1, null));
   }
 
   public void testIsOwnerEqualWithBothLegacyAndNewType() throws URISyntaxException {
diff --git a/datahub-upgrade/build.gradle b/datahub-upgrade/build.gradle
index 304bf3a67a5b27..5d814dd876679e 100644
--- a/datahub-upgrade/build.gradle
+++ b/datahub-upgrade/build.gradle
@@ -49,13 +49,16 @@ dependencies {
     implementation('io.airlift:aircompressor:0.27') {
       because("CVE-2024-36114")
     }
+    implementation('dnsjava:dnsjava:3.6.1') {
+      because("CVE-2024-25638")
+    }
   }
 
 
   // mock internal schema registry
   implementation externalDependency.kafkaAvroSerde
   implementation externalDependency.kafkaAvroSerializer
-  implementation "org.apache.kafka:kafka_2.12:3.7.0"
+  implementation "org.apache.kafka:kafka_2.12:3.7.1"
 
   implementation externalDependency.slf4jApi
   compileOnly externalDependency.lombok
@@ -112,7 +115,10 @@ task run(type: Exec) {
   environment "ENTITY_REGISTRY_CONFIG_PATH", "../metadata-models/src/main/resources/entity-registry.yml"
   environment "ENABLE_STRUCTURED_PROPERTIES_SYSTEM_UPDATE", "true"
   environment "ELASTICSEARCH_INDEX_BUILDER_MAPPINGS_REINDEX", "true"
-  commandLine "java", "-jar", "-Dserver.port=8083", bootJar.getArchiveFile().get(), "-u", "SystemUpdate"
+  commandLine "java",
+          "-agentlib:jdwp=transport=dt_socket,address=5003,server=y,suspend=n",
+          "-jar",
+          "-Dserver.port=8083", bootJar.getArchiveFile().get(), "-u", "SystemUpdate"
 }
 
 docker {
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/Upgrade.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/Upgrade.java
index d3aea2a3dac12a..d159622eb292b6 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/Upgrade.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/Upgrade.java
@@ -1,7 +1,17 @@
 package com.linkedin.datahub.upgrade;
 
 import com.google.common.collect.ImmutableList;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.metadata.boot.BootstrapStep;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.upgrade.DataHubUpgradeResult;
+import com.linkedin.upgrade.DataHubUpgradeState;
+import io.datahubproject.metadata.context.OperationContext;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /** Specification of an upgrade to be performed to the DataHub platform. */
 public interface Upgrade {
@@ -16,4 +26,18 @@ public interface Upgrade {
   default List<UpgradeCleanupStep> cleanupSteps() {
     return ImmutableList.of();
   }
+
+  default Optional<DataHubUpgradeResult> getUpgradeResult(
+      @Nonnull OperationContext opContext, Urn upgradeId, EntityService<?> entityService) {
+    return BootstrapStep.getUpgradeResult(opContext, upgradeId, entityService);
+  }
+
+  default void setUpgradeResult(
+      @Nonnull OperationContext opContext,
+      @Nonnull Urn upgradeId,
+      EntityService<?> entityService,
+      @Nullable DataHubUpgradeState state,
+      @Nullable Map<String, String> result) {
+    BootstrapStep.setUpgradeResult(opContext, upgradeId, entityService, state, result);
+  }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeCli.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeCli.java
index 6d10a7ed6b3b48..bff65fd03dd572 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeCli.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeCli.java
@@ -9,6 +9,7 @@
 import com.linkedin.datahub.upgrade.system.SystemUpdate;
 import com.linkedin.datahub.upgrade.system.SystemUpdateBlocking;
 import com.linkedin.datahub.upgrade.system.SystemUpdateNonBlocking;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import io.datahubproject.metadata.context.OperationContext;
 import java.util.List;
 import javax.inject.Inject;
@@ -91,7 +92,7 @@ public void run(String... cmdLineArgs) {
     UpgradeResult result =
         _upgradeManager.execute(systemOperationContext, args.upgradeId.trim(), args.args);
 
-    if (UpgradeResult.Result.FAILED.equals(result.result())) {
+    if (DataHubUpgradeState.FAILED.equals(result.result())) {
       System.exit(1);
     } else {
       System.exit(0);
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeContext.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeContext.java
index 73643175ab9c67..2b5598184ee6b9 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeContext.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeContext.java
@@ -23,6 +23,6 @@ public interface UpgradeContext {
   /** Returns a map of argument to <>optional</> value, as delimited by an '=' character. */
   Map<String, Optional<String>> parsedArgs();
 
-  /** Returns the operation context ffor the upgrade */
+  /** Returns the operation context for the upgrade */
   OperationContext opContext();
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeResult.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeResult.java
index 25dc758575fd16..57a01b4de413fa 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeResult.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeResult.java
@@ -1,20 +1,12 @@
 package com.linkedin.datahub.upgrade;
 
+import com.linkedin.upgrade.DataHubUpgradeState;
+
 /** Represents the result of executing an {@link Upgrade} */
 public interface UpgradeResult {
 
-  /** The execution result. */
-  enum Result {
-    /** Upgrade succeeded. */
-    SUCCEEDED,
-    /** Upgrade failed. */
-    FAILED,
-    /** Upgrade was aborted. */
-    ABORTED
-  }
-
-  /** Returns the {@link Result} of executing an {@link Upgrade} */
-  Result result();
+  /** Returns the {@link DataHubUpgradeState} of executing an {@link Upgrade} */
+  DataHubUpgradeState result();
 
   /** Returns the {@link UpgradeReport} associated with the completed {@link Upgrade}. */
   UpgradeReport report();
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeStepResult.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeStepResult.java
index 04b3d4b8559e67..e88e3c75f86954 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeStepResult.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeStepResult.java
@@ -1,18 +1,12 @@
 package com.linkedin.datahub.upgrade;
 
+import com.linkedin.upgrade.DataHubUpgradeState;
+
 public interface UpgradeStepResult {
 
   /** Returns a string identifier associated with the step. */
   String stepId();
 
-  /** The outcome of the step execution. */
-  enum Result {
-    /** The step succeeded. */
-    SUCCEEDED,
-    /** The step failed. */
-    FAILED
-  }
-
   /** A control-flow action to perform as a result of the step execution. */
   enum Action {
     /** Continue attempting the upgrade. */
@@ -24,7 +18,7 @@ enum Action {
   }
 
   /** Returns the result of executing the step, either success or failure. */
-  Result result();
+  DataHubUpgradeState result();
 
   /** Returns the action to perform after executing the step, either continue or abort. */
   default Action action() {
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/ClearGraphServiceStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/ClearGraphServiceStep.java
index 393b5411599adc..357f1ffd663a9a 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/ClearGraphServiceStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/ClearGraphServiceStep.java
@@ -6,6 +6,7 @@
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
 import com.linkedin.datahub.upgrade.nocode.NoCodeUpgrade;
 import com.linkedin.metadata.graph.GraphService;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import java.util.function.Function;
 
 public class ClearGraphServiceStep implements UpgradeStep {
@@ -49,9 +50,9 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
         _graphService.clear();
       } catch (Exception e) {
         context.report().addLine("Failed to clear graph indices", e);
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/ClearSearchServiceStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/ClearSearchServiceStep.java
index 44592ecf92dbda..0ccd2029c93ac3 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/ClearSearchServiceStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/ClearSearchServiceStep.java
@@ -6,6 +6,7 @@
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
 import com.linkedin.datahub.upgrade.nocode.NoCodeUpgrade;
 import com.linkedin.metadata.search.EntitySearchService;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import java.util.function.Function;
 
 public class ClearSearchServiceStep implements UpgradeStep {
@@ -48,9 +49,9 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
         _entitySearchService.clear(context.opContext());
       } catch (Exception e) {
         context.report().addLine("Failed to clear search service", e);
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/ClearSystemMetadataServiceStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/ClearSystemMetadataServiceStep.java
new file mode 100644
index 00000000000000..f0f2958e917330
--- /dev/null
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/ClearSystemMetadataServiceStep.java
@@ -0,0 +1,57 @@
+package com.linkedin.datahub.upgrade.common.steps;
+
+import com.linkedin.datahub.upgrade.UpgradeContext;
+import com.linkedin.datahub.upgrade.UpgradeStep;
+import com.linkedin.datahub.upgrade.UpgradeStepResult;
+import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
+import com.linkedin.datahub.upgrade.nocode.NoCodeUpgrade;
+import com.linkedin.metadata.systemmetadata.SystemMetadataService;
+import com.linkedin.upgrade.DataHubUpgradeState;
+import java.util.function.Function;
+
+public class ClearSystemMetadataServiceStep implements UpgradeStep {
+
+  private final SystemMetadataService _systemMetadataService;
+  private final boolean _alwaysRun;
+
+  public ClearSystemMetadataServiceStep(
+      final SystemMetadataService systemMetadataService, final boolean alwaysRun) {
+    _systemMetadataService = systemMetadataService;
+    _alwaysRun = alwaysRun;
+  }
+
+  @Override
+  public String id() {
+    return "ClearSystemMetadataServiceStep";
+  }
+
+  @Override
+  public boolean skip(UpgradeContext context) {
+    if (_alwaysRun) {
+      return false;
+    }
+    if (context.parsedArgs().containsKey(NoCodeUpgrade.CLEAN_ARG_NAME)) {
+      return false;
+    }
+    context.report().addLine("Cleanup has not been requested.");
+    return true;
+  }
+
+  @Override
+  public int retryCount() {
+    return 1;
+  }
+
+  @Override
+  public Function<UpgradeContext, UpgradeStepResult> executable() {
+    return (context) -> {
+      try {
+        _systemMetadataService.clear();
+      } catch (Exception e) {
+        context.report().addLine("Failed to clear system metadata service", e);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
+      }
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
+    };
+  }
+}
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/GMSDisableWriteModeStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/GMSDisableWriteModeStep.java
index 42b3c6b3ccc490..2e31d1eb62bd0c 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/GMSDisableWriteModeStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/GMSDisableWriteModeStep.java
@@ -5,6 +5,7 @@
 import com.linkedin.datahub.upgrade.UpgradeStepResult;
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
 import com.linkedin.entity.client.SystemEntityClient;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import java.util.function.Function;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -13,7 +14,7 @@
 @RequiredArgsConstructor
 public class GMSDisableWriteModeStep implements UpgradeStep {
 
-  private final SystemEntityClient entityClient;
+  private final SystemEntityClient systemEntityClient;
 
   @Override
   public String id() {
@@ -29,13 +30,13 @@ public int retryCount() {
   public Function<UpgradeContext, UpgradeStepResult> executable() {
     return (context) -> {
       try {
-        entityClient.setWritable(context.opContext(), false);
+        systemEntityClient.setWritable(context.opContext(), false);
       } catch (Exception e) {
         log.error("Failed to turn write mode off in GMS", e);
         context.report().addLine("Failed to turn write mode off in GMS");
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/GMSEnableWriteModeStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/GMSEnableWriteModeStep.java
index c43644fda7ddf5..12bfccf1c6749a 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/GMSEnableWriteModeStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/GMSEnableWriteModeStep.java
@@ -5,6 +5,7 @@
 import com.linkedin.datahub.upgrade.UpgradeStepResult;
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
 import com.linkedin.entity.client.SystemEntityClient;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import java.util.function.Function;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -12,7 +13,7 @@
 @Slf4j
 @RequiredArgsConstructor
 public class GMSEnableWriteModeStep implements UpgradeStep {
-  private final SystemEntityClient entityClient;
+  private final SystemEntityClient systemEntityClient;
 
   @Override
   public String id() {
@@ -28,13 +29,13 @@ public int retryCount() {
   public Function<UpgradeContext, UpgradeStepResult> executable() {
     return (context) -> {
       try {
-        entityClient.setWritable(context.opContext(), true);
+        systemEntityClient.setWritable(context.opContext(), true);
       } catch (Exception e) {
         log.error("Failed to turn write mode back on in GMS", e);
         context.report().addLine("Failed to turn write mode back on in GMS");
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/GMSQualificationStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/GMSQualificationStep.java
index 4e7447cb1e2cb6..9ee8244ee370d0 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/GMSQualificationStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/GMSQualificationStep.java
@@ -10,6 +10,7 @@
 import com.linkedin.datahub.upgrade.UpgradeStep;
 import com.linkedin.datahub.upgrade.UpgradeStepResult;
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -97,7 +98,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
                 StreamReadConstraints.builder().maxStringLength(maxSize).build());
         JsonNode configJson = mapper.readTree(responseString);
         if (isEligible((ObjectNode) configJson)) {
-          return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+          return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
         } else {
           context
               .report()
@@ -105,7 +106,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
                   String.format(
                       "Failed to qualify GMS. It is not running on the latest version."
                           + "Re-run GMS on the latest datahub release"));
-          return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+          return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
         }
       } catch (Exception e) {
         e.printStackTrace();
@@ -117,7 +118,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
                         + "at %s://host %s port %s. Make sure GMS is on the latest version "
                         + "and is running at that host before starting the migration.",
                     gmsProtocol, gmsHost, gmsPort));
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
     };
   }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/ReindexDomainDescriptionConfig.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/ReindexDomainDescriptionConfig.java
new file mode 100644
index 00000000000000..3cdab0dc4d4bc6
--- /dev/null
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/ReindexDomainDescriptionConfig.java
@@ -0,0 +1,29 @@
+package com.linkedin.datahub.upgrade.config;
+
+import com.linkedin.datahub.upgrade.system.NonBlockingSystemUpgrade;
+import com.linkedin.datahub.upgrade.system.domaindescription.ReindexDomainDescription;
+import com.linkedin.metadata.entity.AspectDao;
+import com.linkedin.metadata.entity.EntityService;
+import io.datahubproject.metadata.context.OperationContext;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@Conditional(SystemUpdateCondition.NonBlockingSystemUpdateCondition.class)
+public class ReindexDomainDescriptionConfig {
+
+  @Bean
+  public NonBlockingSystemUpgrade reindexDomainDescription(
+      final OperationContext opContext,
+      final EntityService<?> entityService,
+      final AspectDao aspectDao,
+      @Value("${systemUpdate.domainDescription.enabled}") final boolean enabled,
+      @Value("${systemUpdate.domainDescription.batchSize}") final Integer batchSize,
+      @Value("${systemUpdate.domainDescription.delayMs}") final Integer delayMs,
+      @Value("${systemUpdate.domainDescription.limit}") final Integer limit) {
+    return new ReindexDomainDescription(
+        opContext, entityService, aspectDao, enabled, batchSize, delayMs, limit);
+  }
+}
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/RestoreBackupConfig.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/RestoreBackupConfig.java
index ec6e5a4a8f04d1..b4eafb4ad3d241 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/RestoreBackupConfig.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/RestoreBackupConfig.java
@@ -6,6 +6,7 @@
 import com.linkedin.metadata.graph.GraphService;
 import com.linkedin.metadata.models.registry.EntityRegistry;
 import com.linkedin.metadata.search.EntitySearchService;
+import com.linkedin.metadata.systemmetadata.SystemMetadataService;
 import io.ebean.Database;
 import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
@@ -26,8 +27,9 @@ public class RestoreBackupConfig {
     "ebeanServer",
     "entityService",
     "systemEntityClient",
-    "graphService",
+    "systemMetadataService",
     "searchService",
+    "graphService",
     "entityRegistry"
   })
   @ConditionalOnProperty(name = "entityService.impl", havingValue = "ebean", matchIfMissing = true)
@@ -35,13 +37,23 @@ public class RestoreBackupConfig {
   public RestoreBackup createInstance() {
     final Database ebeanServer = applicationContext.getBean(Database.class);
     final EntityService<?> entityService = applicationContext.getBean(EntityService.class);
-    final SystemEntityClient entityClient = applicationContext.getBean(SystemEntityClient.class);
-    final GraphService graphClient = applicationContext.getBean(GraphService.class);
-    final EntitySearchService searchClient = applicationContext.getBean(EntitySearchService.class);
+    final SystemEntityClient systemEntityClient =
+        applicationContext.getBean(SystemEntityClient.class);
+    final SystemMetadataService systemMetadataService =
+        applicationContext.getBean(SystemMetadataService.class);
+    final EntitySearchService entitySearchService =
+        applicationContext.getBean(EntitySearchService.class);
+    final GraphService graphService = applicationContext.getBean(GraphService.class);
     final EntityRegistry entityRegistry = applicationContext.getBean(EntityRegistry.class);
 
     return new RestoreBackup(
-        ebeanServer, entityService, entityRegistry, entityClient, graphClient, searchClient);
+        ebeanServer,
+        entityService,
+        entityRegistry,
+        systemEntityClient,
+        systemMetadataService,
+        entitySearchService,
+        graphService);
   }
 
   @Bean(name = "restoreBackup")
@@ -49,6 +61,6 @@ public RestoreBackup createInstance() {
   @Nonnull
   public RestoreBackup createNotImplInstance() {
     log.warn("restoreIndices is not supported for cassandra!");
-    return new RestoreBackup(null, null, null, null, null, null);
+    return new RestoreBackup(null, null, null, null, null, null, null);
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/RestoreIndicesConfig.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/RestoreIndicesConfig.java
index 008bdf5cfac388..26e40485787e90 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/RestoreIndicesConfig.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/RestoreIndicesConfig.java
@@ -4,33 +4,29 @@
 import com.linkedin.metadata.entity.EntityService;
 import com.linkedin.metadata.graph.GraphService;
 import com.linkedin.metadata.search.EntitySearchService;
+import com.linkedin.metadata.systemmetadata.SystemMetadataService;
 import io.ebean.Database;
 import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.DependsOn;
 
 @Slf4j
 @Configuration
 public class RestoreIndicesConfig {
-  @Autowired ApplicationContext applicationContext;
 
   @Bean(name = "restoreIndices")
-  @DependsOn({"ebeanServer", "entityService", "searchService", "graphService"})
   @ConditionalOnProperty(name = "entityService.impl", havingValue = "ebean", matchIfMissing = true)
   @Nonnull
-  public RestoreIndices createInstance() {
-    final Database ebeanServer = applicationContext.getBean(Database.class);
-    final EntityService<?> entityService = applicationContext.getBean(EntityService.class);
-    final EntitySearchService entitySearchService =
-        applicationContext.getBean(EntitySearchService.class);
-    final GraphService graphService = applicationContext.getBean(GraphService.class);
-
-    return new RestoreIndices(ebeanServer, entityService, entitySearchService, graphService);
+  public RestoreIndices createInstance(
+      final Database ebeanServer,
+      final EntityService<?> entityService,
+      final EntitySearchService entitySearchService,
+      final GraphService graphService,
+      final SystemMetadataService systemMetadataService) {
+    return new RestoreIndices(
+        ebeanServer, entityService, systemMetadataService, entitySearchService, graphService);
   }
 
   @Bean(name = "restoreIndices")
@@ -38,6 +34,6 @@ public RestoreIndices createInstance() {
   @Nonnull
   public RestoreIndices createNotImplInstance() {
     log.warn("restoreIndices is not supported for cassandra!");
-    return new RestoreIndices(null, null, null, null);
+    return new RestoreIndices(null, null, null, null, null);
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/SchemaFieldsConfig.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/SchemaFieldsConfig.java
new file mode 100644
index 00000000000000..5630379c566183
--- /dev/null
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/SchemaFieldsConfig.java
@@ -0,0 +1,56 @@
+package com.linkedin.datahub.upgrade.config;
+
+import com.linkedin.datahub.upgrade.system.NonBlockingSystemUpgrade;
+import com.linkedin.datahub.upgrade.system.schemafield.GenerateSchemaFieldsFromSchemaMetadata;
+import com.linkedin.datahub.upgrade.system.schemafield.MigrateSchemaFieldDocIds;
+import com.linkedin.gms.factory.search.BaseElasticSearchComponentsFactory;
+import com.linkedin.metadata.entity.AspectDao;
+import com.linkedin.metadata.entity.EntityService;
+import io.datahubproject.metadata.context.OperationContext;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@Conditional(SystemUpdateCondition.NonBlockingSystemUpdateCondition.class)
+public class SchemaFieldsConfig {
+
+  @Bean
+  public NonBlockingSystemUpgrade schemaFieldsFromSchemaMetadata(
+      @Qualifier("systemOperationContext") final OperationContext opContext,
+      final EntityService<?> entityService,
+      final AspectDao aspectDao,
+      // SYSTEM_UPDATE_SCHEMA_FIELDS_FROM_SCHEMA_METADATA_ENABLED
+      @Value("${systemUpdate.schemaFieldsFromSchemaMetadata.enabled}") final boolean enabled,
+      // SYSTEM_UPDATE_SCHEMA_FIELDS_FROM_SCHEMA_METADATA_BATCH_SIZE
+      @Value("${systemUpdate.schemaFieldsFromSchemaMetadata.batchSize}") final Integer batchSize,
+      // SYSTEM_UPDATE_SCHEMA_FIELDS_FROM_SCHEMA_METADATA_DELAY_MS
+      @Value("${systemUpdate.schemaFieldsFromSchemaMetadata.delayMs}") final Integer delayMs,
+      // SYSTEM_UPDATE_SCHEMA_FIELDS_FROM_SCHEMA_METADATA_LIMIT
+      @Value("${systemUpdate.schemaFieldsFromSchemaMetadata.limit}") final Integer limit) {
+    return new GenerateSchemaFieldsFromSchemaMetadata(
+        opContext, entityService, aspectDao, enabled, batchSize, delayMs, limit);
+  }
+
+  @Bean
+  public NonBlockingSystemUpgrade schemaFieldsDocIds(
+      @Qualifier("systemOperationContext") final OperationContext opContext,
+      @Qualifier("baseElasticSearchComponents")
+          final BaseElasticSearchComponentsFactory.BaseElasticSearchComponents components,
+      final EntityService<?> entityService,
+      // ELASTICSEARCH_INDEX_DOC_IDS_SCHEMA_FIELD_HASH_ID_ENABLED
+      @Value("${elasticsearch.index.docIds.schemaField.hashIdEnabled}") final boolean hashEnabled,
+      // SYSTEM_UPDATE_SCHEMA_FIELDS_DOC_IDS_ENABLED
+      @Value("${systemUpdate.schemaFieldsDocIds.enabled}") final boolean enabled,
+      // SYSTEM_UPDATE_SCHEMA_FIELDS_DOC_IDS_BATCH_SIZE
+      @Value("${systemUpdate.schemaFieldsDocIds.batchSize}") final Integer batchSize,
+      // SYSTEM_UPDATE_SCHEMA_FIELDS_DOC_IDS_DELAY_MS
+      @Value("${systemUpdate.schemaFieldsDocIds.delayMs}") final Integer delayMs,
+      // SYSTEM_UPDATE_SCHEMA_FIELDS_DOC_IDS_LIMIT
+      @Value("${systemUpdate.schemaFieldsDocIds.limit}") final Integer limit) {
+    return new MigrateSchemaFieldDocIds(
+        opContext, components, entityService, enabled && hashEnabled, batchSize, delayMs, limit);
+  }
+}
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/SystemUpdateConfig.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/SystemUpdateConfig.java
index cac9b5f9483d41..dea98c5cbcb132 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/SystemUpdateConfig.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/SystemUpdateConfig.java
@@ -1,5 +1,6 @@
 package com.linkedin.datahub.upgrade.config;
 
+import com.datahub.authentication.Authentication;
 import com.linkedin.datahub.upgrade.system.BlockingSystemUpgrade;
 import com.linkedin.datahub.upgrade.system.NonBlockingSystemUpgrade;
 import com.linkedin.datahub.upgrade.system.SystemUpdate;
@@ -10,13 +11,25 @@
 import com.linkedin.gms.factory.kafka.DataHubKafkaProducerFactory;
 import com.linkedin.gms.factory.kafka.common.TopicConventionFactory;
 import com.linkedin.gms.factory.kafka.schemaregistry.InternalSchemaRegistryFactory;
-import com.linkedin.gms.factory.kafka.schemaregistry.SchemaRegistryConfig;
+import com.linkedin.gms.factory.search.BaseElasticSearchComponentsFactory;
+import com.linkedin.metadata.aspect.GraphRetriever;
 import com.linkedin.metadata.config.kafka.KafkaConfiguration;
 import com.linkedin.metadata.dao.producer.KafkaEventProducer;
 import com.linkedin.metadata.dao.producer.KafkaHealthChecker;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.entity.EntityServiceAspectRetriever;
+import com.linkedin.metadata.models.registry.EntityRegistry;
+import com.linkedin.metadata.search.SearchService;
+import com.linkedin.metadata.search.SearchServiceSearchRetriever;
 import com.linkedin.metadata.version.GitVersion;
 import com.linkedin.mxe.TopicConvention;
+import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.metadata.context.OperationContextConfig;
+import io.datahubproject.metadata.context.RetrieverContext;
+import io.datahubproject.metadata.context.ServicesRegistryContext;
+import io.datahubproject.metadata.services.RestrictedService;
 import java.util.List;
+import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.avro.generic.IndexedRecord;
 import org.apache.kafka.clients.producer.KafkaProducer;
@@ -84,7 +97,8 @@ public DataHubStartupStep dataHubStartupStep(
   protected KafkaEventProducer duheKafkaEventProducer(
       @Qualifier("configurationProvider") ConfigurationProvider provider,
       KafkaProperties properties,
-      @Qualifier("duheSchemaRegistryConfig") SchemaRegistryConfig duheSchemaRegistryConfig) {
+      @Qualifier("duheSchemaRegistryConfig")
+          KafkaConfiguration.SerDeKeyValueConfig duheSchemaRegistryConfig) {
     KafkaConfiguration kafkaConfiguration = provider.getKafka();
     Producer<String, IndexedRecord> producer =
         new KafkaProducer<>(
@@ -116,8 +130,51 @@ protected KafkaEventProducer kafkaEventProducer(
   @ConditionalOnProperty(
       name = "kafka.schemaRegistry.type",
       havingValue = InternalSchemaRegistryFactory.TYPE)
-  protected SchemaRegistryConfig schemaRegistryConfig(
-      @Qualifier("duheSchemaRegistryConfig") SchemaRegistryConfig duheSchemaRegistryConfig) {
+  protected KafkaConfiguration.SerDeKeyValueConfig schemaRegistryConfig(
+      @Qualifier("duheSchemaRegistryConfig")
+          KafkaConfiguration.SerDeKeyValueConfig duheSchemaRegistryConfig) {
     return duheSchemaRegistryConfig;
   }
+
+  @Primary
+  @Nonnull
+  @Bean(name = "systemOperationContext")
+  protected OperationContext javaSystemOperationContext(
+      @Nonnull @Qualifier("systemAuthentication") final Authentication systemAuthentication,
+      @Nonnull final OperationContextConfig operationContextConfig,
+      @Nonnull final EntityRegistry entityRegistry,
+      @Nonnull final EntityService<?> entityService,
+      @Nonnull final RestrictedService restrictedService,
+      @Nonnull final GraphRetriever graphRetriever,
+      @Nonnull final SearchService searchService,
+      @Qualifier("baseElasticSearchComponents")
+          BaseElasticSearchComponentsFactory.BaseElasticSearchComponents components) {
+
+    EntityServiceAspectRetriever entityServiceAspectRetriever =
+        EntityServiceAspectRetriever.builder()
+            .entityRegistry(entityRegistry)
+            .entityService(entityService)
+            .build();
+
+    SearchServiceSearchRetriever searchServiceSearchRetriever =
+        SearchServiceSearchRetriever.builder().searchService(searchService).build();
+
+    OperationContext systemOperationContext =
+        OperationContext.asSystem(
+            operationContextConfig,
+            systemAuthentication,
+            entityServiceAspectRetriever.getEntityRegistry(),
+            ServicesRegistryContext.builder().restrictedService(restrictedService).build(),
+            components.getIndexConvention(),
+            RetrieverContext.builder()
+                .aspectRetriever(entityServiceAspectRetriever)
+                .graphRetriever(graphRetriever)
+                .searchRetriever(searchServiceSearchRetriever)
+                .build());
+
+    entityServiceAspectRetriever.setSystemOperationContext(systemOperationContext);
+    searchServiceSearchRetriever.setSystemOperationContext(systemOperationContext);
+
+    return systemOperationContext;
+  }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeManager.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeManager.java
index 240ec9f7bb2fed..27ba6abbc5ba93 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeManager.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeManager.java
@@ -11,6 +11,7 @@
 import com.linkedin.datahub.upgrade.UpgradeStep;
 import com.linkedin.datahub.upgrade.UpgradeStepResult;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import io.datahubproject.metadata.context.OperationContext;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -85,11 +86,11 @@ private UpgradeResult executeInternal(UpgradeContext context) {
             String.format(
                 "Step with id %s requested an abort of the in-progress update. Aborting the upgrade...",
                 step.id()));
-        return new DefaultUpgradeResult(UpgradeResult.Result.ABORTED, upgradeReport);
+        return new DefaultUpgradeResult(DataHubUpgradeState.ABORTED, upgradeReport);
       }
 
       // Handle Results
-      if (UpgradeStepResult.Result.FAILED.equals(stepResult.result())) {
+      if (DataHubUpgradeState.FAILED.equals(stepResult.result())) {
         if (step.isOptional()) {
           upgradeReport.addLine(
               String.format(
@@ -104,7 +105,7 @@ private UpgradeResult executeInternal(UpgradeContext context) {
                 "Failed Step %s/%s: %s. Failed after %s retries.",
                 i + 1, steps.size(), step.id(), step.retryCount()));
         upgradeReport.addLine(String.format("Exiting upgrade %s with failure.", upgrade.id()));
-        return new DefaultUpgradeResult(UpgradeResult.Result.FAILED, upgradeReport);
+        return new DefaultUpgradeResult(DataHubUpgradeState.FAILED, upgradeReport);
       }
 
       upgradeReport.addLine(
@@ -113,7 +114,7 @@ private UpgradeResult executeInternal(UpgradeContext context) {
 
     upgradeReport.addLine(
         String.format("Success! Completed upgrade with id %s successfully.", upgrade.id()));
-    return new DefaultUpgradeResult(UpgradeResult.Result.SUCCEEDED, upgradeReport);
+    return new DefaultUpgradeResult(DataHubUpgradeState.SUCCEEDED, upgradeReport);
   }
 
   private UpgradeStepResult executeStepInternal(UpgradeContext context, UpgradeStep step) {
@@ -130,14 +131,14 @@ private UpgradeStepResult executeStepInternal(UpgradeContext context, UpgradeSte
 
         if (result == null) {
           // Failed to even retrieve a result. Create a default failure result.
-          result = new DefaultUpgradeStepResult(step.id(), UpgradeStepResult.Result.FAILED);
+          result = new DefaultUpgradeStepResult(step.id(), DataHubUpgradeState.FAILED);
           context
               .report()
               .addLine(String.format("Retrying %s more times...", maxAttempts - (i + 1)));
           MetricUtils.counter(MetricRegistry.name(step.id(), "retry")).inc();
         }
 
-        if (UpgradeStepResult.Result.SUCCEEDED.equals(result.result())) {
+        if (DataHubUpgradeState.SUCCEEDED.equals(result.result())) {
           MetricUtils.counter(MetricRegistry.name(step.id(), "succeeded")).inc();
           break;
         }
@@ -149,7 +150,7 @@ private UpgradeStepResult executeStepInternal(UpgradeContext context, UpgradeSte
                 String.format(
                     "Caught exception during attempt %s of Step with id %s: %s", i, step.id(), e));
         MetricUtils.counter(MetricRegistry.name(step.id(), "failed")).inc();
-        result = new DefaultUpgradeStepResult(step.id(), UpgradeStepResult.Result.FAILED);
+        result = new DefaultUpgradeStepResult(step.id(), DataHubUpgradeState.FAILED);
         context.report().addLine(String.format("Retrying %s more times...", maxAttempts - (i + 1)));
       }
     }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeResult.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeResult.java
index cf0e7221b406b0..5131cadf5d3fa7 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeResult.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeResult.java
@@ -2,19 +2,20 @@
 
 import com.linkedin.datahub.upgrade.UpgradeReport;
 import com.linkedin.datahub.upgrade.UpgradeResult;
+import com.linkedin.upgrade.DataHubUpgradeState;
 
 public class DefaultUpgradeResult implements UpgradeResult {
 
-  private final Result _result;
+  private final DataHubUpgradeState _result;
   private final UpgradeReport _report;
 
-  DefaultUpgradeResult(Result result, UpgradeReport report) {
+  DefaultUpgradeResult(DataHubUpgradeState result, UpgradeReport report) {
     _result = result;
     _report = report;
   }
 
   @Override
-  public Result result() {
+  public DataHubUpgradeState result() {
     return _result;
   }
 
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeStepResult.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeStepResult.java
index e11eaf89bfc8d2..cab0708fa52249 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeStepResult.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeStepResult.java
@@ -1,18 +1,19 @@
 package com.linkedin.datahub.upgrade.impl;
 
 import com.linkedin.datahub.upgrade.UpgradeStepResult;
+import com.linkedin.upgrade.DataHubUpgradeState;
 
 public class DefaultUpgradeStepResult implements UpgradeStepResult {
 
   private final String _stepId;
-  private final Result _result;
+  private final DataHubUpgradeState _result;
   private final Action _action;
 
-  public DefaultUpgradeStepResult(String stepId, Result result) {
+  public DefaultUpgradeStepResult(String stepId, DataHubUpgradeState result) {
     this(stepId, result, Action.CONTINUE);
   }
 
-  public DefaultUpgradeStepResult(String stepId, Result result, Action action) {
+  public DefaultUpgradeStepResult(String stepId, DataHubUpgradeState result, Action action) {
     _stepId = stepId;
     _result = result;
     _action = action;
@@ -24,7 +25,7 @@ public String stepId() {
   }
 
   @Override
-  public Result result() {
+  public DataHubUpgradeState result() {
     return _result;
   }
 
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/CreateAspectTableStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/CreateAspectTableStep.java
index 3b3098f43c4734..4855cef95cb6e5 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/CreateAspectTableStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/CreateAspectTableStep.java
@@ -4,6 +4,7 @@
 import com.linkedin.datahub.upgrade.UpgradeStep;
 import com.linkedin.datahub.upgrade.UpgradeStepResult;
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import io.ebean.Database;
 import java.util.function.Function;
 
@@ -79,9 +80,9 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
         _server.execute(_server.createSqlUpdate(sqlUpdateStr));
       } catch (Exception e) {
         context.report().addLine("Failed to create table metadata_aspect_v2", e);
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/DataMigrationStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/DataMigrationStep.java
index 94bf97f3c9c9e7..ecff2e3ee6e18b 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/DataMigrationStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/DataMigrationStep.java
@@ -18,6 +18,7 @@
 import com.linkedin.metadata.models.EntitySpec;
 import com.linkedin.metadata.models.registry.EntityRegistry;
 import com.linkedin.metadata.utils.PegasusUtils;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import com.linkedin.util.Pair;
 import io.ebean.Database;
 import io.ebean.PagedList;
@@ -100,7 +101,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
                         "Failed to convert aspect with name %s into a RecordTemplate class",
                         oldAspectName),
                     e);
-            return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+            return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
           }
 
           // 2. Extract an Entity type from the entity Urn
@@ -127,7 +128,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
                     String.format(
                         "Failed to find Entity with name %s in Entity Registry", entityName),
                     e);
-            return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+            return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
           }
 
           // 4. Extract new aspect name from Aspect schema
@@ -142,7 +143,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
                         "Failed to retrieve @Aspect name from schema %s, urn %s",
                         aspectRecord.schema().getFullName(), entityName),
                     e);
-            return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+            return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
           }
 
           // 5. Verify that the aspect is a valid aspect associated with the entity
@@ -157,7 +158,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
                         "Failed to find aspect spec with name %s associated with entity named %s",
                         newAspectName, entityName),
                     e);
-            return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+            return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
           }
 
           // 6. Write the row back using the EntityService
@@ -214,9 +215,9 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
                 String.format(
                     "Number of rows migrated %s does not equal the number of input rows %s...",
                     totalRowsMigrated, rowCount));
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/RemoveAspectV2TableStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/RemoveAspectV2TableStep.java
index 6180573d902d22..39346fa09d2319 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/RemoveAspectV2TableStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/RemoveAspectV2TableStep.java
@@ -4,6 +4,7 @@
 import com.linkedin.datahub.upgrade.UpgradeStep;
 import com.linkedin.datahub.upgrade.UpgradeStepResult;
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import io.ebean.Database;
 import java.util.function.Function;
 
@@ -26,7 +27,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
     return (context) -> {
       context.report().addLine("Cleanup requested. Dropping metadata_aspect_v2");
       _server.execute(_server.sqlUpdate("DROP TABLE IF EXISTS metadata_aspect_v2"));
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/UpgradeQualificationStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/UpgradeQualificationStep.java
index d22af9d2924003..33de9f842a3aed 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/UpgradeQualificationStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/UpgradeQualificationStep.java
@@ -5,6 +5,7 @@
 import com.linkedin.datahub.upgrade.UpgradeStepResult;
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
 import com.linkedin.metadata.entity.ebean.AspectStorageValidationUtil;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import io.ebean.Database;
 import java.util.function.Function;
 
@@ -31,22 +32,22 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
     return (context) -> {
       if (context.parsedArgs().containsKey(NoCodeUpgrade.FORCE_UPGRADE_ARG_NAME)) {
         context.report().addLine("Forced upgrade detected. Proceeding with upgrade...");
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
       }
 
       try {
         if (isQualified(_server, context)) {
           // Qualified.
           context.report().addLine("Found qualified upgrade candidate. Proceeding with upgrade...");
-          return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+          return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
         }
         // Unqualified (Table already exists)
         context.report().addLine("Failed to qualify upgrade candidate. Aborting the upgrade...");
         return new DefaultUpgradeStepResult(
-            id(), UpgradeStepResult.Result.SUCCEEDED, UpgradeStepResult.Action.ABORT);
+            id(), DataHubUpgradeState.SUCCEEDED, UpgradeStepResult.Action.ABORT);
       } catch (Exception e) {
         context.report().addLine("Failed to check if metadata_aspect_v2 table exists", e);
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
     };
   }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/DeleteAspectTableStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/DeleteAspectTableStep.java
index ba0a0124545e9d..f310c65375fb3b 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/DeleteAspectTableStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/DeleteAspectTableStep.java
@@ -4,6 +4,7 @@
 import com.linkedin.datahub.upgrade.UpgradeStep;
 import com.linkedin.datahub.upgrade.UpgradeStepResult;
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import io.ebean.Database;
 import java.util.function.Function;
 
@@ -33,9 +34,9 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
         _server.execute(_server.sqlUpdate("DROP TABLE IF EXISTS metadata_aspect;"));
       } catch (Exception e) {
         context.report().addLine("Failed to delete data from legacy table metadata_aspect", e);
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/DeleteLegacyGraphRelationshipsStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/DeleteLegacyGraphRelationshipsStep.java
index 5066e05f8bf5a1..47da1da8396430 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/DeleteLegacyGraphRelationshipsStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/DeleteLegacyGraphRelationshipsStep.java
@@ -6,6 +6,7 @@
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
 import com.linkedin.metadata.graph.GraphService;
 import com.linkedin.metadata.graph.neo4j.Neo4jGraphService;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import java.util.function.Function;
 import lombok.extern.slf4j.Slf4j;
 
@@ -42,9 +43,9 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
         }
       } catch (Exception e) {
         context.report().addLine("Failed to delete legacy data from graph", e);
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/DeleteLegacySearchIndicesStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/DeleteLegacySearchIndicesStep.java
index 05656373377b93..33ace43fee8b2a 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/DeleteLegacySearchIndicesStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/DeleteLegacySearchIndicesStep.java
@@ -5,6 +5,7 @@
 import com.linkedin.datahub.upgrade.UpgradeStepResult;
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
 import com.linkedin.metadata.utils.elasticsearch.IndexConvention;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import java.util.function.Function;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.action.admin.indices.delete.DeleteIndexRequest;
@@ -43,9 +44,9 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
         _searchClient.indices().delete(request, RequestOptions.DEFAULT);
       } catch (Exception e) {
         context.report().addLine("Failed to delete legacy search index: %s", e);
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/NoCodeUpgradeQualificationStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/NoCodeUpgradeQualificationStep.java
index 15c7584532e2ca..d8284fe47f9390 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/NoCodeUpgradeQualificationStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocodecleanup/NoCodeUpgradeQualificationStep.java
@@ -5,6 +5,7 @@
 import com.linkedin.datahub.upgrade.UpgradeStepResult;
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
 import com.linkedin.metadata.entity.ebean.AspectStorageValidationUtil;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import io.ebean.Database;
 import java.util.function.Function;
 
@@ -36,15 +37,15 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
               .report()
               .addLine("You have not successfully migrated yet. Aborting the cleanup...");
           return new DefaultUpgradeStepResult(
-              id(), UpgradeStepResult.Result.SUCCEEDED, UpgradeStepResult.Action.ABORT);
+              id(), DataHubUpgradeState.SUCCEEDED, UpgradeStepResult.Action.ABORT);
         } else {
           // Qualified.
           context.report().addLine("Found qualified upgrade candidate. Proceeding with upgrade...");
-          return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+          return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
         }
       } catch (Exception e) {
         context.report().addLine("Failed to check if metadata_aspect_v2 table exists: %s", e);
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
     };
   }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/removeunknownaspects/RemoveClientIdAspectStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/removeunknownaspects/RemoveClientIdAspectStep.java
index 6054599aa843c1..16b78a8dc8c6b3 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/removeunknownaspects/RemoveClientIdAspectStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/removeunknownaspects/RemoveClientIdAspectStep.java
@@ -6,6 +6,7 @@
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
 import com.linkedin.gms.factory.telemetry.TelemetryUtils;
 import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import java.util.HashMap;
 import java.util.function.Function;
 import lombok.RequiredArgsConstructor;
@@ -38,8 +39,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
           INVALID_CLIENT_ID_ASPECT,
           new HashMap<>(),
           true);
-      return (UpgradeStepResult)
-          new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return (UpgradeStepResult) new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restorebackup/ClearAspectV2TableStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restorebackup/ClearAspectV2TableStep.java
index addf6dcb89c1ae..febc1bec6fe266 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restorebackup/ClearAspectV2TableStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restorebackup/ClearAspectV2TableStep.java
@@ -5,6 +5,7 @@
 import com.linkedin.datahub.upgrade.UpgradeStepResult;
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
 import com.linkedin.metadata.entity.ebean.EbeanAspectV2;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import io.ebean.Database;
 import java.util.function.Function;
 
@@ -26,7 +27,7 @@ public String id() {
   public Function<UpgradeContext, UpgradeStepResult> executable() {
     return (context) -> {
       _server.find(EbeanAspectV2.class).delete();
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restorebackup/RestoreBackup.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restorebackup/RestoreBackup.java
index bcaeaa34e8936d..7496655e581b09 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restorebackup/RestoreBackup.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restorebackup/RestoreBackup.java
@@ -6,6 +6,7 @@
 import com.linkedin.datahub.upgrade.UpgradeStep;
 import com.linkedin.datahub.upgrade.common.steps.ClearGraphServiceStep;
 import com.linkedin.datahub.upgrade.common.steps.ClearSearchServiceStep;
+import com.linkedin.datahub.upgrade.common.steps.ClearSystemMetadataServiceStep;
 import com.linkedin.datahub.upgrade.common.steps.GMSDisableWriteModeStep;
 import com.linkedin.datahub.upgrade.common.steps.GMSEnableWriteModeStep;
 import com.linkedin.entity.client.SystemEntityClient;
@@ -13,6 +14,7 @@
 import com.linkedin.metadata.graph.GraphService;
 import com.linkedin.metadata.models.registry.EntityRegistry;
 import com.linkedin.metadata.search.EntitySearchService;
+import com.linkedin.metadata.systemmetadata.SystemMetadataService;
 import io.ebean.Database;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,13 +28,20 @@ public RestoreBackup(
       @Nullable final Database server,
       final EntityService<?> entityService,
       final EntityRegistry entityRegistry,
-      final SystemEntityClient entityClient,
-      final GraphService graphClient,
-      final EntitySearchService searchClient) {
+      final SystemEntityClient systemEntityClient,
+      final SystemMetadataService systemMetadataService,
+      final EntitySearchService entitySearchService,
+      final GraphService graphClient) {
     if (server != null) {
       _steps =
           buildSteps(
-              server, entityService, entityRegistry, entityClient, graphClient, searchClient);
+              server,
+              entityService,
+              entityRegistry,
+              systemEntityClient,
+              systemMetadataService,
+              entitySearchService,
+              graphClient);
     } else {
       _steps = List.of();
     }
@@ -52,16 +61,18 @@ private List<UpgradeStep> buildSteps(
       final Database server,
       final EntityService<?> entityService,
       final EntityRegistry entityRegistry,
-      final SystemEntityClient entityClient,
-      final GraphService graphClient,
-      final EntitySearchService searchClient) {
+      final SystemEntityClient systemEntityClient,
+      final SystemMetadataService systemMetadataService,
+      final EntitySearchService entitySearchService,
+      final GraphService graphClient) {
     final List<UpgradeStep> steps = new ArrayList<>();
-    steps.add(new GMSDisableWriteModeStep(entityClient));
-    steps.add(new ClearSearchServiceStep(searchClient, true));
+    steps.add(new GMSDisableWriteModeStep(systemEntityClient));
+    steps.add(new ClearSystemMetadataServiceStep(systemMetadataService, true));
+    steps.add(new ClearSearchServiceStep(entitySearchService, true));
     steps.add(new ClearGraphServiceStep(graphClient, true));
     steps.add(new ClearAspectV2TableStep(server));
     steps.add(new RestoreStorageStep(entityService, entityRegistry));
-    steps.add(new GMSEnableWriteModeStep(entityClient));
+    steps.add(new GMSEnableWriteModeStep(systemEntityClient));
     return steps;
   }
 
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restorebackup/RestoreStorageStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restorebackup/RestoreStorageStep.java
index eb0b24acc1ac37..4d53b603c1eaff 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restorebackup/RestoreStorageStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restorebackup/RestoreStorageStep.java
@@ -20,6 +20,7 @@
 import com.linkedin.metadata.models.AspectSpec;
 import com.linkedin.metadata.models.EntitySpec;
 import com.linkedin.metadata.models.registry.EntityRegistry;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import com.linkedin.util.Pair;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URISyntaxException;
@@ -89,7 +90,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
       context.report().addLine("BACKUP_READER: " + backupReaderName.toString());
       if (!backupReaderName.isPresent() || !_backupReaders.containsKey(backupReaderName.get())) {
         context.report().addLine("BACKUP_READER is not set or is not valid");
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
 
       Class<? extends BackupReader<? extends ReaderWrapper>> clazz =
@@ -134,7 +135,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
       }
 
       context.report().addLine(String.format("Added %d rows to the aspect v2 table", numRows));
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/RestoreIndices.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/RestoreIndices.java
index 9bc42e23a99746..9d239a56224862 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/RestoreIndices.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/RestoreIndices.java
@@ -6,9 +6,11 @@
 import com.linkedin.datahub.upgrade.UpgradeStep;
 import com.linkedin.datahub.upgrade.common.steps.ClearGraphServiceStep;
 import com.linkedin.datahub.upgrade.common.steps.ClearSearchServiceStep;
+import com.linkedin.datahub.upgrade.common.steps.ClearSystemMetadataServiceStep;
 import com.linkedin.metadata.entity.EntityService;
 import com.linkedin.metadata.graph.GraphService;
 import com.linkedin.metadata.search.EntitySearchService;
+import com.linkedin.metadata.systemmetadata.SystemMetadataService;
 import io.ebean.Database;
 import java.util.ArrayList;
 import java.util.List;
@@ -32,10 +34,13 @@ public class RestoreIndices implements Upgrade {
   public RestoreIndices(
       @Nullable final Database server,
       final EntityService<?> entityService,
+      final SystemMetadataService systemMetadataService,
       final EntitySearchService entitySearchService,
       final GraphService graphService) {
     if (server != null) {
-      _steps = buildSteps(server, entityService, entitySearchService, graphService);
+      _steps =
+          buildSteps(
+              server, entityService, systemMetadataService, entitySearchService, graphService);
     } else {
       _steps = List.of();
     }
@@ -54,9 +59,11 @@ public List<UpgradeStep> steps() {
   private List<UpgradeStep> buildSteps(
       final Database server,
       final EntityService<?> entityService,
+      final SystemMetadataService systemMetadataService,
       final EntitySearchService entitySearchService,
       final GraphService graphService) {
     final List<UpgradeStep> steps = new ArrayList<>();
+    steps.add(new ClearSystemMetadataServiceStep(systemMetadataService, false));
     steps.add(new ClearSearchServiceStep(entitySearchService, false));
     steps.add(new ClearGraphServiceStep(graphService, false));
     steps.add(new SendMAEStep(server, entityService));
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/SendMAEStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/SendMAEStep.java
index 77d988f3176f29..8e62db444a5655 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/SendMAEStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/SendMAEStep.java
@@ -10,6 +10,7 @@
 import com.linkedin.metadata.entity.ebean.EbeanAspectV2;
 import com.linkedin.metadata.entity.restoreindices.RestoreIndicesArgs;
 import com.linkedin.metadata.entity.restoreindices.RestoreIndicesResult;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import io.ebean.Database;
 import io.ebean.ExpressionList;
 import java.util.ArrayList;
@@ -188,7 +189,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
             context.report().addLine(String.format("Rows processed this loop %d", rowsProcessed));
             start += args.batchSize;
           } catch (InterruptedException | ExecutionException e) {
-            return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+            return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
           }
         }
       } else {
@@ -219,7 +220,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
                     "Failed to send MAEs for %d rows (%.2f%% of total).",
                     rowCount - finalJobResult.rowsMigrated, percentFailed));
       }
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/AbstractMCLStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/AbstractMCLStep.java
index 27e98259c8beb5..6c70aee88675c5 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/AbstractMCLStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/AbstractMCLStep.java
@@ -16,6 +16,7 @@
 import com.linkedin.metadata.entity.ebean.PartitionedStream;
 import com.linkedin.metadata.entity.restoreindices.RestoreIndicesArgs;
 import com.linkedin.metadata.utils.AuditStampUtils;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import com.linkedin.util.Pair;
 import io.datahubproject.metadata.context.OperationContext;
 import java.util.List;
@@ -134,7 +135,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
       BootstrapStep.setUpgradeResult(opContext, getUpgradeIdUrn(), entityService);
       context.report().addLine("State updated: " + getUpgradeIdUrn());
 
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/browsepaths/BackfillBrowsePathsV2Step.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/browsepaths/BackfillBrowsePathsV2Step.java
index 09b27fbcfbdf29..e6213a164febf7 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/browsepaths/BackfillBrowsePathsV2Step.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/browsepaths/BackfillBrowsePathsV2Step.java
@@ -1,6 +1,7 @@
 package com.linkedin.datahub.upgrade.system.browsepaths;
 
 import static com.linkedin.metadata.Constants.*;
+import static com.linkedin.metadata.utils.SystemMetadataUtils.createDefaultSystemMetadata;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -29,7 +30,7 @@
 import com.linkedin.metadata.search.SearchService;
 import com.linkedin.metadata.utils.GenericRecordUtils;
 import com.linkedin.mxe.MetadataChangeProposal;
-import com.linkedin.mxe.SystemMetadata;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import io.datahubproject.metadata.context.OperationContext;
 import java.util.Set;
 import java.util.function.Function;
@@ -98,7 +99,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
 
       BootstrapStep.setUpgradeResult(context.opContext(), UPGRADE_ID_URN, entityService);
 
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 
@@ -208,8 +209,7 @@ private void ingestBrowsePathsV2(
     proposal.setEntityType(urn.getEntityType());
     proposal.setAspectName(Constants.BROWSE_PATHS_V2_ASPECT_NAME);
     proposal.setChangeType(ChangeType.UPSERT);
-    proposal.setSystemMetadata(
-        new SystemMetadata().setRunId(DEFAULT_RUN_ID).setLastObserved(System.currentTimeMillis()));
+    proposal.setSystemMetadata(createDefaultSystemMetadata());
     proposal.setAspect(GenericRecordUtils.serializeAspect(browsePathsV2));
     entityService.ingestProposal(opContext, proposal, auditStamp, true);
   }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/domaindescription/ReindexDomainDescription.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/domaindescription/ReindexDomainDescription.java
new file mode 100644
index 00000000000000..85af912e24f68a
--- /dev/null
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/domaindescription/ReindexDomainDescription.java
@@ -0,0 +1,49 @@
+package com.linkedin.datahub.upgrade.system.domaindescription;
+
+import com.google.common.collect.ImmutableList;
+import com.linkedin.datahub.upgrade.UpgradeStep;
+import com.linkedin.datahub.upgrade.system.NonBlockingSystemUpgrade;
+import com.linkedin.metadata.entity.AspectDao;
+import com.linkedin.metadata.entity.EntityService;
+import io.datahubproject.metadata.context.OperationContext;
+import java.util.List;
+import javax.annotation.Nonnull;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * A job that reindexes all domain aspects as part of reindexing descriptions This is required to
+ * fix the analytics for domains
+ */
+@Slf4j
+public class ReindexDomainDescription implements NonBlockingSystemUpgrade {
+
+  private final List<UpgradeStep> _steps;
+
+  public ReindexDomainDescription(
+      @Nonnull OperationContext opContext,
+      EntityService<?> entityService,
+      AspectDao aspectDao,
+      boolean enabled,
+      Integer batchSize,
+      Integer batchDelayMs,
+      Integer limit) {
+    if (enabled) {
+      _steps =
+          ImmutableList.of(
+              new ReindexDomainDescriptionStep(
+                  opContext, entityService, aspectDao, batchSize, batchDelayMs, limit));
+    } else {
+      _steps = ImmutableList.of();
+    }
+  }
+
+  @Override
+  public String id() {
+    return this.getClass().getName();
+  }
+
+  @Override
+  public List<UpgradeStep> steps() {
+    return _steps;
+  }
+}
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/domaindescription/ReindexDomainDescriptionStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/domaindescription/ReindexDomainDescriptionStep.java
new file mode 100644
index 00000000000000..1fa8bc92af078f
--- /dev/null
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/domaindescription/ReindexDomainDescriptionStep.java
@@ -0,0 +1,42 @@
+package com.linkedin.datahub.upgrade.system.domaindescription;
+
+import static com.linkedin.metadata.Constants.*;
+
+import com.linkedin.datahub.upgrade.system.AbstractMCLStep;
+import com.linkedin.metadata.entity.AspectDao;
+import com.linkedin.metadata.entity.EntityService;
+import io.datahubproject.metadata.context.OperationContext;
+import javax.annotation.Nonnull;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.Nullable;
+
+@Slf4j
+public class ReindexDomainDescriptionStep extends AbstractMCLStep {
+
+  public ReindexDomainDescriptionStep(
+      OperationContext opContext,
+      EntityService<?> entityService,
+      AspectDao aspectDao,
+      Integer batchSize,
+      Integer batchDelayMs,
+      Integer limit) {
+    super(opContext, entityService, aspectDao, batchSize, batchDelayMs, limit);
+  }
+
+  @Override
+  public String id() {
+    return "domain-description-v1";
+  }
+
+  @Nonnull
+  @Override
+  protected String getAspectName() {
+    return DOMAIN_PROPERTIES_ASPECT_NAME;
+  }
+
+  @Nullable
+  @Override
+  protected String getUrnLike() {
+    return "urn:li:" + DOMAIN_ENTITY_NAME + ":%";
+  }
+}
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/BuildIndicesPostStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/BuildIndicesPostStep.java
index 09f65c84480279..c7e59998860c17 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/BuildIndicesPostStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/BuildIndicesPostStep.java
@@ -14,6 +14,7 @@
 import com.linkedin.metadata.search.elasticsearch.indexbuilder.ReindexConfig;
 import com.linkedin.metadata.shared.ElasticSearchIndexed;
 import com.linkedin.structured.StructuredPropertyDefinition;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import com.linkedin.util.Pair;
 import java.util.List;
 import java.util.Map;
@@ -86,14 +87,14 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
             log.error(
                 "Partial index settings update, some indices may still be blocking writes."
                     + " Please fix the error and rerun the BuildIndices upgrade job.");
-            return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+            return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
           }
         }
       } catch (Exception e) {
         log.error("BuildIndicesPostStep failed.", e);
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/BuildIndicesPreStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/BuildIndicesPreStep.java
index 983e7f0c97f38b..bd56042a1ff16d 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/BuildIndicesPreStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/BuildIndicesPreStep.java
@@ -15,6 +15,7 @@
 import com.linkedin.metadata.search.elasticsearch.indexbuilder.ReindexConfig;
 import com.linkedin.metadata.shared.ElasticSearchIndexed;
 import com.linkedin.structured.StructuredPropertyDefinition;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import com.linkedin.util.Pair;
 import java.io.IOException;
 import java.util.List;
@@ -69,7 +70,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
             log.error(
                 "Partial index settings update, some indices may still be blocking writes."
                     + " Please fix the error and re-run the BuildIndices upgrade job.");
-            return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+            return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
           }
 
           // Clone indices
@@ -87,15 +88,15 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
               log.error(
                   "Partial index settings update, cloned indices may need to be cleaned up: {}",
                   clonedName);
-              return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+              return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
             }
           }
         }
       } catch (Exception e) {
         log.error("BuildIndicesPreStep failed.", e);
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/BuildIndicesStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/BuildIndicesStep.java
index 5cf370162a3125..0aefc078ffdcba 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/BuildIndicesStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/BuildIndicesStep.java
@@ -7,6 +7,7 @@
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
 import com.linkedin.metadata.shared.ElasticSearchIndexed;
 import com.linkedin.structured.StructuredPropertyDefinition;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import com.linkedin.util.Pair;
 import java.util.List;
 import java.util.Set;
@@ -40,9 +41,9 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
         }
       } catch (Exception e) {
         log.error("BuildIndicesStep failed.", e);
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/CleanIndicesStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/CleanIndicesStep.java
index fd5592c4ead25e..63b23fefceaf98 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/CleanIndicesStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/CleanIndicesStep.java
@@ -10,6 +10,7 @@
 import com.linkedin.metadata.search.elasticsearch.indexbuilder.ESIndexBuilder;
 import com.linkedin.metadata.shared.ElasticSearchIndexed;
 import com.linkedin.structured.StructuredPropertyDefinition;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import com.linkedin.util.Pair;
 import java.util.List;
 import java.util.Set;
@@ -54,9 +55,9 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
                 reindexConfig -> ESIndexBuilder.cleanIndex(searchClient, esConfig, reindexConfig));
       } catch (Exception e) {
         log.error("CleanUpIndicesStep failed.", e);
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/DataHubStartupStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/DataHubStartupStep.java
index d2b5965a3109ce..1d83810580cf55 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/DataHubStartupStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/elasticsearch/steps/DataHubStartupStep.java
@@ -6,6 +6,7 @@
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
 import com.linkedin.metadata.dao.producer.KafkaEventProducer;
 import com.linkedin.mxe.DataHubUpgradeHistoryEvent;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import java.util.function.Function;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -36,9 +37,9 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
         log.info("System Update finished for version: {}", _version);
       } catch (Exception e) {
         log.error("DataHubStartupStep failed.", e);
-        return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.FAILED);
+        return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.FAILED);
       }
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/policyfields/BackfillPolicyFieldsStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/policyfields/BackfillPolicyFieldsStep.java
index 93bf8cc5b9b60e..ad28e6b6382d45 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/policyfields/BackfillPolicyFieldsStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/policyfields/BackfillPolicyFieldsStep.java
@@ -1,6 +1,7 @@
 package com.linkedin.datahub.upgrade.system.policyfields;
 
 import static com.linkedin.metadata.Constants.*;
+import static com.linkedin.metadata.utils.SystemMetadataUtils.createDefaultSystemMetadata;
 
 import com.google.common.collect.ImmutableList;
 import com.linkedin.common.AuditStamp;
@@ -25,8 +26,8 @@
 import com.linkedin.metadata.search.ScrollResult;
 import com.linkedin.metadata.search.SearchEntity;
 import com.linkedin.metadata.search.SearchService;
-import com.linkedin.mxe.SystemMetadata;
 import com.linkedin.policy.DataHubPolicyInfo;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import io.datahubproject.metadata.context.OperationContext;
 import java.net.URISyntaxException;
 import java.util.Collections;
@@ -90,7 +91,7 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
 
       BootstrapStep.setUpgradeResult(context.opContext(), UPGRADE_ID_URN, entityService);
 
-      return new DefaultUpgradeStepResult(id(), UpgradeStepResult.Result.SUCCEEDED);
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
     };
   }
 
@@ -234,9 +235,7 @@ private Optional<Future<?>> ingestPolicyFields(
                   null,
                   infoAspect,
                   null,
-                  new SystemMetadata()
-                      .setRunId(DEFAULT_RUN_ID)
-                      .setLastObserved(System.currentTimeMillis()),
+                  createDefaultSystemMetadata(),
                   auditStamp,
                   ChangeType.RESTATE)
               .getFirst());
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/schemafield/GenerateSchemaFieldsFromSchemaMetadata.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/schemafield/GenerateSchemaFieldsFromSchemaMetadata.java
new file mode 100644
index 00000000000000..20bc65bf15daee
--- /dev/null
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/schemafield/GenerateSchemaFieldsFromSchemaMetadata.java
@@ -0,0 +1,48 @@
+package com.linkedin.datahub.upgrade.system.schemafield;
+
+import com.google.common.collect.ImmutableList;
+import com.linkedin.datahub.upgrade.UpgradeStep;
+import com.linkedin.datahub.upgrade.system.NonBlockingSystemUpgrade;
+import com.linkedin.metadata.entity.AspectDao;
+import com.linkedin.metadata.entity.EntityService;
+import io.datahubproject.metadata.context.OperationContext;
+import java.util.List;
+import javax.annotation.Nonnull;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * A {@link NonBlockingSystemUpgrade} upgrade job that generates schema fields from schema metadata.
+ */
+@Slf4j
+public class GenerateSchemaFieldsFromSchemaMetadata implements NonBlockingSystemUpgrade {
+
+  private final List<UpgradeStep> _steps;
+
+  public GenerateSchemaFieldsFromSchemaMetadata(
+      @Nonnull OperationContext opContext,
+      EntityService<?> entityService,
+      AspectDao aspectDao,
+      boolean enabled,
+      Integer batchSize,
+      Integer batchDelayMs,
+      Integer limit) {
+    if (enabled) {
+      _steps =
+          ImmutableList.of(
+              new GenerateSchemaFieldsFromSchemaMetadataStep(
+                  opContext, entityService, aspectDao, batchSize, batchDelayMs, limit));
+    } else {
+      _steps = ImmutableList.of();
+    }
+  }
+
+  @Override
+  public String id() {
+    return this.getClass().getName();
+  }
+
+  @Override
+  public List<UpgradeStep> steps() {
+    return _steps;
+  }
+}
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/schemafield/GenerateSchemaFieldsFromSchemaMetadataStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/schemafield/GenerateSchemaFieldsFromSchemaMetadataStep.java
new file mode 100644
index 00000000000000..eece83f4ab713e
--- /dev/null
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/schemafield/GenerateSchemaFieldsFromSchemaMetadataStep.java
@@ -0,0 +1,256 @@
+package com.linkedin.datahub.upgrade.system.schemafield;
+
+import static com.linkedin.metadata.Constants.APP_SOURCE;
+import static com.linkedin.metadata.Constants.DATASET_ENTITY_NAME;
+import static com.linkedin.metadata.Constants.SCHEMA_METADATA_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.STATUS_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.SYSTEM_UPDATE_SOURCE;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.data.template.StringMap;
+import com.linkedin.datahub.upgrade.UpgradeContext;
+import com.linkedin.datahub.upgrade.UpgradeStep;
+import com.linkedin.datahub.upgrade.UpgradeStepResult;
+import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.aspect.ReadItem;
+import com.linkedin.metadata.aspect.batch.AspectsBatch;
+import com.linkedin.metadata.boot.BootstrapStep;
+import com.linkedin.metadata.entity.AspectDao;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.entity.EntityUtils;
+import com.linkedin.metadata.entity.ebean.EbeanAspectV2;
+import com.linkedin.metadata.entity.ebean.PartitionedStream;
+import com.linkedin.metadata.entity.ebean.batch.AspectsBatchImpl;
+import com.linkedin.metadata.entity.ebean.batch.ChangeItemImpl;
+import com.linkedin.metadata.entity.restoreindices.RestoreIndicesArgs;
+import com.linkedin.mxe.SystemMetadata;
+import com.linkedin.upgrade.DataHubUpgradeResult;
+import com.linkedin.upgrade.DataHubUpgradeState;
+import io.datahubproject.metadata.context.OperationContext;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * The `GenerateSchemaFieldsFromSchemaMetadataStep` class is an implementation of the `UpgradeStep`
+ * interface. This class is responsible for generating schema fields from schema metadata during an
+ * upgrade process.
+ *
+ * <p>The step performs the following actions: 1. Initializes with provided operation context,
+ * entity service, and aspect DAO. 2. Provides a unique identifier for the upgrade step. 3.
+ * Determines if the upgrade should be skipped based on the environment variable. 4. Executes the
+ * upgrade step which involves streaming aspects in batches, processing them, and updating schema
+ * fields.
+ *
+ * <p>This class utilizes various metadata and entity services to perform its operations, and
+ * includes configuration parameters such as batch size, delay between batches, and limits.
+ *
+ * <p>Environment Variables: - `SKIP_GENERATE_SCHEMA_FIELDS_FROM_SCHEMA_METADATA`: If set to `true`,
+ * the upgrade step is skipped.
+ *
+ * <p>Note: Schema Fields are generated with a status aspect to indicate presence of the field. No
+ * tags, documentation or other aspects are generated. We will write an upgrade to this job to
+ * generate the other aspects in the future (v2).
+ */
+@Slf4j
+public class GenerateSchemaFieldsFromSchemaMetadataStep implements UpgradeStep {
+  private static final String LAST_URN_KEY = "lastUrn";
+  private static final List<String> REQUIRED_ASPECTS =
+      List.of(SCHEMA_METADATA_ASPECT_NAME, STATUS_ASPECT_NAME);
+
+  private final OperationContext opContext;
+  private final EntityService<?> entityService;
+  private final AspectDao aspectDao;
+
+  private final int batchSize;
+  private final int batchDelayMs;
+  private final int limit;
+
+  public GenerateSchemaFieldsFromSchemaMetadataStep(
+      OperationContext opContext,
+      EntityService<?> entityService,
+      AspectDao aspectDao,
+      Integer batchSize,
+      Integer batchDelayMs,
+      Integer limit) {
+    this.opContext = opContext;
+    this.entityService = entityService;
+    this.aspectDao = aspectDao;
+    this.batchSize = batchSize;
+    this.batchDelayMs = batchDelayMs;
+    this.limit = limit;
+    log.info("GenerateSchemaFieldsFromSchemaMetadataStep initialized");
+  }
+
+  @Override
+  public String id() {
+    return "schema-field-from-schema-metadata-v1";
+  }
+
+  @VisibleForTesting
+  @Nullable
+  public String getUrnLike() {
+    return "urn:li:" + DATASET_ENTITY_NAME + ":%";
+  }
+
+  /**
+   * Returns whether the upgrade should be skipped. Uses previous run history or the environment
+   * variable SKIP_GENERATE_SCHEMA_FIELDS_FROM_SCHEMA_METADATA to determine whether to skip.
+   */
+  public boolean skip(UpgradeContext context) {
+    if (Boolean.parseBoolean(System.getenv("SKIP_GENERATE_SCHEMA_FIELDS_FROM_SCHEMA_METADATA"))) {
+      log.info(
+          "Environment variable SKIP_GENERATE_SCHEMA_FIELDS_FROM_SCHEMA_METADATA is set to true. Skipping.");
+      return true;
+    }
+
+    Optional<DataHubUpgradeResult> prevResult =
+        context.upgrade().getUpgradeResult(opContext, getUpgradeIdUrn(), entityService);
+
+    return prevResult
+        .filter(
+            result ->
+                DataHubUpgradeState.SUCCEEDED.equals(result.getState())
+                    || DataHubUpgradeState.ABORTED.equals(result.getState()))
+        .isPresent();
+  }
+
+  protected Urn getUpgradeIdUrn() {
+    return BootstrapStep.getUpgradeUrn(id());
+  }
+
+  @Override
+  public Function<UpgradeContext, UpgradeStepResult> executable() {
+    log.info("Starting GenerateSchemaFieldsFromSchemaMetadataStep");
+    return (context) -> {
+      // Resume state
+      Optional<DataHubUpgradeResult> prevResult =
+          context.upgrade().getUpgradeResult(opContext, getUpgradeIdUrn(), entityService);
+      String resumeUrn =
+          prevResult
+              .filter(
+                  result ->
+                      DataHubUpgradeState.IN_PROGRESS.equals(result.getState())
+                          && result.getResult() != null
+                          && result.getResult().containsKey(LAST_URN_KEY))
+              .map(result -> result.getResult().get(LAST_URN_KEY))
+              .orElse(null);
+      if (resumeUrn != null) {
+        log.info("{}: Resuming from URN: {}", getUpgradeIdUrn(), resumeUrn);
+      }
+
+      // re-using for configuring the sql scan
+      RestoreIndicesArgs args =
+          new RestoreIndicesArgs()
+              .aspectNames(REQUIRED_ASPECTS)
+              .batchSize(batchSize)
+              .lastUrn(resumeUrn)
+              .urnBasedPagination(resumeUrn != null)
+              .limit(limit);
+
+      if (getUrnLike() != null) {
+        args = args.urnLike(getUrnLike());
+      }
+
+      try (PartitionedStream<EbeanAspectV2> stream = aspectDao.streamAspectBatches(args)) {
+        stream
+            .partition(args.batchSize)
+            .forEach(
+                batch -> {
+                  log.info("Processing batch of size {}.", batchSize);
+
+                  AspectsBatch aspectsBatch =
+                      AspectsBatchImpl.builder()
+                          .retrieverContext(opContext.getRetrieverContext().get())
+                          .items(
+                              batch
+                                  .flatMap(
+                                      ebeanAspectV2 ->
+                                          EntityUtils.toSystemAspectFromEbeanAspects(
+                                              opContext.getRetrieverContext().get(),
+                                              Set.of(ebeanAspectV2))
+                                              .stream())
+                                  .map(
+                                      systemAspect ->
+                                          ChangeItemImpl.builder()
+                                              .changeType(ChangeType.UPSERT)
+                                              .urn(systemAspect.getUrn())
+                                              .entitySpec(systemAspect.getEntitySpec())
+                                              .aspectName(systemAspect.getAspectName())
+                                              .aspectSpec(systemAspect.getAspectSpec())
+                                              .recordTemplate(systemAspect.getRecordTemplate())
+                                              .auditStamp(systemAspect.getAuditStamp())
+                                              .systemMetadata(
+                                                  withAppSource(systemAspect.getSystemMetadata()))
+                                              .build(
+                                                  opContext
+                                                      .getRetrieverContext()
+                                                      .get()
+                                                      .getAspectRetriever()))
+                                  .collect(Collectors.toList()))
+                          .build();
+
+                  // re-ingest the aspects to trigger side effects
+                  entityService.ingestAspects(opContext, aspectsBatch, true, false);
+
+                  // record progress
+                  Urn lastUrn =
+                      aspectsBatch.getItems().stream()
+                          .reduce((a, b) -> b)
+                          .map(ReadItem::getUrn)
+                          .orElse(null);
+                  if (lastUrn != null) {
+                    log.info("{}: Saving state. Last urn:{}", getUpgradeIdUrn(), lastUrn);
+                    context
+                        .upgrade()
+                        .setUpgradeResult(
+                            opContext,
+                            getUpgradeIdUrn(),
+                            entityService,
+                            DataHubUpgradeState.IN_PROGRESS,
+                            Map.of(LAST_URN_KEY, lastUrn.toString()));
+                  }
+
+                  if (batchDelayMs > 0) {
+                    log.info("Sleeping for {} ms", batchDelayMs);
+                    try {
+                      Thread.sleep(batchDelayMs);
+                    } catch (InterruptedException e) {
+                      throw new RuntimeException(e);
+                    }
+                  }
+                });
+      }
+
+      BootstrapStep.setUpgradeResult(opContext, getUpgradeIdUrn(), entityService);
+      context.report().addLine("State updated: " + getUpgradeIdUrn());
+
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
+    };
+  }
+
+  private static SystemMetadata withAppSource(@Nullable SystemMetadata systemMetadata) {
+    SystemMetadata withAppSourceSystemMetadata = null;
+    try {
+      withAppSourceSystemMetadata =
+          systemMetadata != null
+              ? new SystemMetadata(systemMetadata.copy().data())
+              : new SystemMetadata();
+    } catch (CloneNotSupportedException e) {
+      throw new RuntimeException(e);
+    }
+    StringMap properties = withAppSourceSystemMetadata.getProperties();
+    StringMap map = properties != null ? new StringMap(properties.data()) : new StringMap();
+    map.put(APP_SOURCE, SYSTEM_UPDATE_SOURCE);
+
+    withAppSourceSystemMetadata.setProperties(map);
+    return withAppSourceSystemMetadata;
+  }
+}
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/schemafield/MigrateSchemaFieldDocIds.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/schemafield/MigrateSchemaFieldDocIds.java
new file mode 100644
index 00000000000000..6cfd0d8c032ec1
--- /dev/null
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/schemafield/MigrateSchemaFieldDocIds.java
@@ -0,0 +1,50 @@
+package com.linkedin.datahub.upgrade.system.schemafield;
+
+import com.google.common.collect.ImmutableList;
+import com.linkedin.datahub.upgrade.UpgradeStep;
+import com.linkedin.datahub.upgrade.system.NonBlockingSystemUpgrade;
+import com.linkedin.gms.factory.search.BaseElasticSearchComponentsFactory;
+import com.linkedin.metadata.entity.EntityService;
+import io.datahubproject.metadata.context.OperationContext;
+import java.util.List;
+import javax.annotation.Nonnull;
+import lombok.extern.slf4j.Slf4j;
+
+/** Migrate from URN document ids to hash based ids */
+@Slf4j
+public class MigrateSchemaFieldDocIds implements NonBlockingSystemUpgrade {
+  private final List<UpgradeStep> _steps;
+
+  public MigrateSchemaFieldDocIds(
+      @Nonnull OperationContext opContext,
+      BaseElasticSearchComponentsFactory.BaseElasticSearchComponents elasticSearchComponents,
+      EntityService<?> entityService,
+      boolean enabled,
+      Integer batchSize,
+      Integer batchDelayMs,
+      Integer limit) {
+    if (enabled) {
+      _steps =
+          ImmutableList.of(
+              new MigrateSchemaFieldDocIdsStep(
+                  opContext,
+                  elasticSearchComponents,
+                  entityService,
+                  batchSize,
+                  batchDelayMs,
+                  limit));
+    } else {
+      _steps = ImmutableList.of();
+    }
+  }
+
+  @Override
+  public String id() {
+    return this.getClass().getName();
+  }
+
+  @Override
+  public List<UpgradeStep> steps() {
+    return _steps;
+  }
+}
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/schemafield/MigrateSchemaFieldDocIdsStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/schemafield/MigrateSchemaFieldDocIdsStep.java
new file mode 100644
index 00000000000000..ab35b42bcc8481
--- /dev/null
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/schemafield/MigrateSchemaFieldDocIdsStep.java
@@ -0,0 +1,291 @@
+package com.linkedin.datahub.upgrade.system.schemafield;
+
+import static com.linkedin.metadata.Constants.SCHEMA_FIELD_ENTITY_NAME;
+import static com.linkedin.metadata.utils.GenericRecordUtils.entityResponseToSystemAspectMap;
+
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.datahub.upgrade.UpgradeContext;
+import com.linkedin.datahub.upgrade.UpgradeStep;
+import com.linkedin.datahub.upgrade.UpgradeStepResult;
+import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.gms.factory.search.BaseElasticSearchComponentsFactory;
+import com.linkedin.metadata.aspect.SystemAspect;
+import com.linkedin.metadata.boot.BootstrapStep;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.models.registry.EntityRegistry;
+import com.linkedin.metadata.utils.AuditStampUtils;
+import com.linkedin.upgrade.DataHubUpgradeResult;
+import com.linkedin.upgrade.DataHubUpgradeState;
+import io.datahubproject.metadata.context.OperationContext;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.opensearch.action.bulk.BulkProcessor;
+import org.opensearch.action.bulk.BulkRequest;
+import org.opensearch.action.bulk.BulkResponse;
+import org.opensearch.action.delete.DeleteRequest;
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.search.SearchScrollRequest;
+import org.opensearch.client.RequestOptions;
+import org.opensearch.client.RestHighLevelClient;
+import org.opensearch.common.unit.TimeValue;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.script.Script;
+import org.opensearch.search.Scroll;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.search.sort.SortOrder;
+
+/**
+ * Performs a migration from one document id convention to another.
+ *
+ * <p>This step identifies documents using the old convention, if any, and generates MCLs for
+ * aspects for updating the data in the new document.
+ *
+ * <p>Finally, a DELETE is executed on the legacy document id.
+ */
+@Slf4j
+public class MigrateSchemaFieldDocIdsStep implements UpgradeStep {
+
+  private final OperationContext opContext;
+  private final EntityRegistry entityRegistry;
+  private final RestHighLevelClient elasticsearchClient;
+  private final BulkProcessor bulkProcessor;
+  private final String indexName;
+  private final EntityService<?> entityService;
+  private final Scroll scroll = new Scroll(TimeValue.timeValueMinutes(5L));
+  private final int batchSize;
+  private final int batchDelayMs;
+  private final int limit;
+
+  public MigrateSchemaFieldDocIdsStep(
+      OperationContext opContext,
+      BaseElasticSearchComponentsFactory.BaseElasticSearchComponents elasticSearchComponents,
+      EntityService<?> entityService,
+      int batchSize,
+      int batchDelayMs,
+      int limit) {
+    this.opContext = opContext;
+    this.entityRegistry = opContext.getEntityRegistry();
+    this.elasticsearchClient = elasticSearchComponents.getSearchClient();
+    this.entityService = entityService;
+    this.batchSize = batchSize;
+    this.batchDelayMs = batchDelayMs;
+    this.limit = limit;
+    this.indexName =
+        elasticSearchComponents.getIndexConvention().getEntityIndexName(SCHEMA_FIELD_ENTITY_NAME);
+    this.bulkProcessor = buildBuildProcessor();
+    log.info("MigrateSchemaFieldDocIdsStep initialized");
+  }
+
+  @Override
+  public String id() {
+    return "schema-field-doc-id-v1";
+  }
+
+  /**
+   * Returns whether the upgrade should be skipped. Uses previous run history or the environment
+   * variable SKIP_MIGRATE_SCHEMA_FIELDS_DOC_ID to determine whether to skip.
+   */
+  public boolean skip(UpgradeContext context) {
+    if (Boolean.parseBoolean(System.getenv("SKIP_MIGRATE_SCHEMA_FIELDS_DOC_ID"))) {
+      log.info("Environment variable SKIP_MIGRATE_SCHEMA_FIELDS_DOC_ID is set to true. Skipping.");
+      return true;
+    }
+
+    Optional<DataHubUpgradeResult> prevResult =
+        context.upgrade().getUpgradeResult(opContext, getUpgradeIdUrn(), entityService);
+
+    return prevResult
+        .filter(
+            result ->
+                DataHubUpgradeState.SUCCEEDED.equals(result.getState())
+                    || DataHubUpgradeState.ABORTED.equals(result.getState()))
+        .isPresent();
+  }
+
+  protected Urn getUpgradeIdUrn() {
+    return BootstrapStep.getUpgradeUrn(id());
+  }
+
+  @Override
+  public Function<UpgradeContext, UpgradeStepResult> executable() {
+    return (context) -> {
+      final SearchRequest searchRequest = buildSearchRequest();
+      String scrollId = null;
+      int migratedCount = 0;
+
+      try {
+        do {
+          log.info(
+              "Upgrading batch of schemaFields {}-{}", migratedCount, migratedCount + batchSize);
+          scrollId = updateDocId(searchRequest, scrollId);
+          migratedCount += batchSize;
+
+          if (limit > 0 && migratedCount >= limit) {
+            log.info("Exiting early due to limit.");
+            break;
+          }
+
+          if (batchDelayMs > 0) {
+            log.info("Sleeping for {} ms", batchDelayMs);
+            try {
+              Thread.sleep(batchDelayMs);
+            } catch (InterruptedException e) {
+              throw new RuntimeException(e);
+            }
+          }
+        } while (scrollId != null);
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      } finally {
+        bulkProcessor.flush();
+      }
+
+      BootstrapStep.setUpgradeResult(context.opContext(), getUpgradeIdUrn(), entityService);
+
+      return new DefaultUpgradeStepResult(id(), DataHubUpgradeState.SUCCEEDED);
+    };
+  }
+
+  private BulkProcessor buildBuildProcessor() {
+    return BulkProcessor.builder(
+            (request, bulkListener) ->
+                elasticsearchClient.bulkAsync(request, RequestOptions.DEFAULT, bulkListener),
+            new BulkProcessor.Listener() {
+              @Override
+              public void beforeBulk(long executionId, BulkRequest request) {
+                log.debug("Deleting {} legacy schemaField documents", request.numberOfActions());
+              }
+
+              @Override
+              public void afterBulk(long executionId, BulkRequest request, BulkResponse response) {
+                log.debug(
+                    "Delete executed {} failures", response.hasFailures() ? "with" : "without");
+              }
+
+              @Override
+              public void afterBulk(long executionId, BulkRequest request, Throwable failure) {
+                log.warn("Error while executing legacy schemaField documents", failure);
+              }
+            })
+        .setBulkActions(batchSize)
+        .build();
+  }
+
+  private SearchRequest buildSearchRequest() {
+    Script oldDocumentIdQuery =
+        new Script(
+            Script.DEFAULT_SCRIPT_TYPE,
+            "painless",
+            "doc['_id'][0].indexOf('urn%3Ali%3AschemaField%3A%28urn%3Ali%3Adataset%3A') > -1",
+            Map.of());
+    QueryBuilder queryBuilder = QueryBuilders.scriptQuery(oldDocumentIdQuery);
+
+    SearchRequest searchRequest = new SearchRequest(indexName);
+    searchRequest.scroll(scroll);
+    SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+    searchSourceBuilder.query(queryBuilder);
+    searchSourceBuilder.size(batchSize);
+    searchSourceBuilder.sort("urn", SortOrder.ASC);
+    searchRequest.source(searchSourceBuilder);
+
+    return searchRequest;
+  }
+
+  private String updateDocId(final SearchRequest searchRequest, final String scrollId)
+      throws IOException, URISyntaxException {
+    final SearchResponse searchResponse;
+
+    if (scrollId == null) {
+      searchResponse = elasticsearchClient.search(searchRequest, RequestOptions.DEFAULT);
+    } else {
+      SearchScrollRequest scrollRequest = new SearchScrollRequest(scrollId);
+      scrollRequest.scroll(scroll);
+      searchResponse = elasticsearchClient.scroll(scrollRequest, RequestOptions.DEFAULT);
+    }
+
+    final SearchHit[] searchHits = searchResponse.getHits().getHits();
+    final String nextScrollId = searchResponse.getScrollId();
+
+    if (searchHits.length > 0) {
+      Set<String> documentIds =
+          Arrays.stream(searchHits).map(SearchHit::getId).collect(Collectors.toSet());
+      Set<Urn> batchUrns =
+          Arrays.stream(searchHits)
+              .map(hit -> hit.getSourceAsMap().get("urn").toString())
+              .map(UrnUtils::getUrn)
+              .collect(Collectors.toSet());
+
+      log.info("Sending MCLs for {} entities", batchUrns.size());
+      emitMCLs(batchUrns);
+      log.info("Removing old document ids for {} documents", documentIds.size());
+      deleteDocumentIds(documentIds);
+
+      return nextScrollId;
+    }
+
+    return null;
+  }
+
+  private void emitMCLs(Set<Urn> batchUrns) throws URISyntaxException {
+    Set<SystemAspect> batchAspects =
+        entityResponseToSystemAspectMap(
+                entityService.getEntitiesV2(
+                    opContext,
+                    SCHEMA_FIELD_ENTITY_NAME,
+                    batchUrns,
+                    opContext.getEntityAspectNames(SCHEMA_FIELD_ENTITY_NAME),
+                    false),
+                entityRegistry)
+            .values()
+            .stream()
+            .flatMap(m -> m.values().stream())
+            .collect(Collectors.toSet());
+
+    Set<Future<?>> futures =
+        batchAspects.stream()
+            .map(
+                systemAspect ->
+                    entityService
+                        .alwaysProduceMCLAsync(
+                            opContext,
+                            systemAspect.getUrn(),
+                            systemAspect.getUrn().getEntityType(),
+                            systemAspect.getAspectName(),
+                            systemAspect.getAspectSpec(),
+                            null,
+                            systemAspect.getRecordTemplate(),
+                            null,
+                            systemAspect.getSystemMetadata(),
+                            AuditStampUtils.createDefaultAuditStamp(),
+                            ChangeType.UPSERT)
+                        .getFirst())
+            .collect(Collectors.toSet());
+
+    futures.forEach(
+        f -> {
+          try {
+            f.get();
+          } catch (InterruptedException | ExecutionException e) {
+            throw new RuntimeException(e);
+          }
+        });
+  }
+
+  private void deleteDocumentIds(Set<String> documentIds) {
+    documentIds.forEach(docId -> bulkProcessor.add(new DeleteRequest(indexName, docId)));
+  }
+}
diff --git a/datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/DatahubUpgradeNoSchemaRegistryTest.java b/datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/DatahubUpgradeNoSchemaRegistryTest.java
index 8c9b72b0d88e5e..68dfd71ac10044 100644
--- a/datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/DatahubUpgradeNoSchemaRegistryTest.java
+++ b/datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/DatahubUpgradeNoSchemaRegistryTest.java
@@ -7,12 +7,13 @@
 import static org.testng.Assert.assertNotNull;
 
 import com.linkedin.datahub.upgrade.system.SystemUpdate;
-import com.linkedin.gms.factory.kafka.schemaregistry.SchemaRegistryConfig;
 import com.linkedin.metadata.boot.kafka.MockSystemUpdateDeserializer;
 import com.linkedin.metadata.boot.kafka.MockSystemUpdateSerializer;
+import com.linkedin.metadata.config.kafka.KafkaConfiguration;
 import com.linkedin.metadata.dao.producer.KafkaEventProducer;
 import com.linkedin.metadata.entity.EntityServiceImpl;
 import com.linkedin.mxe.Topics;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
 import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
 import io.datahubproject.metadata.context.OperationContext;
@@ -54,7 +55,7 @@ public class DatahubUpgradeNoSchemaRegistryTest extends AbstractTestNGSpringCont
 
   @Autowired
   @Named("schemaRegistryConfig")
-  private SchemaRegistryConfig schemaRegistryConfig;
+  private KafkaConfiguration.SerDeKeyValueConfig schemaRegistryConfig;
 
   @Test
   public void testSystemUpdateInit() {
@@ -63,13 +64,17 @@ public void testSystemUpdateInit() {
 
   @Test
   public void testSystemUpdateKafkaProducerOverride() throws RestClientException, IOException {
-    assertEquals(schemaRegistryConfig.getDeserializer(), MockSystemUpdateDeserializer.class);
-    assertEquals(schemaRegistryConfig.getSerializer(), MockSystemUpdateSerializer.class);
+    assertEquals(
+        schemaRegistryConfig.getValue().getDeserializer(),
+        MockSystemUpdateDeserializer.class.getName());
+    assertEquals(
+        schemaRegistryConfig.getValue().getSerializer(),
+        MockSystemUpdateSerializer.class.getName());
     assertEquals(kafkaEventProducer, duheKafkaEventProducer);
     assertEquals(entityService.getProducer(), duheKafkaEventProducer);
 
     MockSystemUpdateSerializer serializer = new MockSystemUpdateSerializer();
-    serializer.configure(schemaRegistryConfig.getProperties(), false);
+    serializer.configure(schemaRegistryConfig.getProperties(null), false);
     SchemaRegistryClient registry = serializer.getSchemaRegistryClient();
     assertEquals(
         registry.getId(
@@ -79,7 +84,7 @@ public void testSystemUpdateKafkaProducerOverride() throws RestClientException,
 
   @Test
   public void testSystemUpdateSend() {
-    UpgradeStepResult.Result result =
+    DataHubUpgradeState result =
         systemUpdate.steps().stream()
             .filter(s -> s.id().equals("DataHubStartupStep"))
             .findFirst()
diff --git a/datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/DatahubUpgradeNonBlockingTest.java b/datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/DatahubUpgradeNonBlockingTest.java
index 154b1de71f46cd..55a52f072a0caf 100644
--- a/datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/DatahubUpgradeNonBlockingTest.java
+++ b/datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/DatahubUpgradeNonBlockingTest.java
@@ -10,9 +10,9 @@
 import com.linkedin.datahub.upgrade.impl.DefaultUpgradeManager;
 import com.linkedin.datahub.upgrade.system.SystemUpdateNonBlocking;
 import com.linkedin.datahub.upgrade.system.vianodes.ReindexDataJobViaNodesCLL;
-import com.linkedin.gms.factory.kafka.schemaregistry.SchemaRegistryConfig;
 import com.linkedin.metadata.boot.kafka.MockSystemUpdateDeserializer;
 import com.linkedin.metadata.boot.kafka.MockSystemUpdateSerializer;
+import com.linkedin.metadata.config.kafka.KafkaConfiguration;
 import com.linkedin.metadata.dao.producer.KafkaEventProducer;
 import com.linkedin.metadata.entity.AspectDao;
 import com.linkedin.metadata.entity.EntityService;
@@ -47,7 +47,7 @@ public class DatahubUpgradeNonBlockingTest extends AbstractTestNGSpringContextTe
 
   @Autowired
   @Named("schemaRegistryConfig")
-  private SchemaRegistryConfig schemaRegistryConfig;
+  private KafkaConfiguration.SerDeKeyValueConfig schemaRegistryConfig;
 
   @Autowired
   @Named("duheKafkaEventProducer")
@@ -66,8 +66,12 @@ public void testSystemUpdateNonBlockingInit() {
     assertNotNull(systemUpdateNonBlocking);
 
     // Expected system update configuration and producer
-    assertEquals(schemaRegistryConfig.getDeserializer(), MockSystemUpdateDeserializer.class);
-    assertEquals(schemaRegistryConfig.getSerializer(), MockSystemUpdateSerializer.class);
+    assertEquals(
+        schemaRegistryConfig.getValue().getDeserializer(),
+        MockSystemUpdateDeserializer.class.getName());
+    assertEquals(
+        schemaRegistryConfig.getValue().getSerializer(),
+        MockSystemUpdateSerializer.class.getName());
     assertEquals(duheKafkaEventProducer, kafkaEventProducer);
     assertEquals(entityService.getProducer(), duheKafkaEventProducer);
   }
diff --git a/datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/schemafield/GenerateSchemaFieldsFromSchemaMetadataStepTest.java b/datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/schemafield/GenerateSchemaFieldsFromSchemaMetadataStepTest.java
new file mode 100644
index 00000000000000..3a2728b4e1d3d6
--- /dev/null
+++ b/datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/schemafield/GenerateSchemaFieldsFromSchemaMetadataStepTest.java
@@ -0,0 +1,110 @@
+package com.linkedin.datahub.upgrade.schemafield;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.linkedin.datahub.upgrade.UpgradeContext;
+import com.linkedin.datahub.upgrade.UpgradeStepResult;
+import com.linkedin.datahub.upgrade.system.schemafield.GenerateSchemaFieldsFromSchemaMetadataStep;
+import com.linkedin.metadata.aspect.SystemAspect;
+import com.linkedin.metadata.entity.AspectDao;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.entity.ebean.EbeanAspectV2;
+import com.linkedin.metadata.entity.ebean.PartitionedStream;
+import com.linkedin.metadata.entity.restoreindices.RestoreIndicesArgs;
+import com.linkedin.schema.SchemaMetadata;
+import com.linkedin.upgrade.DataHubUpgradeState;
+import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.metadata.context.RetrieverContext;
+import java.util.Optional;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class GenerateSchemaFieldsFromSchemaMetadataStepTest {
+
+  @Mock private OperationContext mockOpContext;
+
+  @Mock private EntityService<?> mockEntityService;
+
+  @Mock private AspectDao mockAspectDao;
+
+  @Mock private RetrieverContext mockRetrieverContext;
+
+  private GenerateSchemaFieldsFromSchemaMetadataStep step;
+
+  @BeforeEach
+  public void setup() {
+    MockitoAnnotations.openMocks(this);
+    step =
+        new GenerateSchemaFieldsFromSchemaMetadataStep(
+            mockOpContext, mockEntityService, mockAspectDao, 10, 100, 1000);
+    when(mockOpContext.getRetrieverContext()).thenReturn(Optional.of(mockRetrieverContext));
+  }
+
+  /** Test to verify the correct step ID is returned. */
+  @Test
+  public void testId() {
+    assertEquals("schema-field-from-schema-metadata-v1", step.id());
+  }
+
+  /** Test to verify the skip logic based on the environment variable. */
+  @Test
+  public void testSkip() {
+    UpgradeContext mockContext = mock(UpgradeContext.class);
+    System.setProperty("SKIP_GENERATE_SCHEMA_FIELDS_FROM_SCHEMA_METADATA", "true");
+    assertTrue(step.skip(mockContext));
+
+    System.setProperty("SKIP_GENERATE_SCHEMA_FIELDS_FROM_SCHEMA_METADATA", "false");
+    assertFalse(step.skip(mockContext));
+  }
+
+  /** Test to verify the correct URN pattern is returned. */
+  @Test
+  public void testGetUrnLike() {
+    assertEquals("urn:li:dataset:%", step.getUrnLike());
+  }
+
+  /**
+   * Test to verify the executable function processes batches correctly and returns a success
+   * result.
+   */
+  @Test
+  public void testExecutable() {
+    UpgradeContext mockContext = mock(UpgradeContext.class);
+
+    EbeanAspectV2 mockAspect = mock(EbeanAspectV2.class);
+    PartitionedStream<EbeanAspectV2> mockStream = mock(PartitionedStream.class);
+    when(mockAspectDao.streamAspectBatches(any(RestoreIndicesArgs.class))).thenReturn(mockStream);
+
+    when(mockStream.partition(anyInt())).thenReturn(Stream.of(Stream.of(mockAspect)));
+
+    SystemAspect mockSystemAspect = mock(SystemAspect.class);
+    when(mockSystemAspect.getAspectName()).thenReturn("schemaMetadata");
+    when(mockSystemAspect.getAspect(SchemaMetadata.class)).thenReturn(new SchemaMetadata());
+
+    // when(mockRetrieverContext.getAspectRetriever()).thenReturn(mockSystemAspect);
+
+    ArgumentCaptor<RestoreIndicesArgs> argsCaptor =
+        ArgumentCaptor.forClass(RestoreIndicesArgs.class);
+
+    UpgradeStepResult result = step.executable().apply(mockContext);
+    assertEquals(DataHubUpgradeState.SUCCEEDED, result.result());
+
+    verify(mockAspectDao).streamAspectBatches(argsCaptor.capture());
+    assertEquals("schemaMetadata", argsCaptor.getValue().aspectName());
+    assertEquals(10, argsCaptor.getValue().batchSize());
+    assertEquals(1000, argsCaptor.getValue().limit());
+  }
+
+  // Additional tests can be added to cover more scenarios and edge cases
+}
diff --git a/datahub-web-react/.eslintrc.js b/datahub-web-react/.eslintrc.js
index 5627283af1af1c..3fdf7b6a3042ca 100644
--- a/datahub-web-react/.eslintrc.js
+++ b/datahub-web-react/.eslintrc.js
@@ -48,7 +48,7 @@ module.exports = {
         ],
         'vitest/prefer-to-be': 'off',
         '@typescript-eslint/no-use-before-define': ['error', { functions: false, classes: false }],
-        'react-refresh/only-export-components': ['warn', { 'allowConstantExport': true }],
+        'react-refresh/only-export-components': ['warn', { allowConstantExport: true }],
     },
     settings: {
         react: {
diff --git a/datahub-web-react/README.md b/datahub-web-react/README.md
index 560f5315b2c71f..86bbb349b027c4 100644
--- a/datahub-web-react/README.md
+++ b/datahub-web-react/README.md
@@ -1,44 +1,47 @@
 ---
-title: "datahub-web-react"
+title: 'datahub-web-react'
 ---
 
 # DataHub React App
 
 ## About
-This module contains a React application that serves as the DataHub UI.
 
-Feel free to take a look around, deploy, and contribute. 
+This module contains a React application that serves as the DataHub UI.
 
+Feel free to take a look around, deploy, and contribute.
 
 ## Functional Goals
+
 The initial milestone for the app was to achieve functional parity with the previous Ember app. This meant supporting
 
-- Dataset Profiles, Search, Browse Experience
-- User Profiles, Search
-- LDAP Authentication Flow
+-   Dataset Profiles, Search, Browse Experience
+-   User Profiles, Search
+-   LDAP Authentication Flow
 
-This has since been achieved. The new set of functional goals are reflected in the latest version of the [DataHub Roadmap](../docs/roadmap.md). 
+This has since been achieved. The new set of functional goals are reflected in the latest version of the [DataHub Roadmap](../docs/roadmap.md).
 
 ## Design Goals
+
 In building out the client experience, we intend to leverage learnings from the previous Ember-based app and incorporate feedback gathered
 from organizations operating DataHub. Two themes have emerged to serve as guideposts:
 
-1. **Configurability**: The client experience should be configurable, such that deploying organizations can tailor certain 
-   aspects to their needs. This includes theme / styling configurability, showing and hiding specific functionality, 
-   customizing copy & logos, etc. 
-   
-2. **Extensibility**: Extending the *functionality* of DataHub should be as simple as possible. Making changes like 
-   extending an existing entity & adding a new entity should require minimal effort and should be well covered in detailed 
-   documentation. 
+1. **Configurability**: The client experience should be configurable, such that deploying organizations can tailor certain
+   aspects to their needs. This includes theme / styling configurability, showing and hiding specific functionality,
+   customizing copy & logos, etc.
+2. **Extensibility**: Extending the _functionality_ of DataHub should be as simple as possible. Making changes like
+   extending an existing entity & adding a new entity should require minimal effort and should be well covered in detailed
+   documentation.
 
 ## Starting the Application
 
 ### Quick Start
 
 Navigate to the `docker` directory and run the following to spin up the react app:
+
 ```
 ./quickstart.sh
 ```
+
 at `http://localhost:9002`.
 
 If you want to make changes to the UI see them live without having to rebuild the `datahub-frontend-react` docker image, you
@@ -54,8 +57,9 @@ Optionally you could also start the app with the mock server without running the
 ### Testing your customizations
 
 There is two options to test your customizations:
-* **Option 1**: Initialize the docker containers with the `quickstart.sh` script (or if any custom docker-compose file) and then run `yarn start` in this directory. This will start a forwarding server at `localhost:3000` that will use the `datahub-frontend` server at `http://localhost:9002` to fetch real data.
-* **Option 2**: Change the environment variable `REACT_APP_PROXY_TARGET` in the `.env` file to point to your `datahub-frontend` server (ex: https://my_datahub_host.com) and then run `yarn start` in this directory. This will start a forwarding server at `localhost:3000` that will use the `datahub-frontend` server at some domain to fetch real data.
+
+-   **Option 1**: Initialize the docker containers with the `quickstart.sh` script (or if any custom docker-compose file) and then run `yarn start` in this directory. This will start a forwarding server at `localhost:3000` that will use the `datahub-frontend` server at `http://localhost:9002` to fetch real data.
+-   **Option 2**: Change the environment variable `REACT_APP_PROXY_TARGET` in the `.env` file to point to your `datahub-frontend` server (ex: https://my_datahub_host.com) and then run `yarn start` in this directory. This will start a forwarding server at `localhost:3000` that will use the `datahub-frontend` server at some domain to fetch real data.
 
 The option 2 is useful if you want to test your React customizations without having to run the hole DataHub stack locally. However, if you changed other components of the DataHub stack, you will need to run the hole stack locally (building the docker images) and use the option 1.
 
@@ -68,10 +72,10 @@ In order to start a server and run frontend unit tests using react-testing-frame
 There are also more automated tests using Cypress in the `smoke-test` folder of the repository root.
 
 #### Troubleshooting
+
 `Error: error:0308010C:digital envelope routines::unsupported`: This error message shows up when using Node 17, due to an OpenSSL update related to md5.  
 The best workaround is to revert to the Active LTS version of Node, 16.13.0 with the command `nvm install 16.13.0` and if necessary reinstall yarn `npm install --global yarn`.
 
-
 ### Theming
 
 #### Customizing your App without rebuilding assets
@@ -108,74 +112,74 @@ you to terminate and re-run `yarn start` to see updated styles.
 
 The `src` dir of the app is broken down into the following modules
 
-**conf** - Stores global configuration flags that can be referenced across the app. For example, the number of 
+**conf** - Stores global configuration flags that can be referenced across the app. For example, the number of
 search results shown per page, or the placeholder text in the search bar box. It serves as a location where levels
-for functional configurability should reside. 
+for functional configurability should reside.
 
 **app** - Contains all important components of the app. It has a few sub-modules:
 
-- `auth`: Components used to render the user authentication experience. 
-- `browse`: Shared components used to render the 'browse-by-path' experience. The experience is akin to navigating a filesystem hierarchy.
-- `preview`: Shared components used to render Entity 'preview' views. These can appear in search results, browse results,
-  and within entity profile pages. 
-- `search`: Shared components used to render the full-text search experience. 
-- `shared`: Misc. shared components
-- `entity`: Contains Entity definitions, where entity-specific functionality resides.
-  Configuration is provided by implementing the 'Entity' interface. (See DatasetEntity.tsx for example) 
-  There are 2 visual components each entity should supply:
-    - `profiles`: display relevant details about an individual entity. This serves as the entity's 'profile'.
-    - `previews`: provide a 'preview', or a smaller details card, containing the most important information about an entity instance.
-        
-        When rendering a preview, the entity's data and the type of preview (SEARCH, BROWSE, PREVIEW) are provided. This 
+-   `auth`: Components used to render the user authentication experience.
+-   `browse`: Shared components used to render the 'browse-by-path' experience. The experience is akin to navigating a filesystem hierarchy.
+-   `preview`: Shared components used to render Entity 'preview' views. These can appear in search results, browse results,
+    and within entity profile pages.
+-   `search`: Shared components used to render the full-text search experience.
+-   `shared`: Misc. shared components
+-   `entity`: Contains Entity definitions, where entity-specific functionality resides.
+    Configuration is provided by implementing the 'Entity' interface. (See DatasetEntity.tsx for example)
+    There are 2 visual components each entity should supply:
+
+    -   `profiles`: display relevant details about an individual entity. This serves as the entity's 'profile'.
+    -   `previews`: provide a 'preview', or a smaller details card, containing the most important information about an entity instance.
+
+        When rendering a preview, the entity's data and the type of preview (SEARCH, BROWSE, PREVIEW) are provided. This
         allows you to optionally customize the way an entities preview is rendered in different views.
-  
-    - `entity registry`: There's another very important piece of code living within this module: the **EntityRegistry**. This is a layer 
+
+    -   `entity registry`: There's another very important piece of code living within this module: the **EntityRegistry**. This is a layer
         of abstraction over the intimate details of rendering a particular entity. It is used
         to render a view associated with a particular entity type (user, dataset, etc.).
-  
-    
+
 <p align="center">
   <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/entity-registry.png"/>
 </p>
 
-**graphql** - The React App talks to the `dathub-frontend` server using GraphQL. This module is where the *queries* issued
-against the server are defined. Once defined, running `yarn run generate` will code-gen TypeScript objects to make invoking 
+**graphql** - The React App talks to the `dathub-frontend` server using GraphQL. This module is where the _queries_ issued
+against the server are defined. Once defined, running `yarn run generate` will code-gen TypeScript objects to make invoking
 these queries extremely easy. An example can be found at the top of `SearchPage.tsx.`
 
-**images** - Images to be displayed within the app. This is where one would place a custom logo image. 
+**images** - Images to be displayed within the app. This is where one would place a custom logo image.
 
 ## Adding an Entity
 
 The following outlines a series of steps required to introduce a new entity into the React app:
 
-1. Declare the GraphQL Queries required to display the new entity 
-   - If search functionality should be supported, extend the "search" query within `search.graphql` to fetch the new 
+1. Declare the GraphQL Queries required to display the new entity
+
+    - If search functionality should be supported, extend the "search" query within `search.graphql` to fetch the new
+      entity data.
+    - If browse functionality should be supported, extend the "browse" query within `browse.graphql` to fetch the new
       entity data.
-   - If browse functionality should be supported, extend the "browse" query within `browse.graphql` to fetch the new 
-      entity data. 
-   - If display a 'profile' should be supported (most often), introduce a new `<entity-name>.graphql` file that contains a 
-    `get` query to fetch the entity by primary key (urn). 
-     
-    Note that your new entity *must* implement the `Entity` GraphQL type interface, and thus must have a corresponding
-     `EntityType`.
-   
-
-2. Implement the `Entity` interface 
+    - If display a 'profile' should be supported (most often), introduce a new `<entity-name>.graphql` file that contains a
+      `get` query to fetch the entity by primary key (urn).
+
+    Note that your new entity _must_ implement the `Entity` GraphQL type interface, and thus must have a corresponding
+    `EntityType`.
+
+2. Implement the `Entity` interface
+
     - Create a new folder under `src/components/entity` corresponding to your entity
     - Create a class that implements the `Entity` interface (example: `DatasetEntity.tsx`)
-    - Provide an implementation each method defined on the interface. 
-        - This class specifies whether your new entity should be searchable & browsable, defines the names used to 
-          identify your entity when instances are rendered in collection / when entity appears 
-          in the URL path, and provides the ability to render your entity given data returned by the GQL API. 
-          
+    - Provide an implementation each method defined on the interface.
+        - This class specifies whether your new entity should be searchable & browsable, defines the names used to
+          identify your entity when instances are rendered in collection / when entity appears
+          in the URL path, and provides the ability to render your entity given data returned by the GQL API.
 
 3. Register the new entity in the `EntityRegistry`
-    - Update `App.tsx` to register an instance of your new entity. Now your entity will be accessible via the registry 
+    - Update `App.tsx` to register an instance of your new entity. Now your entity will be accessible via the registry
       and appear in the UI. To manually retrieve the info about your entity or others, simply use an instance
-      of the `EntityRegistry`, which is provided via `ReactContext` to *all* components in the hierarchy. 
+      of the `EntityRegistry`, which is provided via `ReactContext` to _all_ components in the hierarchy.
       For example
-      ```
-      entityRegistry.getCollectionName(EntityType.YOUR_NEW_ENTITY)
-      ```
-    
-That's it! For any questions, do not hesitate to reach out on the DataHub Slack community in #datahub-react. 
+        ```
+        entityRegistry.getCollectionName(EntityType.YOUR_NEW_ENTITY)
+        ```
+
+That's it! For any questions, do not hesitate to reach out on the DataHub Slack community in #datahub-react.
diff --git a/datahub-web-react/src/App.tsx b/datahub-web-react/src/App.tsx
index 5be31528fe780f..2fdd7c8ed68004 100644
--- a/datahub-web-react/src/App.tsx
+++ b/datahub-web-react/src/App.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import Cookies from 'js-cookie';
-import { message } from 'antd';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { ApolloClient, ApolloProvider, createHttpLink, InMemoryCache, ServerError } from '@apollo/client';
 import { onError } from '@apollo/client/link/error';
@@ -21,7 +20,7 @@ import { useCustomTheme } from './customThemeContext';
 const httpLink = createHttpLink({ uri: '/api/v2/graphql' });
 
 const errorLink = onError((error) => {
-    const { networkError, graphQLErrors } = error;
+    const { networkError } = error;
     if (networkError) {
         const serverError = networkError as ServerError;
         if (serverError.statusCode === ErrorCodes.Unauthorized) {
@@ -31,13 +30,14 @@ const errorLink = onError((error) => {
             window.location.replace(`${PageRoutes.AUTHENTICATE}?redirect_uri=${encodeURIComponent(currentPath)}`);
         }
     }
-    if (graphQLErrors && graphQLErrors.length) {
-        const firstError = graphQLErrors[0];
-        const { extensions } = firstError;
-        const errorCode = extensions && (extensions.code as number);
-        // Fallback in case the calling component does not handle.
-        message.error(`${firstError.message} (code ${errorCode})`, 3);
-    }
+    // Disabled behavior for now -> Components are expected to handle their errors.
+    // if (graphQLErrors && graphQLErrors.length) {
+    //     const firstError = graphQLErrors[0];
+    //     const { extensions } = firstError;
+    //     const errorCode = extensions && (extensions.code as number);
+    //     // Fallback in case the calling component does not handle.
+    //     message.error(`${firstError.message} (code ${errorCode})`, 3); // TODO: Decide if we want this back.
+    // }
 });
 
 const client = new ApolloClient({
diff --git a/datahub-web-react/src/app/ProtectedRoutes.tsx b/datahub-web-react/src/app/ProtectedRoutes.tsx
index 0e4a1a260f5532..d975e6d4d99c2d 100644
--- a/datahub-web-react/src/app/ProtectedRoutes.tsx
+++ b/datahub-web-react/src/app/ProtectedRoutes.tsx
@@ -1,15 +1,26 @@
-import React from 'react';
-import { Switch, Route } from 'react-router-dom';
+import React, { useEffect } from 'react';
+import { Switch, Route, useLocation, useHistory } from 'react-router-dom';
 import { Layout } from 'antd';
 import { HomePage } from './home/HomePage';
 import { SearchRoutes } from './SearchRoutes';
 import EmbedRoutes from './EmbedRoutes';
-import { PageRoutes } from '../conf/Global';
+import { NEW_ROUTE_MAP, PageRoutes } from '../conf/Global';
+import { getRedirectUrl } from '../conf/utils';
 
 /**
  * Container for all views behind an authentication wall.
  */
 export const ProtectedRoutes = (): JSX.Element => {
+    const location = useLocation();
+    const history = useHistory();
+
+    useEffect(() => {
+        if (location.pathname.indexOf('/Validation') !== -1) {
+            history.replace(getRedirectUrl(NEW_ROUTE_MAP));
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [location]);
+
     return (
         <Layout>
             <Switch>
diff --git a/datahub-web-react/src/app/analytics/event.ts b/datahub-web-react/src/app/analytics/event.ts
index d63b731c720426..c3a57830b8c504 100644
--- a/datahub-web-react/src/app/analytics/event.ts
+++ b/datahub-web-react/src/app/analytics/event.ts
@@ -191,6 +191,7 @@ export interface SearchResultClickEvent extends BaseEvent {
     entityTypeFilter?: EntityType;
     index: number;
     total: number;
+    pageNumber: number;
 }
 
 export interface SearchFiltersClearAllEvent extends BaseEvent {
diff --git a/datahub-web-react/src/app/businessAttribute/BusinessAttributeItemMenu.tsx b/datahub-web-react/src/app/businessAttribute/BusinessAttributeItemMenu.tsx
index 4e56d81203b6f5..422de728f70907 100644
--- a/datahub-web-react/src/app/businessAttribute/BusinessAttributeItemMenu.tsx
+++ b/datahub-web-react/src/app/businessAttribute/BusinessAttributeItemMenu.tsx
@@ -1,8 +1,9 @@
 import React from 'react';
 import { DeleteOutlined } from '@ant-design/icons';
-import { Dropdown, Menu, message, Modal } from 'antd';
+import { Dropdown, message, Modal } from 'antd';
 import { MenuIcon } from '../entity/shared/EntityDropdown/EntityDropdown';
 import { useDeleteBusinessAttributeMutation } from '../../graphql/businessAttribute.generated';
+import { MenuItemStyle } from '../entity/view/menu/item/styledComponent';
 
 type Props = {
     urn: string;
@@ -48,17 +49,19 @@ export default function BusinessAttributeItemMenu({ title, urn, onDelete }: Prop
         });
     };
 
+    const items = [
+        {
+            key: 'delete',
+            label: (
+                <MenuItemStyle onClick={onConfirmDelete}>
+                    <DeleteOutlined /> &nbsp;Delete
+                </MenuItemStyle>
+            ),
+        },
+    ];
+
     return (
-        <Dropdown
-            trigger={['click']}
-            overlay={
-                <Menu>
-                    <Menu.Item onClick={onConfirmDelete} key="delete">
-                        <DeleteOutlined /> &nbsp;Delete
-                    </Menu.Item>
-                </Menu>
-            }
-        >
+        <Dropdown trigger={['click']} menu={{ items }}>
             <MenuIcon data-testid={`dropdown-menu-${urn}`} fontSize={20} />
         </Dropdown>
     );
diff --git a/datahub-web-react/src/app/businessAttribute/BusinessAttributes.tsx b/datahub-web-react/src/app/businessAttribute/BusinessAttributes.tsx
index b16593f5497f6e..e2794de5e56911 100644
--- a/datahub-web-react/src/app/businessAttribute/BusinessAttributes.tsx
+++ b/datahub-web-react/src/app/businessAttribute/BusinessAttributes.tsx
@@ -246,7 +246,7 @@ export const BusinessAttributes = () => {
                 />
             </PaginationContainer>
             <CreateBusinessAttributeModal
-                visible={isCreatingBusinessAttribute}
+                open={isCreatingBusinessAttribute}
                 onClose={() => setIsCreatingBusinessAttribute(false)}
                 onCreateBusinessAttribute={() => {
                     businessAttributeRefetch?.();
diff --git a/datahub-web-react/src/app/businessAttribute/CreateBusinessAttributeModal.tsx b/datahub-web-react/src/app/businessAttribute/CreateBusinessAttributeModal.tsx
index 1ee0ca030748ef..979f8377c7fdd6 100644
--- a/datahub-web-react/src/app/businessAttribute/CreateBusinessAttributeModal.tsx
+++ b/datahub-web-react/src/app/businessAttribute/CreateBusinessAttributeModal.tsx
@@ -13,7 +13,7 @@ import { SchemaFieldDataType } from './businessAttributeUtils';
 import { validateCustomUrnId } from '../shared/textUtil';
 
 type Props = {
-    visible: boolean;
+    open: boolean;
     onClose: () => void;
     onCreateBusinessAttribute: () => void;
 };
@@ -51,7 +51,7 @@ const StyledButton = styled(Button)`
 // Ensures that any newly added datatype is automatically included in the user dropdown.
 const DATA_TYPES = Object.values(SchemaFieldDataType);
 
-export default function CreateBusinessAttributeModal({ visible, onClose, onCreateBusinessAttribute }: Props) {
+export default function CreateBusinessAttributeModal({ open, onClose, onCreateBusinessAttribute }: Props) {
     const [createButtonEnabled, setCreateButtonEnabled] = useState(true);
 
     const [createBusinessAttribute] = useCreateBusinessAttributeMutation();
@@ -120,7 +120,7 @@ export default function CreateBusinessAttributeModal({ visible, onClose, onCreat
         <>
             <Modal
                 title="Create Business Attribute"
-                visible={visible}
+                open={open}
                 onCancel={onModalClose}
                 footer={
                     <>
diff --git a/datahub-web-react/src/app/context/UserContextProvider.tsx b/datahub-web-react/src/app/context/UserContextProvider.tsx
index 3bcff15cc27485..66593d346f3df4 100644
--- a/datahub-web-react/src/app/context/UserContextProvider.tsx
+++ b/datahub-web-react/src/app/context/UserContextProvider.tsx
@@ -127,6 +127,7 @@ const UserContextProvider = ({ children }: { children: React.ReactNode }) => {
     return (
         <UserContext.Provider
             value={{
+                loaded: !!meData,
                 urn: meData?.me?.corpUser?.urn,
                 user: meData?.me?.corpUser as CorpUser,
                 platformPrivileges: meData?.me?.platformPrivileges as PlatformPrivileges,
diff --git a/datahub-web-react/src/app/context/userContext.tsx b/datahub-web-react/src/app/context/userContext.tsx
index 2e174d38247f56..c9b8adafd9722f 100644
--- a/datahub-web-react/src/app/context/userContext.tsx
+++ b/datahub-web-react/src/app/context/userContext.tsx
@@ -28,6 +28,7 @@ export type State = {
  * Context about the currently-authenticated user.
  */
 export type UserContextType = {
+    loaded: boolean;
     urn?: string | null;
     user?: CorpUser | null;
     platformPrivileges?: PlatformPrivileges | null;
@@ -53,6 +54,7 @@ export const DEFAULT_STATE: State = {
 };
 
 export const DEFAULT_CONTEXT = {
+    loaded: false,
     urn: undefined,
     user: undefined,
     state: DEFAULT_STATE,
diff --git a/datahub-web-react/src/app/domain/CreateDomainModal.tsx b/datahub-web-react/src/app/domain/CreateDomainModal.tsx
index 606444d34bdc97..a50065e25fea19 100644
--- a/datahub-web-react/src/app/domain/CreateDomainModal.tsx
+++ b/datahub-web-react/src/app/domain/CreateDomainModal.tsx
@@ -115,7 +115,7 @@ export default function CreateDomainModal({ onClose, onCreate }: Props) {
     return (
         <Modal
             title="Create New Domain"
-            visible
+            open
             onCancel={onClose}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/domain/DomainItemMenu.tsx b/datahub-web-react/src/app/domain/DomainItemMenu.tsx
index a0007b90435d74..3e04864b379db9 100644
--- a/datahub-web-react/src/app/domain/DomainItemMenu.tsx
+++ b/datahub-web-react/src/app/domain/DomainItemMenu.tsx
@@ -48,17 +48,19 @@ export default function DomainItemMenu({ name, urn, onDelete }: Props) {
         });
     };
 
+    const items = [
+        {
+            key: 0,
+            label: (
+                <Menu.Item onClick={onConfirmDelete} key="delete">
+                    <DeleteOutlined /> &nbsp;Delete
+                </Menu.Item>
+            ),
+        },
+    ];
+
     return (
-        <Dropdown
-            trigger={['click']}
-            overlay={
-                <Menu>
-                    <Menu.Item onClick={onConfirmDelete} key="delete">
-                        <DeleteOutlined /> &nbsp;Delete
-                    </Menu.Item>
-                </Menu>
-            }
-        >
+        <Dropdown trigger={['click']} menu={{ items }}>
             <MenuIcon data-testid={`dropdown-menu-${urn}`} fontSize={20} />
         </Dropdown>
     );
diff --git a/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx b/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx
index 6074bcc2f2f406..21ae085832cb3f 100644
--- a/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx
+++ b/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx
@@ -36,6 +36,7 @@ import AccessManagement from '../shared/tabs/Dataset/AccessManagement/AccessMana
 import { matchedFieldPathsRenderer } from '../../search/matches/matchedFieldPathsRenderer';
 import { getLastUpdatedMs } from './shared/utils';
 import { IncidentTab } from '../shared/tabs/Incident/IncidentTab';
+import { GovernanceTab } from '../shared/tabs/Dataset/Governance/GovernanceTab';
 
 const SUBTYPES = {
     VIEW: 'view',
@@ -166,14 +167,22 @@ export class DatasetEntity implements Entity<Dataset> {
                     },
                 },
                 {
-                    name: 'Validation',
+                    name: 'Quality',
                     component: ValidationsTab,
                     display: {
                         visible: (_, _1) => true,
                         enabled: (_, dataset: GetDatasetQuery) => {
-                            return (
-                                (dataset?.dataset?.assertions?.total || 0) > 0 || dataset?.dataset?.testResults !== null
-                            );
+                            return (dataset?.dataset?.assertions?.total || 0) > 0;
+                        },
+                    },
+                },
+                {
+                    name: 'Governance',
+                    component: GovernanceTab,
+                    display: {
+                        visible: (_, _1) => true,
+                        enabled: (_, dataset: GetDatasetQuery) => {
+                            return dataset?.dataset?.testResults !== null;
                         },
                     },
                 },
@@ -211,6 +220,7 @@ export class DatasetEntity implements Entity<Dataset> {
                 },
             ]}
             sidebarSections={this.getSidebarSections()}
+            isNameEditable
         />
     );
 
@@ -274,7 +284,7 @@ export class DatasetEntity implements Entity<Dataset> {
         return (
             <Preview
                 urn={data.urn}
-                name={data.properties?.name || data.name}
+                name={data.editableProperties?.name || data.properties?.name || data.name}
                 origin={data.origin}
                 subtype={data.subTypes?.typeNames?.[0]}
                 description={data.editableProperties?.description || data.properties?.description}
@@ -302,7 +312,7 @@ export class DatasetEntity implements Entity<Dataset> {
         return (
             <Preview
                 urn={data.urn}
-                name={data.properties?.name || data.name}
+                name={data.editableProperties?.name || data.properties?.name || data.name}
                 origin={data.origin}
                 description={data.editableProperties?.description || data.properties?.description}
                 platformName={
@@ -352,7 +362,7 @@ export class DatasetEntity implements Entity<Dataset> {
     };
 
     displayName = (data: Dataset) => {
-        return data?.properties?.name || data.name || data.urn;
+        return data?.editableProperties?.name || data?.properties?.name || data.name || data.urn;
     };
 
     platformLogoUrl = (data: Dataset) => {
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/CustomPagination.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/CustomPagination.tsx
index 8d270898a44566..d97582cace7b15 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/CustomPagination.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/components/CustomPagination.tsx
@@ -1,7 +1,8 @@
 import React, { useState } from 'react';
-import { Button, Menu, Dropdown, Typography } from 'antd';
+import { Button, Dropdown, Typography } from 'antd';
 import { LeftOutlined, RightOutlined } from '@ant-design/icons';
 import styled from 'styled-components';
+import { MenuItemStyle } from '../../../../view/menu/item/styledComponent';
 
 const CustomPaginationContainer = styled.div`
     display: flex;
@@ -60,27 +61,29 @@ export default function CustomPagination({ onChange, maxVersion }: Props) {
         onChange(version1, parseInt(key, 10));
     };
 
-    const menu1 = (
-        <Menu onClick={onVersion1Click} selectedKeys={[`${version1}`]}>
-            {[...Array(maxVersion)].map((_, i) => (
-                // eslint-disable-next-line react/no-array-index-key
-                <Menu.Item key={maxVersion - i}>
+    const items1 = [...Array(maxVersion)].map((_, i) => {
+        // eslint-disable-next-line react/no-array-index-key
+        return {
+            key: maxVersion - i,
+            label: (
+                <MenuItemStyle onClick={() => onVersion1Click({ key: maxVersion - i })}>
                     <Typography.Text>{i === 0 ? 'latest' : `version ${maxVersion + 1 - i}`}</Typography.Text>
-                </Menu.Item>
-            ))}
-        </Menu>
-    );
+                </MenuItemStyle>
+            ),
+        };
+    });
 
-    const menu2 = (
-        <Menu onClick={onVersion2Click} selectedKeys={[`${version2}`]}>
-            {[...Array(version1)].map((_, i) => (
-                // eslint-disable-next-line react/no-array-index-key
-                <Menu.Item key={version1 - i - 1}>
+    const items2 = [...Array(version1)].map((_, i) => {
+        // eslint-disable-next-line react/no-array-index-key
+        return {
+            key: version1 - i - 1,
+            label: (
+                <MenuItemStyle onClick={() => onVersion2Click({ key: version1 - i - 1 })}>
                     <Typography.Text>{`version ${version1 - i}`}</Typography.Text>
-                </Menu.Item>
-            ))}
-        </Menu>
-    );
+                </MenuItemStyle>
+            ),
+        };
+    });
 
     return (
         <CustomPaginationContainer>
@@ -92,13 +95,13 @@ export default function CustomPagination({ onChange, maxVersion }: Props) {
                 disabled={version1 >= maxVersion}
             />
             <DescriptionText>Comparing</DescriptionText>
-            <Dropdown overlay={menu1} trigger={['click']}>
+            <Dropdown menu={{ items: items1 }} trigger={['click']}>
                 <VersionText strong type="success">
                     {version1 === maxVersion ? 'latest' : `version ${version1 + 1}`}
                 </VersionText>
             </Dropdown>
             <DescriptionText>to</DescriptionText>
-            <Dropdown overlay={menu2} trigger={['click']}>
+            <Dropdown menu={{ items: items2 }} trigger={['click']}>
                 <VersionRightText strong type="success">{`version ${version2 + 1}`}</VersionRightText>
             </Dropdown>
             <NavButton
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaDescriptionField.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaDescriptionField.tsx
index ce8d03fbdc9602..e7d986028d4a66 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaDescriptionField.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaDescriptionField.tsx
@@ -5,6 +5,8 @@ import styled from 'styled-components';
 import { FetchResult } from '@apollo/client';
 
 import { UpdateDatasetMutation } from '../../../../../../graphql/dataset.generated';
+import { StringMapEntry } from '../../../../../../types.generated';
+import PropagationDetails from '../../../../shared/propagation/PropagationDetails';
 import UpdateDescriptionModal from '../../../../shared/components/legacy/DescriptionModal';
 import StripMarkdownText, { removeMarkdown } from '../../../../shared/components/styled/StripMarkdownText';
 import SchemaEditableContext from '../../../../../shared/SchemaEditableContext';
@@ -28,6 +30,11 @@ const ExpandedActions = styled.div`
     height: 10px;
 `;
 
+const DescriptionWrapper = styled.span`
+    display: inline-flex;
+    align-items: center;
+`;
+
 const DescriptionContainer = styled.div`
     position: relative;
     display: flex;
@@ -105,6 +112,8 @@ type Props = {
     isEdited?: boolean;
     isReadOnly?: boolean;
     businessAttributeDescription?: string;
+    isPropagated?: boolean;
+    sourceDetail?: StringMapEntry[] | null;
 };
 
 const ABBREVIATED_LIMIT = 80;
@@ -120,6 +129,8 @@ export default function DescriptionField({
     original,
     isReadOnly,
     businessAttributeDescription,
+    isPropagated,
+    sourceDetail,
 }: Props) {
     const [showAddModal, setShowAddModal] = useState(false);
     const overLimit = removeMarkdown(description).length > 80;
@@ -163,7 +174,7 @@ export default function DescriptionField({
 
     return (
         <DescriptionContainer>
-            {expanded || !overLimit ? (
+            {expanded ? (
                 <>
                     {!!description && <StyledViewer content={description} readOnly />}
                     {!!description && (EditButton || overLimit) && (
@@ -184,25 +195,29 @@ export default function DescriptionField({
                 </>
             ) : (
                 <>
-                    <StripMarkdownText
-                        limit={ABBREVIATED_LIMIT}
-                        readMore={
-                            <>
-                                <Typography.Link
-                                    onClick={(e) => {
-                                        e.stopPropagation();
-                                        handleExpanded(true);
-                                    }}
-                                >
-                                    Read More
-                                </Typography.Link>
-                            </>
-                        }
-                        suffix={EditButton}
-                        shouldWrap
-                    >
-                        {description}
-                    </StripMarkdownText>
+                    <DescriptionWrapper>
+                        {isPropagated && <PropagationDetails sourceDetail={sourceDetail} />}
+                        &nbsp;
+                        <StripMarkdownText
+                            limit={ABBREVIATED_LIMIT}
+                            readMore={
+                                <>
+                                    <Typography.Link
+                                        onClick={(e) => {
+                                            e.stopPropagation();
+                                            handleExpanded(true);
+                                        }}
+                                    >
+                                        Read More
+                                    </Typography.Link>
+                                </>
+                            }
+                            suffix={EditButton}
+                            shouldWrap
+                        >
+                            {description}
+                        </StripMarkdownText>
+                    </DescriptionWrapper>
                 </>
             )}
             {isEdited && <EditedLabel>(edited)</EditedLabel>}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/translateFieldPathSegment.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/translateFieldPathSegment.tsx
index 7153a38a32c3b5..734580eb26f5dd 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/translateFieldPathSegment.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/translateFieldPathSegment.tsx
@@ -28,7 +28,7 @@ export default function translateFieldPathSegment(fieldPathSegment, i, fieldPath
     // structs that qualify a union are represented as [union]union_field.[type=QualifiedStruct].qualified_struct_field
     // we convert into union_field. (QualifiedStruct) qualified_struct_field
     if (fieldPathSegment.startsWith('[type=') && fieldPathSegment.endsWith(']')) {
-        const typeName = fieldPathSegment.replace('[type=', '').replace(']', '');
+        const typeName = fieldPathSegment.replace(/\[type=/g, '').replace(/\]/g, '');
         // if the qualified struct is the last element, just show the qualified struct
         if (i === fieldPathParts.length - 1) {
             return ` ${typeName}`;
diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx
index 36f2b5e37902e2..e14c5ad1f479b3 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx
@@ -71,7 +71,7 @@ export default function ProfilingRunsChart({ profiles }: Props) {
     return (
         <>
             {selectedProfile && (
-                <Modal width="100%" footer={null} title={profileModalTitle} visible={showModal} onCancel={onClose}>
+                <Modal width="100%" footer={null} title={profileModalTitle} open={showModal} onCancel={onClose}>
                     <DataProfileView profile={selectedProfile} />
                 </Modal>
             )}
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx
index f97f3c327676b9..a609dc4cca599d 100644
--- a/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx
+++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx
@@ -167,7 +167,7 @@ function AddRelatedTermsModal(props: Props) {
     return (
         <Modal
             title="Add Related Terms"
-            visible
+            open
             onCancel={onClose}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/RelatedTerm.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/RelatedTerm.tsx
index bb252c8459e221..4db28768c66a05 100644
--- a/datahub-web-react/src/app/entity/glossaryTerm/profile/RelatedTerm.tsx
+++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/RelatedTerm.tsx
@@ -1,5 +1,5 @@
 import { DeleteOutlined, MoreOutlined } from '@ant-design/icons';
-import { Divider, Dropdown, Menu } from 'antd';
+import { Divider, Dropdown } from 'antd';
 import React from 'react';
 import styled from 'styled-components/macro';
 import { useGetGlossaryTermQuery } from '../../../../graphql/glossaryTerm.generated';
@@ -51,23 +51,23 @@ function RelatedTerm(props: Props) {
 
     if (loading) return null;
 
+    const items = [
+        {
+            key: '0',
+            label: (
+                <MenuItem onClick={onRemove}>
+                    <DeleteOutlined /> &nbsp; Remove Term
+                </MenuItem>
+            ),
+        },
+    ];
+
     return (
         <ListItem>
             <Profile>
                 {entityRegistry.renderPreview(EntityType.GlossaryTerm, PreviewType.PREVIEW, data?.glossaryTerm)}
                 {isEditable && (
-                    <Dropdown
-                        overlay={
-                            <Menu>
-                                <Menu.Item key="0">
-                                    <MenuItem onClick={onRemove}>
-                                        <DeleteOutlined /> &nbsp; Remove Term
-                                    </MenuItem>
-                                </Menu.Item>
-                            </Menu>
-                        }
-                        trigger={['click']}
-                    >
+                    <Dropdown menu={{ items }} trigger={['click']}>
                         <MenuIcon />
                     </Dropdown>
                 )}
diff --git a/datahub-web-react/src/app/entity/group/AddGroupMembersModal.tsx b/datahub-web-react/src/app/entity/group/AddGroupMembersModal.tsx
index 95c288052e978d..2485fb1e48fbed 100644
--- a/datahub-web-react/src/app/entity/group/AddGroupMembersModal.tsx
+++ b/datahub-web-react/src/app/entity/group/AddGroupMembersModal.tsx
@@ -10,7 +10,7 @@ import { OwnerLabel } from '../../shared/OwnerLabel';
 
 type Props = {
     urn: string;
-    visible: boolean;
+    open: boolean;
     onCloseModal: () => void;
     onSubmit: () => void;
 };
@@ -29,7 +29,7 @@ const StyleTag = styled(Tag)`
     align-items: center;
 `;
 
-export const AddGroupMembersModal = ({ urn, visible, onCloseModal, onSubmit }: Props) => {
+export const AddGroupMembersModal = ({ urn, open, onCloseModal, onSubmit }: Props) => {
     const entityRegistry = useEntityRegistry();
     const [selectedMembers, setSelectedMembers] = useState<any[]>([]);
     const [inputValue, setInputValue] = useState('');
@@ -134,7 +134,7 @@ export const AddGroupMembersModal = ({ urn, visible, onCloseModal, onSubmit }: P
     return (
         <Modal
             title="Add group members"
-            visible={visible}
+            open={open}
             onCancel={onModalClose}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/entity/group/EditGroupDescriptionModal.tsx b/datahub-web-react/src/app/entity/group/EditGroupDescriptionModal.tsx
index 356daf584d9f7e..5c672745053b52 100644
--- a/datahub-web-react/src/app/entity/group/EditGroupDescriptionModal.tsx
+++ b/datahub-web-react/src/app/entity/group/EditGroupDescriptionModal.tsx
@@ -38,7 +38,7 @@ export default function EditGroupDescriptionModal({
         <Modal
             width={700}
             title="Edit Description"
-            visible
+            open
             onCancel={onClose}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/entity/group/GroupEditModal.tsx b/datahub-web-react/src/app/entity/group/GroupEditModal.tsx
index be1289ad3202b3..6a3354eb358bb6 100644
--- a/datahub-web-react/src/app/entity/group/GroupEditModal.tsx
+++ b/datahub-web-react/src/app/entity/group/GroupEditModal.tsx
@@ -11,7 +11,7 @@ type PropsData = {
 };
 
 type Props = {
-    visible: boolean;
+    open: boolean;
     onClose: () => void;
     onSave: () => void;
     editModalData: PropsData;
@@ -19,7 +19,7 @@ type Props = {
 /** Regex Validations */
 export const USER_NAME_REGEX = new RegExp('^[a-zA-Z ]*$');
 
-export default function GroupEditModal({ visible, onClose, onSave, editModalData }: Props) {
+export default function GroupEditModal({ open, onClose, onSave, editModalData }: Props) {
     const [updateCorpGroupPropertiesMutation] = useUpdateCorpGroupPropertiesMutation();
     const [form] = Form.useForm();
 
@@ -76,7 +76,7 @@ export default function GroupEditModal({ visible, onClose, onSave, editModalData
     return (
         <Modal
             title="Edit Profile"
-            visible={visible}
+            open={open}
             onCancel={onClose}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/entity/group/GroupInfoSideBar.tsx b/datahub-web-react/src/app/entity/group/GroupInfoSideBar.tsx
index 4cba8499877f1c..af3f89f7c21bad 100644
--- a/datahub-web-react/src/app/entity/group/GroupInfoSideBar.tsx
+++ b/datahub-web-react/src/app/entity/group/GroupInfoSideBar.tsx
@@ -368,7 +368,7 @@ export default function GroupInfoSidebar({ sideBarData, refetch }: Props) {
             </SideBar>
             {/* Modal */}
             <GroupEditModal
-                visible={editGroupModal}
+                open={editGroupModal}
                 onClose={() => showEditGroupModal(false)}
                 onSave={() => {
                     refetch();
diff --git a/datahub-web-react/src/app/entity/group/GroupMembers.tsx b/datahub-web-react/src/app/entity/group/GroupMembers.tsx
index 45697cb50b309c..147c3f8030d0e0 100644
--- a/datahub-web-react/src/app/entity/group/GroupMembers.tsx
+++ b/datahub-web-react/src/app/entity/group/GroupMembers.tsx
@@ -232,7 +232,7 @@ export default function GroupMembers({ urn, pageSize, isExternalGroup, onChangeM
             {isEditingMembers && (
                 <AddGroupMembersModal
                     urn={urn}
-                    visible={isEditingMembers}
+                    open={isEditingMembers}
                     onSubmit={onAddMembers}
                     onCloseModal={() => setIsEditingMembers(false)}
                 />
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/CreateGlossaryEntityModal.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/CreateGlossaryEntityModal.tsx
index d60e86b0af8ca4..c92e6015c6cca0 100644
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/CreateGlossaryEntityModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/CreateGlossaryEntityModal.tsx
@@ -131,7 +131,7 @@ function CreateGlossaryEntityModal(props: Props) {
     return (
         <Modal
             title={`Create ${entityRegistry.getEntityName(entityType)}`}
-            visible
+            open
             onCancel={onClose}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/EntityDropdown.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/EntityDropdown.tsx
index 2856a219c435d6..b7dbd9a43c872f 100644
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/EntityDropdown.tsx
+++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/EntityDropdown.tsx
@@ -57,6 +57,9 @@ const MenuItem = styled.div`
 `;
 
 const StyledMenuItem = styled(Menu.Item)<{ disabled: boolean }>`
+    &&&& {
+        background-color: transparent;
+    }
     ${(props) =>
         props.disabled
             ? `
@@ -157,114 +160,145 @@ function EntityDropdown(props: Props) {
      */
     const deleteRedirectPath = getEntityProfileDeleteRedirectPath(entityType, entityData);
 
+    const items = [
+        menuItems.has(EntityMenuItems.COPY_URL) && navigator.clipboard
+            ? {
+                  key: 0,
+                  label: (
+                      <MenuItem
+                          onClick={() => {
+                              navigator.clipboard.writeText(pageUrl);
+                              message.info('Copied URL!', 1.2);
+                          }}
+                      >
+                          <LinkOutlined /> &nbsp; Copy Url
+                      </MenuItem>
+                  ),
+              }
+            : null,
+        menuItems.has(EntityMenuItems.UPDATE_DEPRECATION)
+            ? {
+                  key: 1,
+                  label: !entityData?.deprecation?.deprecated ? (
+                      <MenuItem onClick={() => setIsDeprecationModalVisible(true)}>
+                          <ExclamationCircleOutlined /> &nbsp; Mark as deprecated
+                      </MenuItem>
+                  ) : (
+                      <MenuItem onClick={() => handleUpdateDeprecation(false)}>
+                          <ExclamationCircleOutlined /> &nbsp; Mark as un-deprecated
+                      </MenuItem>
+                  ),
+              }
+            : null,
+        menuItems.has(EntityMenuItems.ADD_TERM)
+            ? {
+                  key: 2,
+                  label: (
+                      <StyledMenuItem
+                          data-testid="entity-menu-add-term-button"
+                          key="2"
+                          disabled={!canCreateGlossaryEntity}
+                          onClick={() => setIsCreateTermModalVisible(true)}
+                      >
+                          <MenuItem>
+                              <PlusOutlined /> &nbsp;Add Term
+                          </MenuItem>
+                      </StyledMenuItem>
+                  ),
+              }
+            : null,
+        menuItems.has(EntityMenuItems.ADD_TERM_GROUP)
+            ? {
+                  key: 3,
+                  label: (
+                      <StyledMenuItem
+                          key="3"
+                          disabled={!canCreateGlossaryEntity}
+                          onClick={() => setIsCreateNodeModalVisible(true)}
+                      >
+                          <MenuItem>
+                              <FolderAddOutlined /> &nbsp;Add Term Group
+                          </MenuItem>
+                      </StyledMenuItem>
+                  ),
+              }
+            : null,
+        !isDomainMoveHidden && menuItems.has(EntityMenuItems.MOVE)
+            ? {
+                  key: 4,
+                  label: (
+                      <StyledMenuItem
+                          data-testid="entity-menu-move-button"
+                          key="4"
+                          disabled={isMoveDisabled(entityType, entityData, me.platformPrivileges)}
+                          onClick={() => setIsMoveModalVisible(true)}
+                      >
+                          <MenuItem>
+                              <FolderOpenOutlined /> &nbsp;Move
+                          </MenuItem>
+                      </StyledMenuItem>
+                  ),
+              }
+            : null,
+        menuItems.has(EntityMenuItems.DELETE)
+            ? {
+                  key: 5,
+                  label: (
+                      <StyledMenuItem
+                          key="5"
+                          disabled={isDeleteDisabled(entityType, entityData, me.platformPrivileges)}
+                          onClick={onDeleteEntity}
+                      >
+                          <Tooltip
+                              title={
+                                  shouldDisplayChildDeletionWarning(entityType, entityData, me.platformPrivileges)
+                                      ? `Can't delete ${entityRegistry.getEntityName(entityType)} with ${
+                                            isDomainEntity ? 'sub-domain' : 'child'
+                                        } entities.`
+                                      : undefined
+                              }
+                          >
+                              <MenuItem data-testid="entity-menu-delete-button">
+                                  <DeleteOutlined /> &nbsp;Delete
+                              </MenuItem>
+                          </Tooltip>
+                      </StyledMenuItem>
+                  ),
+              }
+            : null,
+        menuItems.has(EntityMenuItems.CLONE)
+            ? {
+                  key: 6,
+                  label: (
+                      <StyledMenuItem
+                          key="6"
+                          disabled={!entityData?.privileges?.canManageEntity}
+                          onClick={() => setIsCloneEntityModalVisible(true)}
+                      >
+                          <MenuItem>
+                              <CopyOutlined /> &nbsp;Clone
+                          </MenuItem>
+                      </StyledMenuItem>
+                  ),
+              }
+            : null,
+        menuItems.has(EntityMenuItems.RAISE_INCIDENT)
+            ? {
+                  key: 6,
+                  label: (
+                      <StyledMenuItem key="6" disabled={false}>
+                          <MenuItem onClick={() => setIsRaiseIncidentModalVisible(true)}>
+                              <WarningOutlined /> &nbsp;Raise Incident
+                          </MenuItem>
+                      </StyledMenuItem>
+                  ),
+              }
+            : null,
+    ];
+
     return (
         <>
-            <Dropdown
-                overlay={
-                    <Menu>
-                        {menuItems.has(EntityMenuItems.COPY_URL) && navigator.clipboard && (
-                            <Menu.Item key="0">
-                                <MenuItem
-                                    onClick={() => {
-                                        navigator.clipboard.writeText(pageUrl);
-                                        message.info('Copied URL!', 1.2);
-                                    }}
-                                >
-                                    <LinkOutlined /> &nbsp; Copy Url
-                                </MenuItem>
-                            </Menu.Item>
-                        )}
-                        {menuItems.has(EntityMenuItems.UPDATE_DEPRECATION) && (
-                            <Menu.Item key="1">
-                                {!entityData?.deprecation?.deprecated ? (
-                                    <MenuItem onClick={() => setIsDeprecationModalVisible(true)}>
-                                        <ExclamationCircleOutlined /> &nbsp; Mark as deprecated
-                                    </MenuItem>
-                                ) : (
-                                    <MenuItem onClick={() => handleUpdateDeprecation(false)}>
-                                        <ExclamationCircleOutlined /> &nbsp; Mark as un-deprecated
-                                    </MenuItem>
-                                )}
-                            </Menu.Item>
-                        )}
-                        {menuItems.has(EntityMenuItems.ADD_TERM) && (
-                            <StyledMenuItem
-                                data-testid="entity-menu-add-term-button"
-                                key="2"
-                                disabled={!canCreateGlossaryEntity}
-                                onClick={() => setIsCreateTermModalVisible(true)}
-                            >
-                                <MenuItem>
-                                    <PlusOutlined /> &nbsp;Add Term
-                                </MenuItem>
-                            </StyledMenuItem>
-                        )}
-                        {menuItems.has(EntityMenuItems.ADD_TERM_GROUP) && (
-                            <StyledMenuItem
-                                key="3"
-                                disabled={!canCreateGlossaryEntity}
-                                onClick={() => setIsCreateNodeModalVisible(true)}
-                            >
-                                <MenuItem>
-                                    <FolderAddOutlined /> &nbsp;Add Term Group
-                                </MenuItem>
-                            </StyledMenuItem>
-                        )}
-                        {!isDomainMoveHidden && menuItems.has(EntityMenuItems.MOVE) && (
-                            <StyledMenuItem
-                                data-testid="entity-menu-move-button"
-                                key="4"
-                                disabled={isMoveDisabled(entityType, entityData, me.platformPrivileges)}
-                                onClick={() => setIsMoveModalVisible(true)}
-                            >
-                                <MenuItem>
-                                    <FolderOpenOutlined /> &nbsp;Move
-                                </MenuItem>
-                            </StyledMenuItem>
-                        )}
-                        {menuItems.has(EntityMenuItems.DELETE) && (
-                            <StyledMenuItem
-                                key="5"
-                                disabled={isDeleteDisabled(entityType, entityData, me.platformPrivileges)}
-                                onClick={onDeleteEntity}
-                            >
-                                <Tooltip
-                                    title={
-                                        shouldDisplayChildDeletionWarning(entityType, entityData, me.platformPrivileges)
-                                            ? `Can't delete ${entityRegistry.getEntityName(entityType)} with ${
-                                                  isDomainEntity ? 'sub-domain' : 'child'
-                                              } entities.`
-                                            : undefined
-                                    }
-                                >
-                                    <MenuItem data-testid="entity-menu-delete-button">
-                                        <DeleteOutlined /> &nbsp;Delete
-                                    </MenuItem>
-                                </Tooltip>
-                            </StyledMenuItem>
-                        )}
-                        {menuItems.has(EntityMenuItems.CLONE) && (
-                            <StyledMenuItem
-                                key="6"
-                                disabled={!entityData?.privileges?.canManageEntity}
-                                onClick={() => setIsCloneEntityModalVisible(true)}
-                            >
-                                <MenuItem>
-                                    <CopyOutlined /> &nbsp;Clone
-                                </MenuItem>
-                            </StyledMenuItem>
-                        )}
-                        {menuItems.has(EntityMenuItems.RAISE_INCIDENT) && (
-                            <StyledMenuItem key="6" disabled={false}>
-                                <MenuItem onClick={() => setIsRaiseIncidentModalVisible(true)}>
-                                    <WarningOutlined /> &nbsp;Raise Incident
-                                </MenuItem>
-                            </StyledMenuItem>
-                        )}
-                    </Menu>
-                }
-                trigger={['click']}
-            >
+            <Dropdown menu={{ items }} trigger={['click']}>
                 <MenuIcon data-testid="entity-header-dropdown" fontSize={size} />
             </Dropdown>
             {isCreateTermModalVisible && (
@@ -303,7 +337,7 @@ function EntityDropdown(props: Props) {
             {hasBeenDeleted && !onDelete && deleteRedirectPath && <Redirect to={deleteRedirectPath} />}
             {isRaiseIncidentModalVisible && (
                 <AddIncidentModal
-                    visible={isRaiseIncidentModalVisible}
+                    open={isRaiseIncidentModalVisible}
                     onClose={() => setIsRaiseIncidentModalVisible(false)}
                     refetch={
                         (() => {
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveDomainModal.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveDomainModal.tsx
index 3826f934c1c25e..dbf14b069f521b 100644
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveDomainModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveDomainModal.tsx
@@ -68,7 +68,7 @@ function MoveDomainModal(props: Props) {
         <Modal
             title="Move"
             data-testid="move-domain-modal"
-            visible
+            open
             onCancel={onClose}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveGlossaryEntityModal.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveGlossaryEntityModal.tsx
index 51b39be4e20ea2..de32f48f687a0b 100644
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveGlossaryEntityModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveGlossaryEntityModal.tsx
@@ -67,7 +67,7 @@ function MoveGlossaryEntityModal(props: Props) {
         <Modal
             data-testid="move-glossary-entity-modal"
             title="Move"
-            visible
+            open
             onCancel={onClose}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/UpdateDeprecationModal.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/UpdateDeprecationModal.tsx
index 01287c2b367bf5..0c36c3a953cb72 100644
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/UpdateDeprecationModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/UpdateDeprecationModal.tsx
@@ -58,7 +58,7 @@ export const UpdateDeprecationModal = ({ urns, onClose, refetch }: Props) => {
     return (
         <Modal
             title="Add Deprecation Details"
-            visible
+            open
             onCancel={handleClose}
             keyboard
             footer={
diff --git a/datahub-web-react/src/app/entity/shared/components/legacy/DescriptionModal.tsx b/datahub-web-react/src/app/entity/shared/components/legacy/DescriptionModal.tsx
index 0e899bc391e0a7..0f88264e8da2f4 100644
--- a/datahub-web-react/src/app/entity/shared/components/legacy/DescriptionModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/legacy/DescriptionModal.tsx
@@ -19,16 +19,29 @@ const StyledViewer = styled(Editor)`
     }
 `;
 
+const OriginalDocumentation = styled(Form.Item)`
+    margin-bottom: 0;
+`;
+
 type Props = {
     title: string;
     description?: string | undefined;
     original?: string | undefined;
+    propagatedDescription?: string | undefined;
     onClose: () => void;
     onSubmit: (description: string) => void;
     isAddDesc?: boolean;
 };
 
-export default function UpdateDescriptionModal({ title, description, original, onClose, onSubmit, isAddDesc }: Props) {
+export default function UpdateDescriptionModal({
+    title,
+    description,
+    original,
+    propagatedDescription,
+    onClose,
+    onSubmit,
+    isAddDesc,
+}: Props) {
     const [updatedDesc, setDesc] = useState(description || original || '');
 
     const handleEditorKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
@@ -45,7 +58,7 @@ export default function UpdateDescriptionModal({ title, description, original, o
     return (
         <Modal
             title={title}
-            visible
+            open
             width={900}
             onCancel={onClose}
             okText={isAddDesc ? 'Submit' : 'Update'}
@@ -72,9 +85,14 @@ export default function UpdateDescriptionModal({ title, description, original, o
                     />
                 </Form.Item>
                 {!isAddDesc && description && original && (
-                    <Form.Item label={<FormLabel>Original:</FormLabel>}>
+                    <OriginalDocumentation label={<FormLabel>Original:</FormLabel>}>
                         <StyledViewer content={original || ''} readOnly />
-                    </Form.Item>
+                    </OriginalDocumentation>
+                )}
+                {!isAddDesc && description && propagatedDescription && (
+                    <OriginalDocumentation label={<FormLabel>Propagated:</FormLabel>}>
+                        <StyledViewer content={propagatedDescription || ''} readOnly />
+                    </OriginalDocumentation>
                 )}
             </Form>
         </Modal>
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/AddLinkModal.tsx b/datahub-web-react/src/app/entity/shared/components/styled/AddLinkModal.tsx
index 9e18de3b294bf7..2caa116709dcbf 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/AddLinkModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/AddLinkModal.tsx
@@ -63,7 +63,7 @@ export const AddLinkModal = ({ buttonProps, refetch }: AddLinkProps) => {
             </Button>
             <Modal
                 title="Add Link"
-                visible={isModalVisible}
+                open={isModalVisible}
                 destroyOnClose
                 onCancel={handleClose}
                 footer={[
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.tsx
index dd6cbc36987054..ea40fb71818033 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.tsx
@@ -26,7 +26,7 @@ type Props = {
     table1Schema?: any;
     table2?: any;
     table2Schema?: any;
-    visible: boolean;
+    open: boolean;
     setModalVisible?: any;
     onCancel: () => void;
     editERModelRelation?: ErModelRelationship;
@@ -42,7 +42,7 @@ export const CreateERModelRelationModal = ({
     table1Schema,
     table2,
     table2Schema,
-    visible,
+    open,
     setModalVisible,
     onCancel,
     editERModelRelation,
@@ -349,7 +349,7 @@ export const CreateERModelRelationModal = ({
                     </div>
                 </div>
             }
-            visible={visible}
+            open={open}
             closable={false}
             className="CreateERModelRelationModal"
             okButtonProps={{ hidden: true }}
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview.tsx
index b360f03bb5b284..ef65aed02decf1 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview.tsx
@@ -132,7 +132,7 @@ export const ERModelRelationPreview = ({ ermodelrelationData, baseEntityUrn, pre
         <div className="ERModelRelationPreview">
             {ermodelrelationData?.properties?.relationshipFieldMappings !== undefined && (
                 <CreateERModelRelationModal
-                    visible={modalVisible}
+                    open={modalVisible}
                     setModalVisible={setModalVisible}
                     onCancel={() => {
                         setModalVisible(false);
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/DownloadAsCsvModal.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/DownloadAsCsvModal.tsx
index c4b5f8fa02b2b8..f5bdd205045e8f 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/search/DownloadAsCsvModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/search/DownloadAsCsvModal.tsx
@@ -123,7 +123,7 @@ export default function DownloadAsCsvModal({
             centered
             onCancel={() => setShowDownloadAsCsvModal(false)}
             title="Download as..."
-            visible={showDownloadAsCsvModal}
+            open={showDownloadAsCsvModal}
             footer={
                 <>
                     <Button onClick={() => setShowDownloadAsCsvModal(false)} type="text">
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchModal.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchModal.tsx
index f88972bbda6a62..4af657a46cc578 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchModal.tsx
@@ -72,7 +72,7 @@ export const EmbeddedListSearchModal = ({
             style={modalStyle}
             bodyStyle={modalBodyStyle}
             title={title}
-            visible
+            open
             onCancel={onClose}
             footer={<Button onClick={onClose}>Close</Button>}
         >
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/SearchExtendedMenu.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/SearchExtendedMenu.tsx
index a26749d8a37a1f..b9ab2a4bd4fbef 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/search/SearchExtendedMenu.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/search/SearchExtendedMenu.tsx
@@ -1,11 +1,12 @@
 import React, { useState } from 'react';
-import { Button, Dropdown, Menu } from 'antd';
+import { Button, Dropdown } from 'antd';
 import { FormOutlined, MoreOutlined } from '@ant-design/icons';
 import styled from 'styled-components/macro';
 import { AndFilterInput } from '../../../../../../types.generated';
 import DownloadAsCsvButton from './DownloadAsCsvButton';
 import DownloadAsCsvModal from './DownloadAsCsvModal';
 import { DownloadSearchResultsInput, DownloadSearchResults } from '../../../../../search/utils/types';
+import { MenuItemStyle } from '../../../../view/menu/item/styledComponent';
 
 const MenuIcon = styled(MoreOutlined)`
     font-size: 20px;
@@ -18,10 +19,6 @@ const SelectButton = styled(Button)`
     padding-right: 12px;
 `;
 
-const MenuItem = styled(Menu.Item)`
-    padding: 0px;
-`;
-
 type Props = {
     filters: AndFilterInput[];
     query: string;
@@ -43,24 +40,32 @@ export default function SearchExtendedMenu({
     const [isDownloadingCsv, setIsDownloadingCsv] = useState(false);
     const [showDownloadAsCsvModal, setShowDownloadAsCsvModal] = useState(false);
 
-    const menu = (
-        <Menu>
-            <MenuItem key="0" data-testid="download-as-csv-menu-item">
-                <DownloadAsCsvButton
-                    isDownloadingCsv={isDownloadingCsv}
-                    setShowDownloadAsCsvModal={setShowDownloadAsCsvModal}
-                />
-            </MenuItem>
-            {setShowSelectMode && (
-                <MenuItem key="1">
-                    <SelectButton type="text" onClick={() => setShowSelectMode(true)}>
-                        <FormOutlined />
-                        Edit...
-                    </SelectButton>
-                </MenuItem>
-            )}
-        </Menu>
-    );
+    const items = [
+        {
+            key: 0,
+            label: (
+                <MenuItemStyle data-testid="download-as-csv-menu-item">
+                    <DownloadAsCsvButton
+                        isDownloadingCsv={isDownloadingCsv}
+                        setShowDownloadAsCsvModal={setShowDownloadAsCsvModal}
+                    />
+                </MenuItemStyle>
+            ),
+        },
+        setShowSelectMode
+            ? {
+                  key: 1,
+                  label: (
+                      <MenuItemStyle>
+                          <SelectButton type="text" onClick={() => setShowSelectMode(true)}>
+                              <FormOutlined />
+                              Edit...
+                          </SelectButton>
+                      </MenuItemStyle>
+                  ),
+              }
+            : null,
+    ];
 
     return (
         <>
@@ -74,7 +79,7 @@ export default function SearchExtendedMenu({
                 setShowDownloadAsCsvModal={setShowDownloadAsCsvModal}
                 totalResults={totalResults}
             />
-            <Dropdown overlay={menu} trigger={['click']}>
+            <Dropdown menu={{ items }} trigger={['click']}>
                 <MenuIcon data-testid="three-dot-menu" />
             </Dropdown>
         </>
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectModal.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectModal.tsx
index 985be5b3f37c7c..3a9b38b461f4ca 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectModal.tsx
@@ -68,7 +68,7 @@ export const SearchSelectModal = ({
                 bodyStyle={MODAL_BODY_STYLE}
                 title={titleText || 'Select entities'}
                 width={MODAL_WIDTH_PX}
-                visible
+                open
                 onCancel={onCancelSelect}
                 footer={
                     <>
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/action/ActionDropdown.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/action/ActionDropdown.tsx
index 8158f052a6eb16..c958d3b82a430a 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/search/action/ActionDropdown.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/search/action/ActionDropdown.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
-import { Button, Dropdown, Menu, Tooltip } from 'antd';
+import { Button, Dropdown, Tooltip } from 'antd';
 import { CaretDownOutlined } from '@ant-design/icons';
 import styled from 'styled-components';
-import MenuItem from 'antd/lib/menu/MenuItem';
 import { ANTD_GRAY } from '../../../../constants';
+import { MenuItemStyle } from '../../../../../view/menu/item/styledComponent';
 
 const DownArrow = styled(CaretDownOutlined)`
     && {
@@ -15,12 +15,6 @@ const DownArrow = styled(CaretDownOutlined)`
     }
 `;
 
-const StyledMenuItem = styled(MenuItem)`
-    && {
-        padding: 0px;
-    }
-`;
-
 const ActionButton = styled(Button)`
     font-weight: normal;
 `;
@@ -47,23 +41,20 @@ type Props = {
 };
 
 export default function ActionDropdown({ name, actions, disabled }: Props) {
+    const items = actions.map((action, i) => ({
+        key: i,
+        label: (
+            <MenuItemStyle>
+                <ActionButton type="text" onClick={action.onClick}>
+                    {action.title}
+                </ActionButton>
+            </MenuItemStyle>
+        ),
+    }));
+
     return (
         <Tooltip title={disabled ? 'This action is not supported for the selected types.' : ''}>
-            <Dropdown
-                disabled={disabled}
-                trigger={['click']}
-                overlay={
-                    <Menu>
-                        {actions.map((action) => (
-                            <StyledMenuItem>
-                                <ActionButton type="text" onClick={action.onClick}>
-                                    {action.title}
-                                </ActionButton>
-                            </StyledMenuItem>
-                        ))}
-                    </Menu>
-                }
-            >
+            <Dropdown disabled={disabled} trigger={['click']} menu={{ items }}>
                 <DropdownWrapper disabled={!!disabled}>
                     {name}
                     <DownArrow />
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/action/GlossaryTermsDropdown.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/action/GlossaryTermsDropdown.tsx
index 7206abed305c47..9083567d0fd70f 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/search/action/GlossaryTermsDropdown.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/search/action/GlossaryTermsDropdown.tsx
@@ -39,7 +39,7 @@ export default function GlossaryTermsDropdown({ urns, disabled = false, refetch
             {isEditModalVisible && (
                 <EditTagTermsModal
                     type={EntityType.GlossaryTerm}
-                    visible
+                    open
                     onCloseModal={() => {
                         setIsEditModalVisible(false);
                         refetch?.();
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/action/TagsDropdown.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/action/TagsDropdown.tsx
index 411ee62f64ccad..94dcd4d24540f0 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/search/action/TagsDropdown.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/search/action/TagsDropdown.tsx
@@ -39,7 +39,7 @@ export default function TagsDropdown({ urns, disabled = false, refetch }: Props)
             {isEditModalVisible && (
                 <EditTagTermsModal
                     type={EntityType.Tag}
-                    visible
+                    open
                     onCloseModal={() => {
                         setIsEditModalVisible(false);
                         refetch?.();
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityHeader.test.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityHeader.test.tsx
index db347d4f1cc54c..ec6a91df9019ab 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityHeader.test.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityHeader.test.tsx
@@ -3,13 +3,14 @@ import { EntityType } from '../../../../../../types.generated';
 import { getCanEditName } from '../header/EntityHeader';
 
 describe('getCanEditName', () => {
-    const entityDataWithManagePrivileges = { privileges: { canManageEntity: true } };
-    const entityDataWithoutManagePrivileges = { privileges: { canManageEntity: false } };
+    const entityDataWithManagePrivileges = { privileges: { canManageEntity: true, canEditProperties: true } };
+    const entityDataWithoutManagePrivileges = { privileges: { canManageEntity: false, canEditProperties: false } };
 
     it('should return true for Terms if manageGlossaries privilege is true', () => {
         const canEditName = getCanEditName(
             EntityType.GlossaryTerm,
             entityDataWithoutManagePrivileges,
+            true,
             platformPrivileges,
         );
 
@@ -21,6 +22,7 @@ describe('getCanEditName', () => {
         const canEditName = getCanEditName(
             EntityType.GlossaryTerm,
             entityDataWithoutManagePrivileges,
+            true,
             privilegesWithoutGlossaries,
         );
 
@@ -32,6 +34,7 @@ describe('getCanEditName', () => {
         const canEditName = getCanEditName(
             EntityType.GlossaryTerm,
             entityDataWithManagePrivileges,
+            true,
             privilegesWithoutGlossaries,
         );
 
@@ -42,6 +45,7 @@ describe('getCanEditName', () => {
         const canEditName = getCanEditName(
             EntityType.GlossaryNode,
             entityDataWithoutManagePrivileges,
+            true,
             platformPrivileges,
         );
 
@@ -53,6 +57,7 @@ describe('getCanEditName', () => {
         const canEditName = getCanEditName(
             EntityType.GlossaryNode,
             entityDataWithoutManagePrivileges,
+            true,
             privilegesWithoutGlossaries,
         );
 
@@ -64,6 +69,7 @@ describe('getCanEditName', () => {
         const canEditName = getCanEditName(
             EntityType.GlossaryNode,
             entityDataWithManagePrivileges,
+            true,
             privilegesWithoutGlossaries,
         );
 
@@ -71,7 +77,12 @@ describe('getCanEditName', () => {
     });
 
     it('should return true for Domains if manageDomains privilege is true', () => {
-        const canEditName = getCanEditName(EntityType.Domain, entityDataWithoutManagePrivileges, platformPrivileges);
+        const canEditName = getCanEditName(
+            EntityType.Domain,
+            entityDataWithoutManagePrivileges,
+            true,
+            platformPrivileges,
+        );
 
         expect(canEditName).toBe(true);
     });
@@ -81,6 +92,7 @@ describe('getCanEditName', () => {
         const canEditName = getCanEditName(
             EntityType.Domain,
             entityDataWithoutManagePrivileges,
+            true,
             privilegesWithoutDomains,
         );
 
@@ -88,7 +100,30 @@ describe('getCanEditName', () => {
     });
 
     it('should return false for an unsupported entity', () => {
-        const canEditName = getCanEditName(EntityType.Chart, entityDataWithManagePrivileges, platformPrivileges);
+        const canEditName = getCanEditName(EntityType.Chart, entityDataWithManagePrivileges, true, platformPrivileges);
+
+        expect(canEditName).toBe(false);
+    });
+
+    it('should return true for a dataset if canEditProperties is true', () => {
+        const canEditName = getCanEditName(EntityType.Chart, entityDataWithManagePrivileges, true, platformPrivileges);
+
+        expect(canEditName).toBe(false);
+    });
+
+    it('should return false for a dataset if canEditProperties is false', () => {
+        const canEditName = getCanEditName(
+            EntityType.Chart,
+            entityDataWithoutManagePrivileges,
+            true,
+            platformPrivileges,
+        );
+
+        expect(canEditName).toBe(false);
+    });
+
+    it('should return false for a dataset if isEditableDatasetNameEnabled is false', () => {
+        const canEditName = getCanEditName(EntityType.Chart, entityDataWithManagePrivileges, false, platformPrivileges);
 
         expect(canEditName).toBe(false);
     });
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeader.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeader.tsx
index 09fa23dbc9f57c..12fa9131f33c73 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeader.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeader.tsx
@@ -17,6 +17,7 @@ import { capitalizeFirstLetterOnly } from '../../../../../shared/textUtil';
 import { useUserContext } from '../../../../../context/useUserContext';
 import { useEntityRegistry } from '../../../../../useEntityRegistry';
 import EntityHeaderLoadingSection from './EntityHeaderLoadingSection';
+import { useIsEditableDatasetNameEnabled } from '../../../../../useAppConfig';
 
 const TitleWrapper = styled.div`
     display: flex;
@@ -59,6 +60,7 @@ const TopButtonsWrapper = styled.div`
 export function getCanEditName(
     entityType: EntityType,
     entityData: GenericEntityProperties | null,
+    isEditableDatasetNameEnabled: boolean,
     privileges?: PlatformPrivileges,
 ) {
     switch (entityType) {
@@ -71,6 +73,8 @@ export function getCanEditName(
             return true; // TODO: add permissions for data products
         case EntityType.BusinessAttribute:
             return privileges?.manageBusinessAttributes;
+        case EntityType.Dataset:
+            return isEditableDatasetNameEnabled && entityData?.privileges?.canEditProperties;
         default:
             return false;
     }
@@ -94,8 +98,15 @@ export const EntityHeader = ({ headerDropdownItems, headerActionItems, isNameEdi
     const entityName = entityData?.name;
     const subType = capitalizeFirstLetterOnly(entityData?.subTypes?.typeNames?.[0]) || undefined;
 
+    const isEditableDatasetNameEnabled = useIsEditableDatasetNameEnabled();
     const canEditName =
-        isNameEditable && getCanEditName(entityType, entityData, me?.platformPrivileges as PlatformPrivileges);
+        isNameEditable &&
+        getCanEditName(
+            entityType,
+            entityData,
+            isEditableDatasetNameEnabled,
+            me?.platformPrivileges as PlatformPrivileges,
+        );
     const entityRegistry = useEntityRegistry();
 
     return (
@@ -106,7 +117,7 @@ export const EntityHeader = ({ headerDropdownItems, headerActionItems, isNameEdi
                         <>
                             <PlatformContent />
                             <TitleWrapper>
-                                <EntityName isNameEditable={canEditName} />
+                                <EntityName isNameEditable={canEditName || false} />
                                 {entityData?.deprecation?.deprecated && (
                                     <DeprecationPill
                                         urn={urn}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealth.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealth.tsx
index 30713afa888b84..ad14d92a3915ae 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealth.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealth.tsx
@@ -24,7 +24,7 @@ export const EntityHealth = ({ health, baseUrl, fontSize, tooltipPlacement }: Pr
     return (
         <>
             {(unhealthy && (
-                <Link to={`${baseUrl}/Validation`}>
+                <Link to={`${baseUrl}/Quality`}>
                     <Container>
                         <EntityHealthPopover health={health} baseUrl={baseUrl} placement={tooltipPlacement}>
                             {icon}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx
index 17e03ff1ddaf64..681f89831b92c4 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx
@@ -140,7 +140,7 @@ export const ContainerSelectModal = ({ onCloseModal, defaultValues, onOkOverride
     return (
         <Modal
             title={titleOverride || 'Select Container'}
-            visible
+            open
             onCancel={onModalClose}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx
index ab63553c6376b8..f0c315332a0537 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx
@@ -195,7 +195,7 @@ export const SetDomainModal = ({ urns, onCloseModal, refetch, defaultValue, onOk
     return (
         <Modal
             title={titleOverride || 'Set Domain'}
-            visible
+            open
             onCancel={onModalClose}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/EntitySidebar.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/EntitySidebar.tsx
index a8d1dceb71ec92..b5e3b221c736d0 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/EntitySidebar.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/EntitySidebar.tsx
@@ -46,7 +46,7 @@ export const EntitySidebar = <T,>({ sidebarSections, topSection }: Props) => {
     return (
         <>
             {topSection && <topSection.component key={`${topSection.component}`} properties={topSection.properties} />}
-            {entityData?.lastIngested && (
+            {!!entityData?.lastIngested && (
                 <LastIngestedSection>
                     <LastIngested lastIngested={entityData.lastIngested} />
                 </LastIngestedSection>
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx
index ff26b5d8aa4c5f..62b967e8f7b30d 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx
@@ -336,7 +336,7 @@ export const EditOwnersModal = ({
     return (
         <Modal
             title={title || `${operationType === OperationType.ADD ? 'Add' : 'Remove'} Owners`}
-            visible
+            open
             onCancel={onModalClose}
             keyboard
             footer={
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx
index 7e8007f354f8c6..6a5f90e872c4fe 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx
@@ -137,7 +137,7 @@ export const SelectPlatformModal = ({ onCloseModal, defaultValues, onOk, titleOv
     return (
         <Modal
             title={titleOverride || 'Select Platform'}
-            visible
+            open
             onCancel={onModalClose}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/entity/shared/propagation/PropagationDetails.tsx b/datahub-web-react/src/app/entity/shared/propagation/PropagationDetails.tsx
new file mode 100644
index 00000000000000..646f47134938c4
--- /dev/null
+++ b/datahub-web-react/src/app/entity/shared/propagation/PropagationDetails.tsx
@@ -0,0 +1,109 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Popover } from 'antd';
+import { StringMapEntry } from '../../../../types.generated';
+import PropagationEntityLink from './PropagationEntityLink';
+import { usePropagationDetails } from './utils';
+import { PropagateThunderbolt, PropagateThunderboltFilled } from './PropagationIcon';
+
+const PopoverWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+const PopoverTitle = styled.div`
+    font-weight: bold;
+    font-size: 14px;
+    padding: 6px 0px;
+    color: #eeecfa;
+`;
+
+const PopoverDescription = styled.div`
+    max-width: 340px;
+    font-size: 14px;
+    color: #eeecfa;
+    display: inline;
+    padding: 0px 0px 8px 0px;
+`;
+
+const PopoverAttributes = styled.div`
+    display: flex;
+`;
+
+const PopoverAttribute = styled.div`
+    margin-right: 12px;
+    margin-bottom: 4px;
+`;
+
+const PopoverAttributeTitle = styled.div`
+    font-size: 14px;
+    color: #eeecfa;
+    font-weight: bold;
+    margin: 8px 0px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+`;
+
+const PopoverDocumentation = styled.a`
+    margin-top: 12px;
+`;
+
+interface Props {
+    sourceDetail?: StringMapEntry[] | null;
+}
+
+export default function PropagationDetails({ sourceDetail }: Props) {
+    const {
+        isPropagated,
+        origin: { entity: originEntity },
+        via: { entity: viaEntity },
+    } = usePropagationDetails(sourceDetail);
+
+    if (!sourceDetail || !isPropagated) return null;
+
+    const popoverContent =
+        originEntity || viaEntity ? (
+            <PopoverWrapper>
+                <PopoverDescription>
+                    This description was automatically propagated from an upstream column.{' '}
+                    <PopoverDocumentation
+                        target="_blank"
+                        rel="noreferrer"
+                        href="https://datahubproject.io/docs/automations/docs-propagation"
+                    >
+                        Learn more
+                    </PopoverDocumentation>
+                </PopoverDescription>
+                <PopoverAttributes>
+                    {originEntity && originEntity.urn !== viaEntity?.urn && (
+                        <PopoverAttribute>
+                            <PopoverAttributeTitle>Origin</PopoverAttributeTitle>
+                            <PropagationEntityLink entity={originEntity} />
+                        </PopoverAttribute>
+                    )}
+                    {viaEntity && (
+                        <PopoverAttribute>
+                            <PopoverAttributeTitle>Via</PopoverAttributeTitle>
+                            <PropagationEntityLink entity={viaEntity} />
+                        </PopoverAttribute>
+                    )}
+                </PopoverAttributes>
+            </PopoverWrapper>
+        ) : undefined;
+
+    return (
+        <Popover
+            overlayInnerStyle={{ backgroundColor: '#272D48' }}
+            showArrow={false}
+            title={
+                <PopoverTitle>
+                    <PropagateThunderboltFilled />
+                    Propagated Description
+                </PopoverTitle>
+            }
+            content={popoverContent}
+        >
+            <PropagateThunderbolt data-testid="docPropagationIndicator" />
+        </Popover>
+    );
+}
diff --git a/datahub-web-react/src/app/entity/shared/propagation/PropagationEntityLink.tsx b/datahub-web-react/src/app/entity/shared/propagation/PropagationEntityLink.tsx
new file mode 100644
index 00000000000000..8c1285dd5808b1
--- /dev/null
+++ b/datahub-web-react/src/app/entity/shared/propagation/PropagationEntityLink.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Link } from 'react-router-dom';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { Entity, EntityType, SchemaFieldEntity } from '../../../../types.generated';
+import { GenericEntityProperties } from '../types';
+
+const PreviewImage = styled.img<{ size: number }>`
+    height: ${(props) => props.size}px;
+    width: ${(props) => props.size}px;
+    min-width: ${(props) => props.size}px;
+    object-fit: contain;
+    background-color: transparent;
+    margin: 0px 4px 0px 0px;
+`;
+
+const StyledLink = styled(Link)`
+    margin-right: 4px;
+    display: flex;
+    align-items: center;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+`;
+
+interface Props {
+    entity: Entity;
+}
+
+export default function PropagationEntityLink({ entity }: Props) {
+    const entityRegistry = useEntityRegistry();
+
+    const isSchemaField = entity.type === EntityType.SchemaField;
+    const baseEntity = isSchemaField ? (entity as SchemaFieldEntity).parent : entity;
+
+    const logoUrl = (baseEntity as GenericEntityProperties)?.platform?.properties?.logoUrl || '';
+    let entityUrl = entityRegistry.getEntityUrl(baseEntity.type, baseEntity.urn);
+    let entityDisplayName = entityRegistry.getDisplayName(baseEntity.type, baseEntity);
+
+    if (isSchemaField) {
+        entityUrl = `${entityUrl}/${encodeURIComponent('Columns')}?schemaFilter=${encodeURIComponent(
+            (entity as SchemaFieldEntity).fieldPath,
+        )}`;
+        const schemaFieldName = entityRegistry.getDisplayName(entity.type, entity);
+        entityDisplayName = `${entityDisplayName}.${schemaFieldName}`;
+    }
+
+    return (
+        <>
+            <StyledLink to={entityUrl}>
+                <PreviewImage src={logoUrl} alt="test" size={14} />
+                {entityDisplayName}
+            </StyledLink>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entity/shared/propagation/PropagationIcon.tsx b/datahub-web-react/src/app/entity/shared/propagation/PropagationIcon.tsx
new file mode 100644
index 00000000000000..01b4570c4ca0df
--- /dev/null
+++ b/datahub-web-react/src/app/entity/shared/propagation/PropagationIcon.tsx
@@ -0,0 +1,22 @@
+import styled from 'styled-components';
+import { ThunderboltFilled } from '@ant-design/icons';
+import { REDESIGN_COLORS } from '../constants';
+
+export const PropagateThunderbolt = styled(ThunderboltFilled)`
+    && {
+        color: #a7c7fa;
+    }
+    font-size: 16px;
+    &:hover {
+        color: ${REDESIGN_COLORS.BLUE};
+    }
+    margin-right: 4px;
+`;
+
+export const PropagateThunderboltFilled = styled(ThunderboltFilled)`
+    && {
+        color: ${REDESIGN_COLORS.BLUE};
+    }
+    font-size: 16px;
+    margin-right: 4px;
+`;
diff --git a/datahub-web-react/src/app/entity/shared/propagation/utils.ts b/datahub-web-react/src/app/entity/shared/propagation/utils.ts
new file mode 100644
index 00000000000000..d8b4d4d931f4ee
--- /dev/null
+++ b/datahub-web-react/src/app/entity/shared/propagation/utils.ts
@@ -0,0 +1,24 @@
+import { StringMapEntry } from '../../../../types.generated';
+import { useGetEntities } from '../useGetEntities';
+
+export function usePropagationDetails(sourceDetail?: StringMapEntry[] | null) {
+    const isPropagated = !!sourceDetail?.find((mapEntry) => mapEntry.key === 'propagated' && mapEntry.value === 'true');
+    const originEntityUrn = sourceDetail?.find((mapEntry) => mapEntry.key === 'origin')?.value || '';
+    const viaEntityUrn = sourceDetail?.find((mapEntry) => mapEntry.key === 'via')?.value || '';
+
+    const entities = useGetEntities([originEntityUrn, viaEntityUrn]);
+    const originEntity = entities.find((e) => e.urn === originEntityUrn);
+    const viaEntity = entities.find((e) => e.urn === viaEntityUrn);
+
+    return {
+        isPropagated,
+        origin: {
+            urn: originEntityUrn,
+            entity: originEntity,
+        },
+        via: {
+            urn: viaEntityUrn,
+            entity: viaEntity,
+        },
+    };
+}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/GovernanceTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/GovernanceTab.tsx
new file mode 100644
index 00000000000000..213716ed501c5b
--- /dev/null
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/GovernanceTab.tsx
@@ -0,0 +1,85 @@
+import React, { useEffect } from 'react';
+import { Button } from 'antd';
+import { useHistory, useLocation } from 'react-router';
+import styled from 'styled-components';
+import { FileDoneOutlined } from '@ant-design/icons';
+import { useEntityData } from '../../../EntityContext';
+import { TestResults } from './TestResults';
+import TabToolbar from '../../../components/styled/TabToolbar';
+import { ANTD_GRAY } from '../../../constants';
+import { useGetValidationsTab } from '../Validations/useGetValidationsTab';
+
+const TabTitle = styled.span`
+    margin-left: 4px;
+`;
+
+const TabButton = styled(Button)<{ selected: boolean }>`
+    background-color: ${(props) => (props.selected && ANTD_GRAY[3]) || 'none'};
+    margin-left: 4px;
+`;
+
+enum TabPaths {
+    TESTS = 'Tests',
+}
+
+const DEFAULT_TAB = TabPaths.TESTS;
+
+/**
+ * Component used for rendering the Entity Governance Tab.
+ */
+export const GovernanceTab = () => {
+    const { entityData } = useEntityData();
+    const history = useHistory();
+    const { pathname } = useLocation();
+
+    const passingTests = (entityData as any)?.testResults?.passing || [];
+    const maybeFailingTests = (entityData as any)?.testResults?.failing || [];
+    const totalTests = maybeFailingTests.length + passingTests.length;
+
+    const { selectedTab, basePath } = useGetValidationsTab(pathname, Object.values(TabPaths));
+
+    // If no tab was selected, select a default tab.
+    useEffect(() => {
+        if (!selectedTab) {
+            // Route to the default tab.
+            history.replace(`${basePath}/${DEFAULT_TAB}`);
+        }
+    }, [selectedTab, basePath, history]);
+
+    /**
+     * The top-level Toolbar tabs to display.
+     */
+    const tabs = [
+        {
+            title: (
+                <>
+                    <FileDoneOutlined />
+                    <TabTitle>Tests ({totalTests})</TabTitle>
+                </>
+            ),
+            path: TabPaths.TESTS,
+            disabled: totalTests === 0,
+            content: <TestResults passing={passingTests} failing={maybeFailingTests} />,
+        },
+    ];
+
+    return (
+        <>
+            <TabToolbar>
+                <div>
+                    {tabs.map((tab) => (
+                        <TabButton
+                            type="text"
+                            disabled={tab.disabled}
+                            selected={selectedTab === tab.path}
+                            onClick={() => history.replace(`${basePath}/${tab.path}`)}
+                        >
+                            {tab.title}
+                        </TabButton>
+                    ))}
+                </div>
+            </TabToolbar>
+            {tabs.filter((tab) => tab.path === selectedTab).map((tab) => tab.content)}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/TestResults.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResults.tsx
similarity index 100%
rename from datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/TestResults.tsx
rename to datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResults.tsx
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/TestResultsList.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsList.tsx
similarity index 100%
rename from datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/TestResultsList.tsx
rename to datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsList.tsx
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/TestResultsSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsSummary.tsx
similarity index 100%
rename from datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/TestResultsSummary.tsx
rename to datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsSummary.tsx
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/testUtils.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/testUtils.tsx
similarity index 100%
rename from datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/testUtils.tsx
rename to datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/testUtils.tsx
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx
index 33f9652bb3fd39..063408fbf55a65 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx
@@ -147,7 +147,7 @@ export default function QueryBuilderModal({ initialState, datasetUrn, onClose, o
                 bodyStyle={MODAL_BODY_STYLE}
                 title={<Typography.Text>{isUpdating ? 'Edit' : 'New'} Query</Typography.Text>}
                 className="query-builder-modal"
-                visible
+                open
                 onCancel={confirmClose}
                 footer={
                     <>
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx
index a663dfffaaabf0..cff45f153c9481 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx
@@ -1,9 +1,10 @@
 import React from 'react';
 import styled from 'styled-components';
 import { DeleteOutlined, MoreOutlined } from '@ant-design/icons';
-import { Dropdown, Menu, message, Modal } from 'antd';
+import { Dropdown, message, Modal } from 'antd';
 import { useDeleteQueryMutation } from '../../../../../../graphql/query.generated';
 import handleGraphQLError from '../../../../../shared/handleGraphQLError';
+import { MenuItemStyle } from '../../../../view/menu/item/styledComponent';
 
 const StyledMoreOutlined = styled(MoreOutlined)`
     font-size: 14px;
@@ -52,17 +53,19 @@ export default function QueryCardDetailsMenu({ urn, onDeleted, index }: Props) {
         });
     };
 
+    const items = [
+        {
+            key: 0,
+            label: (
+                <MenuItemStyle onClick={confirmDeleteQuery} data-testid={`query-delete-button-${index}`}>
+                    <DeleteOutlined /> &nbsp; Delete
+                </MenuItemStyle>
+            ),
+        },
+    ];
+
     return (
-        <Dropdown
-            overlay={
-                <Menu>
-                    <Menu.Item key="0" onClick={confirmDeleteQuery} data-testid={`query-delete-button-${index}`}>
-                        <DeleteOutlined /> &nbsp; Delete
-                    </Menu.Item>
-                </Menu>
-            }
-            trigger={['click']}
-        >
+        <Dropdown menu={{ items }} trigger={['click']}>
             <StyledMoreOutlined data-testid={`query-more-button-${index}`} />
         </Dropdown>
     );
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryModal.tsx
index 985f2094b0fb1f..32ac91071a3ec4 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryModal.tsx
@@ -72,7 +72,7 @@ type Props = {
 export default function QueryModal({ query, title, description, showDetails = true, onClose }: Props) {
     return (
         <StyledModal
-            visible
+            open
             width={MODAL_WIDTH}
             title={null}
             closable={false}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab.tsx
index 1eb534f965bf67..c44bddc2c30d1f 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab.tsx
@@ -219,7 +219,7 @@ export const RelationshipsTab = () => {
                     table1Schema={entityWithSchema}
                     table2={table2LazyDataset}
                     table2Schema={table2LazySchema}
-                    visible={modalVisible}
+                    open={modalVisible}
                     setModalVisible={setModalVisible}
                     onCancel={() => {
                         setModalVisible(false);
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/MenuColumn.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/MenuColumn.tsx
index b5cd7add41c84f..8c97bfbf598bd0 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/MenuColumn.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/MenuColumn.tsx
@@ -2,11 +2,12 @@ import React from 'react';
 import { VscGraphLeft } from 'react-icons/vsc';
 import { CopyOutlined } from '@ant-design/icons';
 import styled from 'styled-components/macro';
-import { Dropdown, Menu } from 'antd';
+import { Dropdown } from 'antd';
 import { MenuIcon } from '../../../../EntityDropdown/EntityDropdown';
 import { useEntityData, useRouteToTab } from '../../../../EntityContext';
 import { SchemaField } from '../../../../../../../types.generated';
 import { generateSchemaFieldUrn } from '../../../Lineage/utils';
+import { MenuItemStyle } from '../../../../../view/menu/item/styledComponent';
 
 export const ImpactAnalysisIcon = styled(VscGraphLeft)`
     transform: scaleX(-1);
@@ -18,14 +19,6 @@ export const CopyOutlinedIcon = styled(CopyOutlined)`
     font-size: 16px;
 `;
 
-const MenuItem = styled.div`
-    align-items: center;
-    display: flex;
-    font-size: 12px;
-    padding: 0 4px;
-    color: #262626;
-`;
-
 interface Props {
     field: SchemaField;
 }
@@ -35,43 +28,49 @@ export default function MenuColumn({ field }: Props) {
     const { urn } = useEntityData();
     const selectedColumnUrn = generateSchemaFieldUrn(field.fieldPath, urn);
 
+    const items = [
+        {
+            key: 0,
+            label: (
+                <MenuItemStyle
+                    onClick={() => routeToTab({ tabName: 'Lineage', tabParams: { column: field.fieldPath } })}
+                >
+                    <ImpactAnalysisIcon /> &nbsp; See Column Lineage
+                </MenuItemStyle>
+            ),
+        },
+        navigator.clipboard
+            ? {
+                  key: 1,
+                  label: (
+                      <MenuItemStyle
+                          onClick={() => {
+                              navigator.clipboard.writeText(field.fieldPath);
+                          }}
+                      >
+                          <CopyOutlinedIcon /> &nbsp; Copy Column Field Path
+                      </MenuItemStyle>
+                  ),
+              }
+            : null,
+        navigator.clipboard
+            ? {
+                  key: 2,
+                  label: (
+                      <MenuItemStyle
+                          onClick={() => {
+                              navigator.clipboard.writeText(selectedColumnUrn || '');
+                          }}
+                      >
+                          <CopyOutlinedIcon /> &nbsp; Copy Column Urn
+                      </MenuItemStyle>
+                  ),
+              }
+            : null,
+    ];
+
     return (
-        <Dropdown
-            overlay={
-                <Menu>
-                    <Menu.Item key="0">
-                        <MenuItem
-                            onClick={() => routeToTab({ tabName: 'Lineage', tabParams: { column: field.fieldPath } })}
-                        >
-                            <ImpactAnalysisIcon /> &nbsp; See Column Lineage
-                        </MenuItem>
-                    </Menu.Item>
-                    {navigator.clipboard && (
-                        <Menu.Item key="1">
-                            <MenuItem
-                                onClick={() => {
-                                    navigator.clipboard.writeText(field.fieldPath);
-                                }}
-                            >
-                                <CopyOutlinedIcon /> &nbsp; Copy Column Field Path
-                            </MenuItem>
-                        </Menu.Item>
-                    )}
-                    {navigator.clipboard && (
-                        <Menu.Item key="2">
-                            <MenuItem
-                                onClick={() => {
-                                    navigator.clipboard.writeText(selectedColumnUrn || '');
-                                }}
-                            >
-                                <CopyOutlinedIcon /> &nbsp; Copy Column Urn
-                            </MenuItem>
-                        </Menu.Item>
-                    )}
-                </Menu>
-            }
-            trigger={['click']}
-        >
+        <Dropdown menu={{ items }} trigger={['click']}>
             <MenuIcon fontSize={16} />
         </Dropdown>
     );
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx
index be95cba3ab4f07..e64a1436b0b1c5 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx
@@ -6,6 +6,8 @@ import styled from 'styled-components';
 import { SectionHeader, StyledDivider } from './components';
 import UpdateDescriptionModal from '../../../../../components/legacy/DescriptionModal';
 import { EditableSchemaFieldInfo, SchemaField, SubResourceType } from '../../../../../../../../types.generated';
+import { getFieldDescriptionDetails } from '../../utils/getFieldDescriptionDetails';
+import PropagationDetails from '../../../../../propagation/PropagationDetails';
 import DescriptionSection from '../../../../../containers/profile/sidebar/AboutSection/DescriptionSection';
 import { useEntityData, useMutationUrn, useRefetch } from '../../../../../EntityContext';
 import { useSchemaRefetch } from '../../SchemaContext';
@@ -13,11 +15,6 @@ import { useUpdateDescriptionMutation } from '../../../../../../../../graphql/mu
 import analytics, { EntityActionType, EventType } from '../../../../../../../analytics';
 import SchemaEditableContext from '../../../../../../../shared/SchemaEditableContext';
 
-const DescriptionWrapper = styled.div`
-    display: flex;
-    justify-content: space-between;
-`;
-
 const EditIcon = styled(Button)`
     border: none;
     box-shadow: none;
@@ -25,6 +22,13 @@ const EditIcon = styled(Button)`
     width: 20px;
 `;
 
+const DescriptionWrapper = styled.div`
+    display: flex;
+    gap: 4px;
+    align-items: center;
+    justify-content: space-between;
+`;
+
 interface Props {
     expandedField: SchemaField;
     editableFieldInfo?: EditableSchemaFieldInfo;
@@ -76,7 +80,13 @@ export default function FieldDescription({ expandedField, editableFieldInfo }: P
         },
     });
 
-    const displayedDescription = editableFieldInfo?.description || expandedField.description;
+    const { schemaFieldEntity, description } = expandedField;
+    const { displayedDescription, isPropagated, sourceDetail, propagatedDescription } = getFieldDescriptionDetails({
+        schemaFieldEntity,
+        editableFieldInfo,
+        defaultDescription: description,
+    });
+
     const baDescription =
         expandedField?.schemaFieldEntity?.businessAttributes?.businessAttribute?.businessAttribute?.properties
             ?.description;
@@ -87,12 +97,17 @@ export default function FieldDescription({ expandedField, editableFieldInfo }: P
             <DescriptionWrapper>
                 <div>
                     <SectionHeader>Description</SectionHeader>
-                    <DescriptionSection
-                        description={displayedDescription || ''}
-                        baDescription={baDescription || ''}
-                        baUrn={baUrn || ''}
-                        isExpandable
-                    />
+                    <DescriptionWrapper>
+                        {isPropagated && <PropagationDetails sourceDetail={sourceDetail} />}
+                        {!!displayedDescription && (
+                            <DescriptionSection
+                                description={displayedDescription || ''}
+                                baDescription={baDescription || ''}
+                                baUrn={baUrn || ''}
+                                isExpandable
+                            />
+                        )}
+                    </DescriptionWrapper>
                 </div>
                 {isSchemaEditable && (
                     <EditIcon
@@ -114,6 +129,7 @@ export default function FieldDescription({ expandedField, editableFieldInfo }: P
                                 .catch(onFailMutation);
                             setIsModalVisible(false);
                         }}
+                        propagatedDescription={propagatedDescription || ''}
                         isAddDesc={!displayedDescription}
                     />
                 )}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx
index 8c88cdce95f06f..689a191f469f53 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx
@@ -4,6 +4,8 @@ import { SchemaField, StdDataType } from '../../../../../../../../types.generate
 import { SectionHeader, StyledDivider } from './components';
 import { mapStructuredPropertyValues } from '../../../../Properties/useStructuredProperties';
 import StructuredPropertyValue from '../../../../Properties/StructuredPropertyValue';
+import { EditColumn } from '../../../../Properties/Edit/EditColumn';
+import { useGetEntityWithSchema } from '../../useGetEntitySchema';
 
 const PropertyTitle = styled.div`
     font-size: 14px;
@@ -13,6 +15,8 @@ const PropertyTitle = styled.div`
 
 const PropertyWrapper = styled.div`
     margin-bottom: 12px;
+    display: flex;
+    justify-content: space-between;
 `;
 
 const PropertiesWrapper = styled.div`
@@ -29,6 +33,7 @@ interface Props {
 
 export default function FieldProperties({ expandedField }: Props) {
     const { schemaFieldEntity } = expandedField;
+    const { refetch } = useGetEntityWithSchema(true);
 
     if (!schemaFieldEntity?.structuredProperties?.properties?.length) return null;
 
@@ -43,23 +48,33 @@ export default function FieldProperties({ expandedField }: Props) {
                     const hasMultipleValues = valuesData.length > 1;
 
                     return (
-                        <PropertyWrapper>
-                            <PropertyTitle>{structuredProp.structuredProperty.definition.displayName}</PropertyTitle>
-                            {hasMultipleValues ? (
-                                <StyledList>
-                                    {valuesData.map((value) => (
-                                        <li>
+                        <PropertyWrapper key={structuredProp.structuredProperty.urn}>
+                            <div>
+                                <PropertyTitle>
+                                    {structuredProp.structuredProperty.definition.displayName}
+                                </PropertyTitle>
+                                {hasMultipleValues ? (
+                                    <StyledList>
+                                        {valuesData.map((value) => (
+                                            <li>
+                                                <StructuredPropertyValue value={value} isRichText={isRichText} />
+                                            </li>
+                                        ))}
+                                    </StyledList>
+                                ) : (
+                                    <>
+                                        {valuesData.map((value) => (
                                             <StructuredPropertyValue value={value} isRichText={isRichText} />
-                                        </li>
-                                    ))}
-                                </StyledList>
-                            ) : (
-                                <>
-                                    {valuesData.map((value) => (
-                                        <StructuredPropertyValue value={value} isRichText={isRichText} />
-                                    ))}
-                                </>
-                            )}
+                                        ))}
+                                    </>
+                                )}
+                            </div>
+                            <EditColumn
+                                structuredProperty={structuredProp.structuredProperty}
+                                associatedUrn={schemaFieldEntity.urn}
+                                values={valuesData.map((v) => v.value) || []}
+                                refetch={refetch}
+                            />
                         </PropertyWrapper>
                     );
                 })}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts
new file mode 100644
index 00000000000000..6434baddb77a66
--- /dev/null
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts
@@ -0,0 +1,25 @@
+import { EditableSchemaFieldInfo, SchemaFieldEntity } from '../../../../../../../types.generated';
+
+interface Props {
+    schemaFieldEntity?: SchemaFieldEntity | null;
+    editableFieldInfo?: EditableSchemaFieldInfo;
+    defaultDescription?: string | null;
+}
+
+export function getFieldDescriptionDetails({ schemaFieldEntity, editableFieldInfo, defaultDescription }: Props) {
+    const documentation = schemaFieldEntity?.documentation?.documentations?.[0];
+    const isUsingDocumentationAspect = !editableFieldInfo?.description && !!documentation;
+    const isPropagated =
+        isUsingDocumentationAspect &&
+        !!documentation?.attribution?.sourceDetail?.find(
+            (mapEntry) => mapEntry.key === 'propagated' && mapEntry.value === 'true',
+        );
+
+    const displayedDescription =
+        editableFieldInfo?.description || documentation?.documentation || defaultDescription || '';
+
+    const sourceDetail = documentation?.attribution?.sourceDetail;
+    const propagatedDescription = documentation?.documentation;
+
+    return { displayedDescription, isPropagated, sourceDetail, propagatedDescription };
+}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx
index 73e6d2ca6e9b3e..bb70c2cb493037 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx
@@ -6,6 +6,7 @@ import { useUpdateDescriptionMutation } from '../../../../../../../graphql/mutat
 import { useMutationUrn, useRefetch } from '../../../../EntityContext';
 import { useSchemaRefetch } from '../SchemaContext';
 import { pathMatchesNewPath } from '../../../../../dataset/profile/schema/utils/utils';
+import { getFieldDescriptionDetails } from './getFieldDescriptionDetails';
 
 export default function useDescriptionRenderer(editableSchemaMetadata: EditableSchemaMetadata | null | undefined) {
     const urn = useMutationUrn();
@@ -21,10 +22,16 @@ export default function useDescriptionRenderer(editableSchemaMetadata: EditableS
     };
 
     return (description: string, record: SchemaField, index: number): JSX.Element => {
-        const relevantEditableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo.find(
-            (candidateEditableFieldInfo) => pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, record.fieldPath),
+        const editableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo.find((candidateEditableFieldInfo) =>
+            pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, record.fieldPath),
         );
-        const displayedDescription = relevantEditableFieldInfo?.description || description;
+        const { schemaFieldEntity } = record;
+        const { displayedDescription, isPropagated, sourceDetail } = getFieldDescriptionDetails({
+            schemaFieldEntity,
+            editableFieldInfo,
+            defaultDescription: description,
+        });
+
         const sanitizedDescription = DOMPurify.sanitize(displayedDescription);
         const original = record.description ? DOMPurify.sanitize(record.description) : undefined;
         const businessAttributeDescription =
@@ -43,7 +50,7 @@ export default function useDescriptionRenderer(editableSchemaMetadata: EditableS
                 baExpanded={!!expandedBARows[index]}
                 description={sanitizedDescription}
                 original={original}
-                isEdited={!!relevantEditableFieldInfo?.description}
+                isEdited={!!editableFieldInfo?.description}
                 onUpdate={(updatedDescription) =>
                     updateDescription({
                         variables: {
@@ -56,6 +63,8 @@ export default function useDescriptionRenderer(editableSchemaMetadata: EditableS
                         },
                     }).then(refresh)
                 }
+                isPropagated={isPropagated}
+                sourceDetail={sourceDetail}
                 isReadOnly
             />
         );
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx
index 11ec85d65da420..0b2eb6db1c6f0f 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx
@@ -84,7 +84,7 @@ export default function ProfilingRunsChart({ profiles }: Props) {
     return (
         <>
             {selectedProfile && (
-                <Modal width="100%" footer={null} title={profileModalTitle} visible={showModal} onCancel={onClose}>
+                <Modal width="100%" footer={null} title={profileModalTitle} open={showModal} onCancel={onClose}>
                     <TableStats
                         rowCount={selectedProfile.rowCount || -1}
                         columnCount={selectedProfile.columnCount || -1}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/AssertionMenu.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/AssertionMenu.tsx
deleted file mode 100644
index 888f41d9d5847e..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/AssertionMenu.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import { Menu } from 'antd';
-import CopyUrnMenuItem from '../../../../../shared/share/items/CopyUrnMenuItem';
-
-interface AssertionMenuProps {
-    urn: string;
-}
-
-export default function AssertionMenu({ urn }: AssertionMenuProps) {
-    return (
-        <Menu>
-            <CopyUrnMenuItem key="1" urn={urn} type="Assertion" />
-        </Menu>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx
index daebfd55975884..3318baf6d0c609 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx
@@ -362,7 +362,7 @@ export const DatasetAssertionDescription = ({ description, assertionInfo }: Prop
             )}
             <DatasetAssertionLogicModal
                 logic={logic || 'N/A'}
-                visible={isLogicVisible}
+                open={isLogicVisible}
                 onClose={() => setIsLogicVisible(false)}
             />
         </Popover>
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx
index 549a10ecd24cde..627deb163c2a06 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx
@@ -11,13 +11,13 @@ export type AssertionsSummary = {
 
 type Props = {
     logic: string;
-    visible: boolean;
+    open: boolean;
     onClose: () => void;
 };
 
-export const DatasetAssertionLogicModal = ({ logic, visible, onClose }: Props) => {
+export const DatasetAssertionLogicModal = ({ logic, open, onClose }: Props) => {
     return (
-        <Modal visible={visible} onCancel={onClose} footer={<Button onClick={onClose}>Close</Button>}>
+        <Modal open={open} onCancel={onClose} footer={<Button onClick={onClose}>Close</Button>}>
             <Query query={logic} />
         </Modal>
     );
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx
index 4d0e475d5dad14..af8f9434558498 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx
@@ -17,11 +17,11 @@ import { Assertion, AssertionRunStatus, DataContract, EntityType } from '../../.
 import { getResultColor, getResultIcon, getResultText } from './assertionUtils';
 import { useDeleteAssertionMutation } from '../../../../../../graphql/assertion.generated';
 import { capitalizeFirstLetterOnly } from '../../../../../shared/textUtil';
-import AssertionMenu from './AssertionMenu';
 import { REDESIGN_COLORS } from '../../../constants';
 import { useEntityRegistry } from '../../../../../useEntityRegistry';
 import { isAssertionPartOfContract } from './contract/utils';
 import { useEntityData } from '../../../EntityContext';
+import CopyUrnMenuItem from '../../../../../shared/share/items/CopyUrnMenuItem';
 
 const ResultContainer = styled.div`
     display: flex;
@@ -136,6 +136,15 @@ export const DatasetAssertionsList = ({
             assertion.runEvents.runEvents[0].result?.type,
     }));
 
+    const assertionMenuItems = (urn: string) => {
+        return [
+            {
+                key: 1,
+                label: <CopyUrnMenuItem key="1" urn={urn} type="Assertion" />,
+            },
+        ];
+    };
+
     const assertionsTableCols = [
         {
             title: '',
@@ -188,7 +197,7 @@ export const DatasetAssertionsList = ({
                                             to={`${entityRegistry.getEntityUrl(
                                                 EntityType.Dataset,
                                                 entityData.urn,
-                                            )}/Validation/Data Contract`}
+                                            )}/Quality/Data Contract`}
                                             style={{ color: REDESIGN_COLORS.BLUE }}
                                         >
                                             view
@@ -200,7 +209,7 @@ export const DatasetAssertionsList = ({
                                     to={`${entityRegistry.getEntityUrl(
                                         EntityType.Dataset,
                                         entityData.urn,
-                                    )}/Validation/Data Contract`}
+                                    )}/Quality/Data Contract`}
                                 >
                                     <DataContractLogo />
                                 </Link>
@@ -215,9 +224,9 @@ export const DatasetAssertionsList = ({
             title: '',
             dataIndex: '',
             key: '',
-            render: (_, record: any) => (
-                <>
-                    {showMenu && (
+            render: (_, record: any) => {
+                return (
+                    showMenu && (
                         <ActionButtonContainer>
                             <Tooltip
                                 title={
@@ -244,13 +253,13 @@ export const DatasetAssertionsList = ({
                             <Button onClick={() => onDeleteAssertion(record.urn)} type="text" shape="circle" danger>
                                 <DeleteOutlined />
                             </Button>
-                            <Dropdown overlay={<AssertionMenu urn={record.urn} />} trigger={['click']}>
+                            <Dropdown menu={{ items: assertionMenuItems(record.urn) }} trigger={['click']}>
                                 <StyledMoreOutlined />
                             </Dropdown>
                         </ActionButtonContainer>
-                    )}
-                </>
-            ),
+                    )
+                );
+            },
         },
     ];
 
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/ValidationsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/ValidationsTab.tsx
index 92af9bfc2b567b..006823db53fd44 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/ValidationsTab.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/ValidationsTab.tsx
@@ -2,9 +2,8 @@ import React, { useEffect } from 'react';
 import { Button } from 'antd';
 import { useHistory, useLocation } from 'react-router';
 import styled from 'styled-components';
-import { AuditOutlined, FileDoneOutlined, FileProtectOutlined } from '@ant-design/icons';
+import { AuditOutlined, FileProtectOutlined } from '@ant-design/icons';
 import { useEntityData } from '../../../EntityContext';
-import { TestResults } from './TestResults';
 import { Assertions } from './Assertions';
 import TabToolbar from '../../../components/styled/TabToolbar';
 import { useGetValidationsTab } from './useGetValidationsTab';
@@ -22,8 +21,7 @@ const TabButton = styled(Button)<{ selected: boolean }>`
 `;
 
 enum TabPaths {
-    ASSERTIONS = 'Assertions',
-    TESTS = 'Tests',
+    ASSERTIONS = 'List',
     DATA_CONTRACT = 'Data Contract',
 }
 
@@ -39,9 +37,6 @@ export const ValidationsTab = () => {
     const appConfig = useAppConfig();
 
     const totalAssertions = (entityData as any)?.assertions?.total;
-    const passingTests = (entityData as any)?.testResults?.passing || [];
-    const maybeFailingTests = (entityData as any)?.testResults?.failing || [];
-    const totalTests = maybeFailingTests.length + passingTests.length;
 
     const { selectedTab, basePath } = useGetValidationsTab(pathname, Object.values(TabPaths));
 
@@ -68,17 +63,6 @@ export const ValidationsTab = () => {
             disabled: totalAssertions === 0,
             content: <Assertions />,
         },
-        {
-            title: (
-                <>
-                    <FileDoneOutlined />
-                    <TabTitle>Tests ({totalTests})</TabTitle>
-                </>
-            ),
-            path: TabPaths.TESTS,
-            disabled: totalTests === 0,
-            content: <TestResults passing={passingTests} failing={maybeFailingTests} />,
-        },
     ];
 
     if (appConfig.config.featureFlags?.dataContractsEnabled) {
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts
index 52689a225eae15..f65c337215ed90 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts
@@ -2,37 +2,37 @@ import { useGetValidationsTab } from '../useGetValidationsTab';
 
 describe('useGetValidationsTab', () => {
     it('should correctly extract valid tab', () => {
-        const pathname = '/dataset/urn:li:abc/Validation/Assertions';
-        const tabNames = ['Assertions'];
+        const pathname = '/dataset/urn:li:abc/Quality/List';
+        const tabNames = ['List'];
         const res = useGetValidationsTab(pathname, tabNames);
-        expect(res.selectedTab).toEqual('Assertions');
-        expect(res.basePath).toEqual('/dataset/urn:li:abc/Validation');
+        expect(res.selectedTab).toEqual('List');
+        expect(res.basePath).toEqual('/dataset/urn:li:abc/Quality');
     });
     it('should extract undefined for invalid tab', () => {
-        const pathname = '/dataset/urn:li:abc/Validation/Assertions';
+        const pathname = '/dataset/urn:li:abc/Quality/Assertions';
         const tabNames = ['Tests'];
         const res = useGetValidationsTab(pathname, tabNames);
         expect(res.selectedTab).toBeUndefined();
-        expect(res.basePath).toEqual('/dataset/urn:li:abc/Validation');
+        expect(res.basePath).toEqual('/dataset/urn:li:abc/Quality');
     });
     it('should extract undefined for missing tab', () => {
-        const pathname = '/dataset/urn:li:abc/Validation';
+        const pathname = '/dataset/urn:li:abc/Quality';
         const tabNames = ['Tests'];
         const res = useGetValidationsTab(pathname, tabNames);
         expect(res.selectedTab).toBeUndefined();
-        expect(res.basePath).toEqual('/dataset/urn:li:abc/Validation');
+        expect(res.basePath).toEqual('/dataset/urn:li:abc/Quality');
     });
     it('should handle trailing slashes', () => {
-        let pathname = '/dataset/urn:li:abc/Validation/Assertions/';
+        let pathname = '/dataset/urn:li:abc/Quality/Assertions/';
         let tabNames = ['Assertions'];
         let res = useGetValidationsTab(pathname, tabNames);
         expect(res.selectedTab).toEqual('Assertions');
-        expect(res.basePath).toEqual('/dataset/urn:li:abc/Validation');
+        expect(res.basePath).toEqual('/dataset/urn:li:abc/Quality');
 
-        pathname = '/dataset/urn:li:abc/Validation/';
+        pathname = '/dataset/urn:li:abc/Quality/';
         tabNames = ['Assertions'];
         res = useGetValidationsTab(pathname, tabNames);
         expect(res.selectedTab).toBeUndefined();
-        expect(res.basePath).toEqual('/dataset/urn:li:abc/Validation');
+        expect(res.basePath).toEqual('/dataset/urn:li:abc/Quality');
     });
 });
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx
index 75a8fe0410918b..e678ce5c334ea8 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx
@@ -52,7 +52,7 @@ export const DataContractBuilderModal = ({ entityUrn, initialState, onSubmit, on
                 title={<Typography.Text>{titleText}</Typography.Text>}
                 style={modalStyle}
                 bodyStyle={modalBodyStyle}
-                visible
+                open
                 onCancel={onCancel}
             >
                 <DataContractBuilder
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx
index 75045c50b43e76..fe91668ef064f2 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx
@@ -52,7 +52,7 @@ export const DescriptionPreviewModal = ({ description, editMode, onClose }: Desc
                 style={modalStyle}
                 bodyStyle={bodyStyle}
                 title={undefined}
-                visible
+                open
                 footer={null}
                 closable={false}
                 onCancel={onConfirmClose}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx
index ce54fe711da837..72a7b9c5e9cf25 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx
@@ -12,7 +12,7 @@ export const DiscardDescriptionModal = ({ cancelModalVisible, onDiscard, onCance
         <>
             <Modal
                 title="Exit Editor"
-                visible={cancelModalVisible}
+                open={cancelModalVisible}
                 destroyOnClose
                 onCancel={onCancel}
                 footer={[
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx
index 9f94a830ac1cfa..7212198bbf61ca 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx
@@ -107,7 +107,7 @@ export const LinkList = ({ refetch }: LinkListProps) => {
         <>
             <Modal
                 title="Edit Link"
-                visible={editModalVisble}
+                open={editModalVisble}
                 destroyOnClose
                 onCancel={handleClose}
                 footer={[
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx
index 0037677962155e..5dc18564a01e91 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx
@@ -37,7 +37,7 @@ export const AddImageButton = () => {
                 commandName="insertImage"
                 onClick={handleButtonClick}
             />
-            <Modal title="Add Image" visible={isModalVisible} okText="Save" onOk={handleOk} onCancel={handleCancel}>
+            <Modal title="Add Image" open={isModalVisible} okText="Save" onOk={handleOk} onCancel={handleCancel}>
                 <Form form={form} layout="vertical" colon={false} requiredMark={false}>
                     <Form.Item
                         name="src"
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx
index 4693ebbcb54c4a..f448d649ca99a9 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx
@@ -24,7 +24,7 @@ export const AddLinkButton = () => {
                 commandName="insertLink"
                 onClick={handleButtonClick}
             />
-            <LinkModal visible={isModalVisible} handleClose={handleClose} />
+            <LinkModal open={isModalVisible} handleClose={handleClose} />
         </>
     );
 };
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx
index 24e87853b58c7f..bcd8e44b367619 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx
@@ -112,7 +112,7 @@ export const FloatingToolbar = () => {
                     </ToolbarContainer>
                 </FloatingWrapper>
             )}
-            <LinkModal visible={isModalVisible} handleClose={handleClose} />
+            <LinkModal open={isModalVisible} handleClose={handleClose} />
         </>
     );
 };
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/LinkModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/LinkModal.tsx
index 14698291575c4b..81fce2635f12ef 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/LinkModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/LinkModal.tsx
@@ -5,12 +5,12 @@ import { useAttrs, useCommands, useEditorState, useHelpers } from '@remirror/rea
 import { getMarkRange } from '@remirror/core-utils';
 
 type LinkModalProps = {
-    visible: boolean;
+    open: boolean;
     handleClose: () => void;
 };
 
 export const LinkModal = (props: LinkModalProps) => {
-    const { visible, handleClose } = props;
+    const { open, handleClose } = props;
 
     const [trPos, setTrPos] = useState<FromToProps>({ from: 0, to: 0 });
     const [form] = Form.useForm();
@@ -22,7 +22,7 @@ export const LinkModal = (props: LinkModalProps) => {
     const href = (useAttrs().link()?.href as string) ?? '';
 
     useEffect(() => {
-        if (visible) {
+        if (open) {
             const { from, to } = editorState.selection;
             const pos = getMarkRange(editorState.doc.resolve(from), 'link') || { from, to };
 
@@ -34,7 +34,7 @@ export const LinkModal = (props: LinkModalProps) => {
             setTrPos(pos);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [visible]);
+    }, [open]);
 
     const handleOk = async () => {
         try {
@@ -58,7 +58,7 @@ export const LinkModal = (props: LinkModalProps) => {
     };
 
     return (
-        <Modal title="Add Link" okText="Save" onCancel={handleClose} onOk={handleOk} visible={visible}>
+        <Modal title="Add Link" okText="Save" onCancel={handleClose} onOk={handleOk} open={open}>
             <Form
                 form={form}
                 layout="vertical"
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/TableCellMenu.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/TableCellMenu.tsx
index 54dffffed50db4..6ab3574aafb1d5 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/TableCellMenu.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/TableCellMenu.tsx
@@ -1,8 +1,9 @@
 import React from 'react';
-import { Dropdown, Menu } from 'antd';
+import { Dropdown } from 'antd';
 import styled from 'styled-components';
 import { useActive, useCommands } from '@remirror/react';
 import { DeleteOutlined, DownOutlined, PlusOutlined } from '@ant-design/icons';
+import { MenuItemStyle } from '../../../../../../view/menu/item/styledComponent';
 
 const StyledDropdownButton = styled(Dropdown.Button)`
     position: absolute;
@@ -24,47 +25,85 @@ export const TableCellMenu = () => {
     const active = useActive();
     const commands = useCommands();
 
-    const menu = (
-        <Menu>
-            <Menu.Item
-                icon={<PlusOutlined />}
-                disabled={active.tableHeaderCell()}
-                onClick={() => commands.addTableRowBefore()}
-            >
-                Insert row above
-            </Menu.Item>
-            <Menu.Item icon={<PlusOutlined />} onClick={() => commands.addTableRowAfter()}>
-                Insert row below
-            </Menu.Item>
-            <Menu.Item icon={<PlusOutlined />} onClick={() => commands.addTableColumnBefore()}>
-                Insert column left
-            </Menu.Item>
-            <Menu.Item icon={<PlusOutlined />} onClick={() => commands.addTableColumnAfter()}>
-                Insert column right
-            </Menu.Item>
-            <Menu.Divider />
-            <Menu.Item
-                icon={<DeleteOutlined />}
-                disabled={active.tableHeaderCell()}
-                onClick={() => commands.deleteTableRow()}
-            >
-                Delete row
-            </Menu.Item>
-            <Menu.Item icon={<DeleteOutlined />} onClick={() => commands.deleteTableColumn()}>
-                Delete column
-            </Menu.Item>
-            <Menu.Item icon={<DeleteOutlined />} onClick={() => commands.deleteTable()}>
-                Delete table
-            </Menu.Item>
-        </Menu>
-    );
+    const divider = {
+        key: 'divider',
+        type: 'divider',
+    };
+
+    const items = [
+        {
+            key: 0,
+            label: (
+                <MenuItemStyle
+                    icon={<PlusOutlined />}
+                    disabled={active.tableHeaderCell()}
+                    onClick={() => commands.addTableRowBefore()}
+                >
+                    Insert row above
+                </MenuItemStyle>
+            ),
+        },
+        {
+            key: 1,
+            label: (
+                <MenuItemStyle icon={<PlusOutlined />} onClick={() => commands.addTableRowAfter()}>
+                    Insert row below
+                </MenuItemStyle>
+            ),
+        },
+        {
+            key: 2,
+            label: (
+                <MenuItemStyle icon={<PlusOutlined />} onClick={() => commands.addTableColumnBefore()}>
+                    Insert column left
+                </MenuItemStyle>
+            ),
+        },
+        {
+            key: 3,
+            label: (
+                <MenuItemStyle icon={<PlusOutlined />} onClick={() => commands.addTableColumnAfter()}>
+                    Insert column right
+                </MenuItemStyle>
+            ),
+        },
+        divider,
+        {
+            key: 4,
+            label: (
+                <MenuItemStyle
+                    icon={<DeleteOutlined />}
+                    disabled={active.tableHeaderCell()}
+                    onClick={() => commands.deleteTableRow()}
+                >
+                    Delete row
+                </MenuItemStyle>
+            ),
+        },
+        {
+            key: 5,
+            label: (
+                <MenuItemStyle icon={<DeleteOutlined />} onClick={() => commands.deleteTableColumn()}>
+                    Delete column
+                </MenuItemStyle>
+            ),
+        },
+        {
+            key: 6,
+            label: (
+                <MenuItemStyle icon={<DeleteOutlined />} onClick={() => commands.deleteTable()}>
+                    Delete table
+                </MenuItemStyle>
+            ),
+        },
+    ];
 
     return (
         <StyledDropdownButton
             size="small"
             icon={<DownOutlined />}
             placement="bottomLeft"
-            overlay={menu}
+            menu={{ items }}
             type="primary"
         />
     );
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Incident/IncidentTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Incident/IncidentTab.tsx
index 47627068ad4ce5..f2b03a11ffb55a 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Incident/IncidentTab.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Incident/IncidentTab.tsx
@@ -87,7 +87,7 @@ export const IncidentTab = () => {
                     </Button>
                     <AddIncidentModal
                         refetch={refetch}
-                        visible={isRaiseIncidentModalVisible}
+                        open={isRaiseIncidentModalVisible}
                         onClose={() => setIsRaiseIncidentModalVisible(false)}
                     />
                 </TabToolbar>
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/AddIncidentModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/AddIncidentModal.tsx
index bb83f0f9ddaf76..fda8c9cda2d0da 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/AddIncidentModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/AddIncidentModal.tsx
@@ -11,12 +11,12 @@ import handleGraphQLError from '../../../../../shared/handleGraphQLError';
 import { useUserContext } from '../../../../../context/useUserContext';
 
 type AddIncidentProps = {
-    visible: boolean;
+    open: boolean;
     onClose?: () => void;
     refetch?: () => Promise<any>;
 };
 
-export const AddIncidentModal = ({ visible, onClose, refetch }: AddIncidentProps) => {
+export const AddIncidentModal = ({ open, onClose, refetch }: AddIncidentProps) => {
     const { urn, entityType } = useEntityData();
     const { user } = useUserContext();
     const incidentTypes = INCIDENT_DISPLAY_TYPES;
@@ -109,7 +109,7 @@ export const AddIncidentModal = ({ visible, onClose, refetch }: AddIncidentProps
         <>
             <Modal
                 title="Raise Incident"
-                visible={visible}
+                open={open}
                 destroyOnClose
                 onCancel={handleClose}
                 footer={[
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentListItem.tsx b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentListItem.tsx
index 4c9f83ab766213..dc123398cd2da4 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentListItem.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentListItem.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import styled from 'styled-components';
-import { Button, Dropdown, List, Menu, message, Popover, Tag, Tooltip, Typography } from 'antd';
+import { Button, Dropdown, List, message, Popover, Tag, Tooltip, Typography } from 'antd';
 import { CheckCircleFilled, CheckOutlined, MoreOutlined, WarningFilled } from '@ant-design/icons';
 import { Link } from 'react-router-dom';
 import { EntityType, IncidentState, IncidentType } from '../../../../../../types.generated';
@@ -13,6 +13,7 @@ import analytics, { EntityActionType, EventType } from '../../../../../analytics
 import { useUpdateIncidentStatusMutation } from '../../../../../../graphql/mutations.generated';
 import { ResolveIncidentModal } from './ResolveIncidentModal';
 import handleGraphQLError from '../../../../../shared/handleGraphQLError';
+import { MenuItemStyle } from '../../../../view/menu/item/styledComponent';
 
 type Props = {
     incident: any;
@@ -141,13 +142,6 @@ const MenuIcon = styled(MoreOutlined)`
     margin-left: 5px;
 `;
 
-const MenuItem = styled.div`
-    font-size: 12px;
-    padding-left: 12px;
-    padding-right: 12px;
-    color: rgba(0, 0, 0, 0.85);
-`;
-
 export default function IncidentListItem({ incident, refetch }: Props) {
     const { entityType } = useEntityData();
     const refetchEntity = useRefetch();
@@ -203,15 +197,19 @@ export default function IncidentListItem({ incident, refetch }: Props) {
         setIsResolvedModalVisible(!isResolvedModalVisible);
     };
 
-    const menu = (
-        <Menu>
-            <Menu.Item key="0">
-                <MenuItem onClick={() => updateIncidentStatus(IncidentState.Active, '')} data-testid="reopen-incident">
+    const items = [
+        {
+            key: 0,
+            label: (
+                <MenuItemStyle
+                    onClick={() => updateIncidentStatus(IncidentState.Active, '')}
+                    data-testid="reopen-incident"
+                >
                     Reopen incident
-                </MenuItem>
-            </Menu.Item>
-        </Menu>
-    );
+                </MenuItemStyle>
+            ),
+        },
+    ];
 
     return (
         <>
@@ -296,7 +294,7 @@ export default function IncidentListItem({ incident, refetch }: Props) {
                             <CheckCircleFilled
                                 style={{ fontSize: '28px', color: SUCCESS_COLOR_HEX, marginLeft: '16px' }}
                             />
-                            <Dropdown overlay={menu} trigger={['click']}>
+                            <Dropdown menu={{ items }} trigger={['click']}>
                                 <MenuIcon data-testid="incident-menu" />
                             </Dropdown>
                         </IncidentResolvedTextContainer>
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/ResolveIncidentModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/ResolveIncidentModal.tsx
index b915ef0a76a3f9..cdc82420a73b23 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/ResolveIncidentModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/ResolveIncidentModal.tsx
@@ -31,7 +31,7 @@ export const ResolveIncidentModal = ({
         <>
             <Modal
                 title="Resolve Incident"
-                visible={isResolvedModalVisible}
+                open={isResolvedModalVisible}
                 destroyOnClose
                 onCancel={handleClose}
                 footer={[
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx
index ac50df6a5381ed..6a0599c0cdb33d 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx
@@ -1,16 +1,19 @@
 import { Button } from 'antd';
 import React, { useState } from 'react';
-import { PropertyRow } from '../types';
 import EditStructuredPropertyModal from './EditStructuredPropertyModal';
+import { StructuredPropertyEntity } from '../../../../../../types.generated';
 
 interface Props {
-    propertyRow: PropertyRow;
+    structuredProperty?: StructuredPropertyEntity;
+    associatedUrn?: string;
+    values?: (string | number | null)[];
+    refetch?: () => void;
 }
 
-export function EditColumn({ propertyRow }: Props) {
+export function EditColumn({ structuredProperty, associatedUrn, values, refetch }: Props) {
     const [isEditModalVisible, setIsEditModalVisible] = useState(false);
 
-    if (!propertyRow.structuredProperty || propertyRow.structuredProperty?.definition.immutable) {
+    if (!structuredProperty || structuredProperty?.definition.immutable) {
         return null;
     }
 
@@ -21,9 +24,11 @@ export function EditColumn({ propertyRow }: Props) {
             </Button>
             <EditStructuredPropertyModal
                 isOpen={isEditModalVisible}
-                propertyRow={propertyRow}
-                structuredProperty={propertyRow.structuredProperty}
+                structuredProperty={structuredProperty}
+                associatedUrn={associatedUrn}
+                values={values}
                 closeModal={() => setIsEditModalVisible(false)}
+                refetch={refetch}
             />
         </>
     );
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx
index 73a280031ebd09..c8def8bef5e195 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx
@@ -1,7 +1,6 @@
 import { Button, Modal, message } from 'antd';
-import React from 'react';
+import React, { useEffect, useMemo } from 'react';
 import styled from 'styled-components';
-import { PropertyRow } from '../types';
 import StructuredPropertyInput from '../../../components/styled/StructuredProperty/StructuredPropertyInput';
 import { PropertyValueInput, StructuredPropertyEntity } from '../../../../../../types.generated';
 import { useUpsertStructuredPropertiesMutation } from '../../../../../../graphql/structuredProperties.generated';
@@ -17,19 +16,33 @@ const Description = styled.div`
 
 interface Props {
     isOpen: boolean;
-    propertyRow: PropertyRow;
     structuredProperty: StructuredPropertyEntity;
+    associatedUrn?: string;
+    values?: (string | number | null)[];
     closeModal: () => void;
+    refetch?: () => void;
 }
 
-export default function EditStructuredPropertyModal({ isOpen, propertyRow, structuredProperty, closeModal }: Props) {
-    const { refetch } = useEntityContext();
-    const urn = useMutationUrn();
-    const initialValues = propertyRow.values?.map((v) => v.value) || [];
-    const { selectedValues, selectSingleValue, toggleSelectedValue, updateSelectedValues } =
+export default function EditStructuredPropertyModal({
+    isOpen,
+    structuredProperty,
+    associatedUrn,
+    values,
+    closeModal,
+    refetch,
+}: Props) {
+    const { refetch: entityRefetch } = useEntityContext();
+    const mutationUrn = useMutationUrn();
+    const urn = associatedUrn || mutationUrn;
+    const initialValues = useMemo(() => values || [], [values]);
+    const { selectedValues, selectSingleValue, toggleSelectedValue, updateSelectedValues, setSelectedValues } =
         useEditStructuredProperty(initialValues);
     const [upsertStructuredProperties] = useUpsertStructuredPropertiesMutation();
 
+    useEffect(() => {
+        setSelectedValues(initialValues);
+    }, [isOpen, initialValues, setSelectedValues]);
+
     function upsertProperties() {
         message.loading('Updating...');
         upsertStructuredProperties({
@@ -51,7 +64,11 @@ export default function EditStructuredPropertyModal({ isOpen, propertyRow, struc
             },
         })
             .then(() => {
-                refetch();
+                if (refetch) {
+                    refetch();
+                } else {
+                    entityRefetch();
+                }
                 message.destroy();
                 message.success('Successfully updated structured property!');
                 closeModal();
@@ -67,7 +84,7 @@ export default function EditStructuredPropertyModal({ isOpen, propertyRow, struc
 
     return (
         <Modal
-            title={propertyRow.displayName}
+            title={structuredProperty.definition.displayName}
             onCancel={closeModal}
             open={isOpen}
             width={650}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/PropertiesTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/PropertiesTab.tsx
index b56434fa9c48bf..eeff8fc2e27953 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/PropertiesTab.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/PropertiesTab.tsx
@@ -41,7 +41,12 @@ export const PropertiesTab = () => {
         propertyTableColumns.push({
             title: '',
             width: '10%',
-            render: (propertyRow: PropertyRow) => <EditColumn propertyRow={propertyRow} />,
+            render: (propertyRow: PropertyRow) => (
+                <EditColumn
+                    structuredProperty={propertyRow.structuredProperty}
+                    values={propertyRow.values?.map((v) => v.value) || []}
+                />
+            ),
         } as any);
     }
 
diff --git a/datahub-web-react/src/app/entity/shared/useGetEntities.ts b/datahub-web-react/src/app/entity/shared/useGetEntities.ts
new file mode 100644
index 00000000000000..9391bc17d7a8a2
--- /dev/null
+++ b/datahub-web-react/src/app/entity/shared/useGetEntities.ts
@@ -0,0 +1,18 @@
+import { useEffect, useState } from 'react';
+import { useGetEntitiesQuery } from '../../../graphql/entity.generated';
+import { Entity } from '../../../types.generated';
+
+export function useGetEntities(urns: string[]): Entity[] {
+    const [verifiedUrns, setVerifiedUrns] = useState<string[]>([]);
+
+    useEffect(() => {
+        urns.forEach((urn) => {
+            if (urn.startsWith('urn:li:') && !verifiedUrns.includes(urn)) {
+                setVerifiedUrns((prevUrns) => [...prevUrns, urn]);
+            }
+        });
+    }, [urns, verifiedUrns]);
+
+    const { data } = useGetEntitiesQuery({ variables: { urns: verifiedUrns }, skip: !verifiedUrns.length });
+    return (data?.entities || []) as Entity[];
+}
diff --git a/datahub-web-react/src/app/entity/user/UserEditProfileModal.tsx b/datahub-web-react/src/app/entity/user/UserEditProfileModal.tsx
index d9314df7e11ae7..7096534c992940 100644
--- a/datahub-web-react/src/app/entity/user/UserEditProfileModal.tsx
+++ b/datahub-web-react/src/app/entity/user/UserEditProfileModal.tsx
@@ -16,7 +16,7 @@ type PropsData = {
 };
 
 type Props = {
-    visible: boolean;
+    open: boolean;
     onClose: () => void;
     onSave: () => void;
     editModalData: PropsData;
@@ -24,7 +24,7 @@ type Props = {
 /** Regex Validations */
 export const USER_NAME_REGEX = new RegExp('^[a-zA-Z ]*$');
 
-export default function UserEditProfileModal({ visible, onClose, onSave, editModalData }: Props) {
+export default function UserEditProfileModal({ open, onClose, onSave, editModalData }: Props) {
     const { config } = useAppConfig();
     const { readOnlyModeEnabled } = config.featureFlags;
     const [updateCorpUserPropertiesMutation] = useUpdateCorpUserPropertiesMutation();
@@ -95,7 +95,7 @@ export default function UserEditProfileModal({ visible, onClose, onSave, editMod
     return (
         <Modal
             title="Edit Profile"
-            visible={visible}
+            open={open}
             onCancel={onClose}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/entity/user/UserInfoSideBar.tsx b/datahub-web-react/src/app/entity/user/UserInfoSideBar.tsx
index 4e3dc45489b552..8d3b1b43bad56b 100644
--- a/datahub-web-react/src/app/entity/user/UserInfoSideBar.tsx
+++ b/datahub-web-react/src/app/entity/user/UserInfoSideBar.tsx
@@ -174,7 +174,7 @@ export default function UserInfoSideBar({ sideBarData, refetch }: Props) {
             </SideBar>
             {/* Modal */}
             <UserEditProfileModal
-                visible={editProfileModal}
+                open={editProfileModal}
                 onClose={() => showEditProfileModal(false)}
                 onSave={() => {
                     refetch();
diff --git a/datahub-web-react/src/app/entity/view/builder/ViewBuilderModal.tsx b/datahub-web-react/src/app/entity/view/builder/ViewBuilderModal.tsx
index a69e7e156ba9a2..ff49a9d06d1ead 100644
--- a/datahub-web-react/src/app/entity/view/builder/ViewBuilderModal.tsx
+++ b/datahub-web-react/src/app/entity/view/builder/ViewBuilderModal.tsx
@@ -77,7 +77,7 @@ export const ViewBuilderModal = ({ mode, urn, initialState, onSubmit, onCancel }
                 }
                 style={modalStyle}
                 bodyStyle={modalBodyStyle}
-                visible
+                open
                 width={modalWidth}
                 onCancel={onCancel}
                 data-testid="view-modal"
diff --git a/datahub-web-react/src/app/entity/view/menu/ViewDropdownMenu.tsx b/datahub-web-react/src/app/entity/view/menu/ViewDropdownMenu.tsx
index 38deb4052b7a93..f75240aba2f0d0 100644
--- a/datahub-web-react/src/app/entity/view/menu/ViewDropdownMenu.tsx
+++ b/datahub-web-react/src/app/entity/view/menu/ViewDropdownMenu.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import styled from 'styled-components';
 import { useApolloClient } from '@apollo/client';
 import { MoreOutlined } from '@ant-design/icons';
-import { Dropdown, Menu, message, Modal } from 'antd';
+import { Dropdown, message, Modal } from 'antd';
 import { DataHubView, DataHubViewType } from '../../../../types.generated';
 import { useUserContext } from '../../../context/useUserContext';
 import { useUpdateCorpUserViewsSettingsMutation } from '../../../../graphql/user.generated';
@@ -33,17 +33,6 @@ const MenuButton = styled(MoreOutlined)`
     }
 `;
 
-const MenuStyled = styled(Menu)`
-    &&& {
-        .ant-dropdown-menu-item:not(:hover) {
-            background: none;
-        }
-        .ant-dropdown-menu-item:hover {
-            background: #f5f5f5;
-        }
-    }
-`;
-
 const DEFAULT_VIEW_BUILDER_STATE = {
     mode: ViewBuilderMode.EDITOR,
     visible: false,
@@ -240,28 +229,42 @@ export const ViewDropdownMenu = ({
     const showRemoveGlobalDefaultView = canManageGlobalViews && isGlobalView && isGlobalDefault;
     const showSetGlobalDefaultView = canManageGlobalViews && isGlobalView && !isGlobalDefault;
 
+    const items = [
+        {
+            key: 0,
+            label: (canManageView && <EditViewItem key="0" onClick={onEditView} />) || (
+                <PreviewViewItem key="0" onClick={onPreviewView} />
+            ),
+        },
+        {
+            key: 1,
+            label: (isUserDefault && <RemoveUserDefaultItem key="1" onClick={() => setUserDefault(null)} />) || (
+                <SetUserDefaultItem key="1" onClick={() => setUserDefault(view.urn)} />
+            ),
+        },
+        showRemoveGlobalDefaultView
+            ? {
+                  key: 2,
+                  label: <RemoveGlobalDefaultItem key="2" onClick={() => setGlobalDefault(null)} />,
+              }
+            : null,
+        showSetGlobalDefaultView
+            ? {
+                  key: 2,
+                  label: <SetGlobalDefaultItem key="2" onClick={() => setGlobalDefault(view.urn)} />,
+              }
+            : null,
+        canManageView
+            ? {
+                  key: 3,
+                  label: <DeleteViewItem key="3" onClick={confirmDeleteView} />,
+              }
+            : null,
+    ];
+
     return (
         <>
-            <Dropdown
-                overlay={
-                    <MenuStyled>
-                        {(canManageView && <EditViewItem key="0" onClick={onEditView} />) || (
-                            <PreviewViewItem key="0" onClick={onPreviewView} />
-                        )}
-                        {(isUserDefault && <RemoveUserDefaultItem key="1" onClick={() => setUserDefault(null)} />) || (
-                            <SetUserDefaultItem key="1" onClick={() => setUserDefault(view.urn)} />
-                        )}
-                        {showRemoveGlobalDefaultView && (
-                            <RemoveGlobalDefaultItem key="2" onClick={() => setGlobalDefault(null)} />
-                        )}
-                        {showSetGlobalDefaultView && (
-                            <SetGlobalDefaultItem key="2" onClick={() => setGlobalDefault(view.urn)} />
-                        )}
-                        {canManageView && <DeleteViewItem key="3" onClick={confirmDeleteView} />}
-                    </MenuStyled>
-                }
-                trigger={[trigger]}
-            >
+            <Dropdown menu={{ items }} trigger={[trigger]}>
                 <MenuButton data-testid="views-table-dropdown" style={{ display: visible ? undefined : 'none' }} />
             </Dropdown>
             {viewBuilderState.visible && (
diff --git a/datahub-web-react/src/app/entity/view/menu/item/DeleteViewItem.tsx b/datahub-web-react/src/app/entity/view/menu/item/DeleteViewItem.tsx
index b8513c23ebe4fb..c6dce2c01e23c3 100644
--- a/datahub-web-react/src/app/entity/view/menu/item/DeleteViewItem.tsx
+++ b/datahub-web-react/src/app/entity/view/menu/item/DeleteViewItem.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { DeleteOutlined } from '@ant-design/icons';
-import { Menu } from 'antd';
 import { IconItemTitle } from './IconItemTitle';
+import { MenuItemStyle } from './styledComponent';
 
 type Props = {
     key: string;
@@ -13,8 +13,8 @@ type Props = {
  */
 export const DeleteViewItem = ({ key, onClick }: Props) => {
     return (
-        <Menu.Item key={key} onClick={onClick} data-testid="view-dropdown-delete">
+        <MenuItemStyle key={key} onClick={onClick} data-testid="view-dropdown-delete">
             <IconItemTitle tip="Delete this View" title="Delete" icon={<DeleteOutlined />} />
-        </Menu.Item>
+        </MenuItemStyle>
     );
 };
diff --git a/datahub-web-react/src/app/entity/view/menu/item/EditViewItem.tsx b/datahub-web-react/src/app/entity/view/menu/item/EditViewItem.tsx
index 650bc239957ab6..5301f9977126d1 100644
--- a/datahub-web-react/src/app/entity/view/menu/item/EditViewItem.tsx
+++ b/datahub-web-react/src/app/entity/view/menu/item/EditViewItem.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormOutlined } from '@ant-design/icons';
-import { Menu } from 'antd';
 import { IconItemTitle } from './IconItemTitle';
+import { MenuItemStyle } from './styledComponent';
 
 type Props = {
     key: string;
@@ -13,8 +13,8 @@ type Props = {
  */
 export const EditViewItem = ({ key, onClick }: Props) => {
     return (
-        <Menu.Item key={key} onClick={onClick} data-testid="view-dropdown-edit">
+        <MenuItemStyle key={key} onClick={onClick} data-testid="view-dropdown-edit">
             <IconItemTitle tip="Edit this View" title="Edit" icon={<FormOutlined />} />
-        </Menu.Item>
+        </MenuItemStyle>
     );
 };
diff --git a/datahub-web-react/src/app/entity/view/menu/item/PreviewViewItem.tsx b/datahub-web-react/src/app/entity/view/menu/item/PreviewViewItem.tsx
index 24b122feeb2354..eb64ec8101a5b0 100644
--- a/datahub-web-react/src/app/entity/view/menu/item/PreviewViewItem.tsx
+++ b/datahub-web-react/src/app/entity/view/menu/item/PreviewViewItem.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { Menu } from 'antd';
 import { EyeOutlined } from '@ant-design/icons';
 import { IconItemTitle } from './IconItemTitle';
+import { MenuItemStyle } from './styledComponent';
 
 type Props = {
     key: string;
@@ -13,8 +13,8 @@ type Props = {
  */
 export const PreviewViewItem = ({ key, onClick }: Props) => {
     return (
-        <Menu.Item key={key} onClick={onClick}>
+        <MenuItemStyle key={key} onClick={onClick}>
             <IconItemTitle tip="See the View definition." title="Preview" icon={<EyeOutlined />} />
-        </Menu.Item>
+        </MenuItemStyle>
     );
 };
diff --git a/datahub-web-react/src/app/entity/view/menu/item/RemoveGlobalDefaultItem.tsx b/datahub-web-react/src/app/entity/view/menu/item/RemoveGlobalDefaultItem.tsx
index 10977fcc4470e9..0b6657892169b7 100644
--- a/datahub-web-react/src/app/entity/view/menu/item/RemoveGlobalDefaultItem.tsx
+++ b/datahub-web-react/src/app/entity/view/menu/item/RemoveGlobalDefaultItem.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { StopOutlined } from '@ant-design/icons';
-import { Menu } from 'antd';
 import { IconItemTitle } from './IconItemTitle';
+import { MenuItemStyle } from './styledComponent';
 
 type Props = {
     key: string;
@@ -13,12 +13,12 @@ type Props = {
  */
 export const RemoveGlobalDefaultItem = ({ key, onClick }: Props) => {
     return (
-        <Menu.Item key={key} onClick={onClick}>
+        <MenuItemStyle key={key} onClick={onClick}>
             <IconItemTitle
                 tip="Remove this View as your organization's default."
                 title="Remove organization default"
                 icon={<StopOutlined />}
             />
-        </Menu.Item>
+        </MenuItemStyle>
     );
 };
diff --git a/datahub-web-react/src/app/entity/view/menu/item/RemoveUserDefaultItem.tsx b/datahub-web-react/src/app/entity/view/menu/item/RemoveUserDefaultItem.tsx
index d07d54f6b929b3..612bcd0a0a431a 100644
--- a/datahub-web-react/src/app/entity/view/menu/item/RemoveUserDefaultItem.tsx
+++ b/datahub-web-react/src/app/entity/view/menu/item/RemoveUserDefaultItem.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { StopOutlined } from '@ant-design/icons';
-import { Menu } from 'antd';
 import { IconItemTitle } from './IconItemTitle';
+import { MenuItemStyle } from './styledComponent';
 
 type Props = {
     key: string;
@@ -13,12 +13,12 @@ type Props = {
  */
 export const RemoveUserDefaultItem = ({ key, onClick }: Props) => {
     return (
-        <Menu.Item key={key} onClick={onClick} data-testid="view-dropdown-remove-user-default">
+        <MenuItemStyle key={key} onClick={onClick} data-testid="view-dropdown-remove-user-default">
             <IconItemTitle
                 tip="Remove this View as your personal default."
                 title="Remove as default"
                 icon={<StopOutlined />}
             />
-        </Menu.Item>
+        </MenuItemStyle>
     );
 };
diff --git a/datahub-web-react/src/app/entity/view/menu/item/SetGlobalDefaultItem.tsx b/datahub-web-react/src/app/entity/view/menu/item/SetGlobalDefaultItem.tsx
index 7461565c22ec5a..94e1adb280c2f8 100644
--- a/datahub-web-react/src/app/entity/view/menu/item/SetGlobalDefaultItem.tsx
+++ b/datahub-web-react/src/app/entity/view/menu/item/SetGlobalDefaultItem.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { Menu } from 'antd';
 import { GlobalDefaultViewIcon } from '../../shared/GlobalDefaultViewIcon';
 import { IconItemTitle } from './IconItemTitle';
+import { MenuItemStyle } from './styledComponent';
 
 type Props = {
     key: string;
@@ -13,12 +13,12 @@ type Props = {
  */
 export const SetGlobalDefaultItem = ({ key, onClick }: Props) => {
     return (
-        <Menu.Item key={key} onClick={onClick} data-testid="view-dropdown-set-global-default">
+        <MenuItemStyle key={key} onClick={onClick} data-testid="view-dropdown-set-global-default">
             <IconItemTitle
                 tip="Make this View your organization's default. All new users will have this View applied automatically."
                 title="Make organization default"
                 icon={<GlobalDefaultViewIcon />}
             />
-        </Menu.Item>
+        </MenuItemStyle>
     );
 };
diff --git a/datahub-web-react/src/app/entity/view/menu/item/SetUserDefaultItem.tsx b/datahub-web-react/src/app/entity/view/menu/item/SetUserDefaultItem.tsx
index 3149f06294c009..4eea8e5c2c65c1 100644
--- a/datahub-web-react/src/app/entity/view/menu/item/SetUserDefaultItem.tsx
+++ b/datahub-web-react/src/app/entity/view/menu/item/SetUserDefaultItem.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { Menu } from 'antd';
 import { UserDefaultViewIcon } from '../../shared/UserDefaultViewIcon';
 import { IconItemTitle } from './IconItemTitle';
+import { MenuItemStyle } from './styledComponent';
 
 type Props = {
     key: string;
@@ -13,12 +13,12 @@ type Props = {
  */
 export const SetUserDefaultItem = ({ key, onClick }: Props) => {
     return (
-        <Menu.Item key={key} onClick={onClick} data-testid="view-dropdown-set-user-default">
+        <MenuItemStyle key={key} onClick={onClick} data-testid="view-dropdown-set-user-default">
             <IconItemTitle
                 tip="Make this View your personal default. You will have this View applied automatically."
                 title="Make my default"
                 icon={<UserDefaultViewIcon />}
             />
-        </Menu.Item>
+        </MenuItemStyle>
     );
 };
diff --git a/datahub-web-react/src/app/entity/view/menu/item/styledComponent.ts b/datahub-web-react/src/app/entity/view/menu/item/styledComponent.ts
new file mode 100644
index 00000000000000..7534dd391c4726
--- /dev/null
+++ b/datahub-web-react/src/app/entity/view/menu/item/styledComponent.ts
@@ -0,0 +1,11 @@
+import MenuItem from 'antd/lib/menu/MenuItem';
+import styled from 'styled-components';
+
+export const MenuItemStyle = styled(MenuItem)`
+    &&&& {
+        background-color: transparent;
+        a {
+            color: inherit;
+        }
+    }
+`;
diff --git a/datahub-web-react/src/app/home/AcrylDemoBanner.tsx b/datahub-web-react/src/app/home/AcrylDemoBanner.tsx
index 0a85c0c3d7f6c2..debcaab879ba94 100644
--- a/datahub-web-react/src/app/home/AcrylDemoBanner.tsx
+++ b/datahub-web-react/src/app/home/AcrylDemoBanner.tsx
@@ -42,7 +42,7 @@ export default function AcrylDemoBanner() {
         <BannerWrapper>
             <Logo src={AcrylLogo} />
             <TextWrapper>
-                <Title>Schedule a Demo of Managed DataHub</Title>
+                <Title>Schedule a Demo of DataHub Cloud</Title>
                 <TextContent>
                     DataHub is already the industry&apos;s #1 Open Source Data Catalog.{' '}
                     <StyledLink
@@ -52,8 +52,8 @@ export default function AcrylDemoBanner() {
                     >
                         Schedule a demo
                     </StyledLink>{' '}
-                    of Acryl DataHub to see the advanced features that take it to the next level or purchase Acryl Cloud
-                    on{' '}
+                    of DataHub Cloud to see the advanced features that take it to the next level or purchase DataHub
+                    Cloud on{' '}
                     <StyledLink
                         href="https://aws.amazon.com/marketplace/pp/prodview-ratzv4k453pck?sr=0-1&ref_=beagle&applicationId=AWSMPContessa"
                         target="_blank"
diff --git a/datahub-web-react/src/app/identity/group/AssignRoletoGroupConfirmation.tsx b/datahub-web-react/src/app/identity/group/AssignRoletoGroupConfirmation.tsx
index f08b607222de66..513a85c97ffc15 100644
--- a/datahub-web-react/src/app/identity/group/AssignRoletoGroupConfirmation.tsx
+++ b/datahub-web-react/src/app/identity/group/AssignRoletoGroupConfirmation.tsx
@@ -5,7 +5,7 @@ import { DataHubRole } from '../../../types.generated';
 import analytics, { EventType } from '../../analytics';
 
 type Props = {
-    visible: boolean;
+    open: boolean;
     roleToAssign: DataHubRole | undefined;
     groupName: string;
     groupUrn: string;
@@ -14,7 +14,7 @@ type Props = {
 };
 
 export default function AssignRoletoGroupConfirmation({
-    visible,
+    open,
     roleToAssign,
     groupName,
     groupUrn,
@@ -63,5 +63,5 @@ export default function AssignRoletoGroupConfirmation({
         ? `Would you like to assign the role ${roleToAssign?.name} to group ${groupName}?`
         : `Would you like to remove group ${groupName}'s existing role?`;
 
-    return <Popconfirm title={assignRoleText} visible={visible} onConfirm={batchAssignRole} onCancel={onClose} />;
+    return <Popconfirm title={assignRoleText} open={open} onConfirm={batchAssignRole} onCancel={onClose} />;
 }
diff --git a/datahub-web-react/src/app/identity/group/CreateGroupModal.tsx b/datahub-web-react/src/app/identity/group/CreateGroupModal.tsx
index 4ba714ca23ae06..b24fc8f17b49fc 100644
--- a/datahub-web-react/src/app/identity/group/CreateGroupModal.tsx
+++ b/datahub-web-react/src/app/identity/group/CreateGroupModal.tsx
@@ -89,7 +89,7 @@ export default function CreateGroupModal({ onClose, onCreate }: Props) {
         <Modal
             width={700}
             title="Create new group"
-            visible
+            open
             onCancel={onClose}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/identity/group/SelectRoleGroup.tsx b/datahub-web-react/src/app/identity/group/SelectRoleGroup.tsx
index 22c7a4bfb0364d..0e68c4e25af90d 100644
--- a/datahub-web-react/src/app/identity/group/SelectRoleGroup.tsx
+++ b/datahub-web-react/src/app/identity/group/SelectRoleGroup.tsx
@@ -90,7 +90,7 @@ export default function SelectRoleGroup({ group, groupRoleUrn, selectRoleOptions
                 {selectOptions}
             </RoleSelect>
             <AssignRoletoGroupConfirmation
-                visible={isViewingAssignRole}
+                open={isViewingAssignRole}
                 roleToAssign={rolesMap.get(currentRoleUrn)}
                 groupUrn={group.urn}
                 groupName={group?.info?.displayName as string}
diff --git a/datahub-web-react/src/app/identity/user/AssignRoleConfirmation.tsx b/datahub-web-react/src/app/identity/user/AssignRoleConfirmation.tsx
index 25ad345df3e552..8fe6b3e99fc7c2 100644
--- a/datahub-web-react/src/app/identity/user/AssignRoleConfirmation.tsx
+++ b/datahub-web-react/src/app/identity/user/AssignRoleConfirmation.tsx
@@ -5,7 +5,7 @@ import { DataHubRole } from '../../../types.generated';
 import analytics, { EventType } from '../../analytics';
 
 type Props = {
-    visible: boolean;
+    open: boolean;
     roleToAssign: DataHubRole | undefined;
     userUrn: string;
     username: string;
@@ -13,14 +13,7 @@ type Props = {
     onConfirm: () => void;
 };
 
-export default function AssignRoleConfirmation({
-    visible,
-    roleToAssign,
-    userUrn,
-    username,
-    onClose,
-    onConfirm,
-}: Props) {
+export default function AssignRoleConfirmation({ open, roleToAssign, userUrn, username, onClose, onConfirm }: Props) {
     const [batchAssignRoleMutation] = useBatchAssignRoleMutation();
     // eslint-disable-next-line
     const batchAssignRole = () => {
@@ -63,5 +56,5 @@ export default function AssignRoleConfirmation({
         ? `Would you like to assign the role ${roleToAssign?.name} to ${username}?`
         : `Would you like to remove ${username}'s existing role?`;
 
-    return <Popconfirm title={assignRoleText} visible={visible} onConfirm={batchAssignRole} onCancel={onClose} />;
+    return <Popconfirm title={assignRoleText} open={open} onConfirm={batchAssignRole} onCancel={onClose} />;
 }
diff --git a/datahub-web-react/src/app/identity/user/SelectRole.tsx b/datahub-web-react/src/app/identity/user/SelectRole.tsx
index deaa85f14b0883..7e9acb08ed0bcb 100644
--- a/datahub-web-react/src/app/identity/user/SelectRole.tsx
+++ b/datahub-web-react/src/app/identity/user/SelectRole.tsx
@@ -90,7 +90,7 @@ export default function SelectRole({ user, userRoleUrn, selectRoleOptions, refet
                 {selectOptions}
             </RoleSelect>
             <AssignRoleConfirmation
-                visible={isViewingAssignRole}
+                open={isViewingAssignRole}
                 roleToAssign={rolesMap.get(currentRoleUrn)}
                 userUrn={user.urn}
                 username={user.username}
diff --git a/datahub-web-react/src/app/identity/user/UserList.tsx b/datahub-web-react/src/app/identity/user/UserList.tsx
index 4a9e84d6e2248a..e5c682299705b3 100644
--- a/datahub-web-react/src/app/identity/user/UserList.tsx
+++ b/datahub-web-react/src/app/identity/user/UserList.tsx
@@ -182,10 +182,7 @@ export const UserList = () => {
                     />
                 </UserPaginationContainer>
                 {canManagePolicies && (
-                    <ViewInviteTokenModal
-                        visible={isViewingInviteToken}
-                        onClose={() => setIsViewingInviteToken(false)}
-                    />
+                    <ViewInviteTokenModal open={isViewingInviteToken} onClose={() => setIsViewingInviteToken(false)} />
                 )}
             </UserContainer>
         </>
diff --git a/datahub-web-react/src/app/identity/user/UserListItem.tsx b/datahub-web-react/src/app/identity/user/UserListItem.tsx
index ff349664d7628e..486646c05bd6b2 100644
--- a/datahub-web-react/src/app/identity/user/UserListItem.tsx
+++ b/datahub-web-react/src/app/identity/user/UserListItem.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import styled from 'styled-components/macro';
-import { Dropdown, List, Menu, Tag, Tooltip, Typography } from 'antd';
+import { Dropdown, List, Tag, Tooltip, Typography } from 'antd';
 import { Link } from 'react-router-dom';
 import { DeleteOutlined, MoreOutlined, UnlockOutlined } from '@ant-design/icons';
 import { CorpUser, CorpUserStatus, EntityType, DataHubRole } from '../../../types.generated';
@@ -11,6 +11,7 @@ import ViewResetTokenModal from './ViewResetTokenModal';
 import useDeleteEntity from '../../entity/shared/EntityDropdown/useDeleteEntity';
 import SelectRole from './SelectRole';
 import { USERS_ASSIGN_ROLE_ID } from '../../onboarding/config/UsersOnboardingConfig';
+import { MenuItemStyle } from '../../entity/view/menu/item/styledComponent';
 
 type Props = {
     user: CorpUser;
@@ -84,6 +85,29 @@ export default function UserListItem({ user, canManageUserCredentials, selectRol
     const userStatusToolTip = userStatus && getUserStatusToolTip(userStatus);
     const userStatusColor = userStatus && getUserStatusColor(userStatus);
 
+    const items = [
+        {
+            key: 'reset',
+            label: (
+                <MenuItemStyle
+                    disabled={!shouldShowPasswordReset}
+                    onClick={() => setIsViewingResetToken(true)}
+                    data-testid="reset-menu-item"
+                >
+                    <UnlockOutlined data-testid="resetButton" /> &nbsp; Reset user password
+                </MenuItemStyle>
+            ),
+        },
+        {
+            key: 'delete',
+            label: (
+                <MenuItemStyle onClick={onDeleteEntity}>
+                    <DeleteOutlined /> &nbsp;Delete
+                </MenuItemStyle>
+            ),
+        },
+    ];
+
     return (
         <List.Item>
             <UserItemContainer>
@@ -117,23 +141,7 @@ export default function UserListItem({ user, canManageUserCredentials, selectRol
                     selectRoleOptions={selectRoleOptions}
                     refetch={refetch}
                 />
-                <Dropdown
-                    trigger={['click']}
-                    overlay={
-                        <Menu>
-                            <Menu.Item
-                                disabled={!shouldShowPasswordReset}
-                                onClick={() => setIsViewingResetToken(true)}
-                                data-testid="reset-menu-item"
-                            >
-                                <UnlockOutlined data-testid="resetButton" /> &nbsp; Reset user password
-                            </Menu.Item>
-                            <Menu.Item onClick={onDeleteEntity}>
-                                <DeleteOutlined /> &nbsp;Delete
-                            </Menu.Item>
-                        </Menu>
-                    }
-                >
+                <Dropdown trigger={['click']} menu={{ items }}>
                     <MenuIcon
                         fontSize={20}
                         data-testid={`userItem-${shouldShowPasswordReset ? 'native' : 'non-native'}`}
@@ -141,7 +149,7 @@ export default function UserListItem({ user, canManageUserCredentials, selectRol
                 </Dropdown>
             </ButtonGroup>
             <ViewResetTokenModal
-                visible={isViewingResetToken}
+                open={isViewingResetToken}
                 userUrn={user.urn}
                 username={user.username}
                 onClose={() => setIsViewingResetToken(false)}
diff --git a/datahub-web-react/src/app/identity/user/ViewInviteTokenModal.tsx b/datahub-web-react/src/app/identity/user/ViewInviteTokenModal.tsx
index b823d7bace5499..4f4d2d5b8c69ea 100644
--- a/datahub-web-react/src/app/identity/user/ViewInviteTokenModal.tsx
+++ b/datahub-web-react/src/app/identity/user/ViewInviteTokenModal.tsx
@@ -65,11 +65,11 @@ const RoleIcon = styled.span`
 `;
 
 type Props = {
-    visible: boolean;
+    open: boolean;
     onClose: () => void;
 };
 
-export default function ViewInviteTokenModal({ visible, onClose }: Props) {
+export default function ViewInviteTokenModal({ open, onClose }: Props) {
     const baseUrl = window.location.origin;
     const location = useLocation();
     const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
@@ -110,7 +110,7 @@ export default function ViewInviteTokenModal({ visible, onClose }: Props) {
 
     // Code related to getting or creating an invite token
     const { data: getInviteTokenData } = useGetInviteTokenQuery({
-        skip: !visible,
+        skip: !open,
         variables: { input: { roleUrn: selectedRole?.urn } },
     });
 
@@ -167,7 +167,7 @@ export default function ViewInviteTokenModal({ visible, onClose }: Props) {
                     <b>Share Invite Link</b>
                 </Typography.Text>
             }
-            visible={visible}
+            open={open}
             onCancel={onClose}
         >
             <ModalSection>
diff --git a/datahub-web-react/src/app/identity/user/ViewResetTokenModal.tsx b/datahub-web-react/src/app/identity/user/ViewResetTokenModal.tsx
index 42754c4c4d3621..4711040bf8f5ec 100644
--- a/datahub-web-react/src/app/identity/user/ViewResetTokenModal.tsx
+++ b/datahub-web-react/src/app/identity/user/ViewResetTokenModal.tsx
@@ -34,13 +34,13 @@ const CreateResetTokenButton = styled(Button)`
 `;
 
 type Props = {
-    visible: boolean;
+    open: boolean;
     userUrn: string;
     username: string;
     onClose: () => void;
 };
 
-export default function ViewResetTokenModal({ visible, userUrn, username, onClose }: Props) {
+export default function ViewResetTokenModal({ open, userUrn, username, onClose }: Props) {
     const baseUrl = window.location.origin;
     const [hasGeneratedResetToken, setHasGeneratedResetToken] = useState(false);
 
@@ -87,7 +87,7 @@ export default function ViewResetTokenModal({ visible, userUrn, username, onClos
                     <b>Reset User Password</b>
                 </Typography.Text>
             }
-            visible={visible}
+            open={open}
             onCancel={onClose}
         >
             {hasGeneratedResetToken ? (
diff --git a/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx b/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx
index 6af924be99a6a0..5085a20b9b2bba 100644
--- a/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx
+++ b/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx
@@ -1,5 +1,5 @@
 import { Tabs, Typography } from 'antd';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import styled from 'styled-components';
 import { IngestionSourceList } from './source/IngestionSourceList';
 import { useAppConfig } from '../useAppConfig';
@@ -51,12 +51,18 @@ export const ManageIngestionPage = () => {
      * Determines which view should be visible: ingestion sources or secrets.
      */
     const me = useUserContext();
-    const { config } = useAppConfig();
+    const { config, loaded } = useAppConfig();
     const isIngestionEnabled = config?.managedIngestionConfig.enabled;
     const showIngestionTab = isIngestionEnabled && me && me.platformPrivileges?.manageIngestion;
     const showSecretsTab = isIngestionEnabled && me && me.platformPrivileges?.manageSecrets;
-    const defaultTab = showIngestionTab ? TabType.Sources : TabType.Secrets;
-    const [selectedTab, setSelectedTab] = useState<TabType>(defaultTab);
+    const [selectedTab, setSelectedTab] = useState<TabType>(TabType.Sources);
+
+    // defaultTab might not be calculated correctly on mount, if `config` or `me` haven't been loaded yet
+    useEffect(() => {
+        if (loaded && me.loaded && !showIngestionTab && selectedTab === TabType.Sources) {
+            setSelectedTab(TabType.Secrets);
+        }
+    }, [loaded, me.loaded, showIngestionTab, selectedTab]);
 
     const onClickTab = (newTab: string) => {
         setSelectedTab(TabType[newTab]);
diff --git a/datahub-web-react/src/app/ingest/secret/SecretBuilderModal.tsx b/datahub-web-react/src/app/ingest/secret/SecretBuilderModal.tsx
index 2d20ac77891ea0..8f42505e5e07ae 100644
--- a/datahub-web-react/src/app/ingest/secret/SecretBuilderModal.tsx
+++ b/datahub-web-react/src/app/ingest/secret/SecretBuilderModal.tsx
@@ -10,13 +10,13 @@ const VALUE_FIELD_NAME = 'value';
 type Props = {
     initialState?: SecretBuilderState;
     editSecret?: SecretBuilderState;
-    visible: boolean;
+    open: boolean;
     onSubmit?: (source: SecretBuilderState, resetState: () => void) => void;
     onUpdate?: (source: SecretBuilderState, resetState: () => void) => void;
     onCancel?: () => void;
 };
 
-export const SecretBuilderModal = ({ initialState, editSecret, visible, onSubmit, onUpdate, onCancel }: Props) => {
+export const SecretBuilderModal = ({ initialState, editSecret, open, onSubmit, onUpdate, onCancel }: Props) => {
     const [createButtonEnabled, setCreateButtonEnabled] = useState(false);
     const [form] = Form.useForm();
 
@@ -52,7 +52,7 @@ export const SecretBuilderModal = ({ initialState, editSecret, visible, onSubmit
         <Modal
             width={540}
             title={<Typography.Text>{titleText}</Typography.Text>}
-            visible={visible}
+            open={open}
             onCancel={onCloseModal}
             zIndex={1051} // one higher than other modals - needed for managed ingestion forms
             footer={
diff --git a/datahub-web-react/src/app/ingest/secret/SecretsList.tsx b/datahub-web-react/src/app/ingest/secret/SecretsList.tsx
index 472dbf7f849dee..145bf3dd029fbc 100644
--- a/datahub-web-react/src/app/ingest/secret/SecretsList.tsx
+++ b/datahub-web-react/src/app/ingest/secret/SecretsList.tsx
@@ -294,7 +294,7 @@ export const SecretsList = () => {
                 </SourcePaginationContainer>
             </div>
             <SecretBuilderModal
-                visible={isCreatingSecret}
+                open={isCreatingSecret}
                 editSecret={editSecret}
                 onUpdate={onUpdate}
                 onSubmit={onSubmit}
diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx
index 21a9be9dfb386a..d9ab4cdc499f5d 100644
--- a/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx
+++ b/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx
@@ -453,17 +453,13 @@ export const IngestionSourceList = () => {
             </SourceContainer>
             <IngestionSourceBuilderModal
                 initialState={removeExecutionsFromIngestionSource(focusSource)}
-                visible={isBuildingSource}
+                open={isBuildingSource}
                 onSubmit={onSubmit}
                 onCancel={onCancel}
             />
             {isViewingRecipe && <RecipeViewerModal recipe={focusSource?.config.recipe} onCancel={onCancel} />}
             {focusExecutionUrn && (
-                <ExecutionDetailsModal
-                    urn={focusExecutionUrn}
-                    visible
-                    onClose={() => setFocusExecutionUrn(undefined)}
-                />
+                <ExecutionDetailsModal urn={focusExecutionUrn} open onClose={() => setFocusExecutionUrn(undefined)} />
             )}
         </>
     );
diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx
index 155e75f1895f53..4b7fb472226172 100644
--- a/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx
+++ b/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx
@@ -106,7 +106,13 @@ export function LastExecutionColumn(time: any) {
 }
 
 export function ScheduleColumn(schedule: any, record: any) {
-    const tooltip = schedule && `Runs ${cronstrue.toString(schedule).toLowerCase()} (${record.timezone})`;
+    let tooltip: string;
+    try {
+        tooltip = schedule && `Runs ${cronstrue.toString(schedule).toLowerCase()} (${record.timezone})`;
+    } catch (e) {
+        tooltip = 'Invalid cron schedule';
+        console.debug('Error parsing cron schedule', e);
+    }
     return (
         <Tooltip title={tooltip || 'Not scheduled'}>
             <Typography.Text code>{schedule || 'None'}</Typography.Text>
diff --git a/datahub-web-react/src/app/ingest/source/RecipeViewerModal.tsx b/datahub-web-react/src/app/ingest/source/RecipeViewerModal.tsx
index 99c93d2a174fc3..f08747e757e581 100644
--- a/datahub-web-react/src/app/ingest/source/RecipeViewerModal.tsx
+++ b/datahub-web-react/src/app/ingest/source/RecipeViewerModal.tsx
@@ -18,7 +18,7 @@ function RecipeViewerModal({ recipe, onCancel }: Props) {
 
     return (
         <Modal
-            visible
+            open
             onCancel={onCancel}
             width={800}
             title="View Ingestion Recipe"
diff --git a/datahub-web-react/src/app/ingest/source/builder/IngestionSourceBuilderModal.tsx b/datahub-web-react/src/app/ingest/source/builder/IngestionSourceBuilderModal.tsx
index a41a8ec0f12ab9..be77e30afc0b40 100644
--- a/datahub-web-react/src/app/ingest/source/builder/IngestionSourceBuilderModal.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/IngestionSourceBuilderModal.tsx
@@ -63,12 +63,12 @@ const modalBodyStyle = { padding: '16px 24px 16px 24px', backgroundColor: '#F6F6
 
 type Props = {
     initialState?: SourceBuilderState;
-    visible: boolean;
+    open: boolean;
     onSubmit?: (input: SourceBuilderState, resetState: () => void, shouldRun?: boolean) => void;
     onCancel?: () => void;
 };
 
-export const IngestionSourceBuilderModal = ({ initialState, visible, onSubmit, onCancel }: Props) => {
+export const IngestionSourceBuilderModal = ({ initialState, open, onSubmit, onCancel }: Props) => {
     const isEditing = initialState !== undefined;
     const titleText = isEditing ? 'Edit Data Source' : 'Connect Data Source';
     const initialStep = isEditing
@@ -139,7 +139,7 @@ export const IngestionSourceBuilderModal = ({ initialState, visible, onSubmit, o
             }
             style={{ top: 40 }}
             bodyStyle={modalBodyStyle}
-            visible={visible}
+            open={open}
             onCancel={onCancel}
         >
             {currentStepIndex > 0 ? (
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/CreateSecretButton.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/CreateSecretButton.tsx
index 8561805e6270cf..b5788c3ecb116a 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/CreateSecretButton.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/SecretField/CreateSecretButton.tsx
@@ -64,7 +64,7 @@ function CreateSecretButton({ initialState, onSubmit, refetchSecrets }: Props) {
             {isCreateModalVisible && (
                 <SecretBuilderModal
                     initialState={initialState}
-                    visible={isCreateModalVisible}
+                    open={isCreateModalVisible}
                     onCancel={() => setIsCreateModalVisible(false)}
                     onSubmit={createSecret}
                 />
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionModal.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionModal.tsx
index 3528c5d7fa50c7..3a0bc47fa7d262 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionModal.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/TestConnectionModal.tsx
@@ -101,7 +101,7 @@ function TestConnectionModal({
 
     return (
         <Modal
-            visible
+            open
             onCancel={hideModal}
             footer={<Button onClick={hideModal}>Done</Button>}
             title={
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/constants.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/constants.ts
index 6a5e6c9de2b96b..b6d076cf6da026 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/constants.ts
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/constants.ts
@@ -83,7 +83,7 @@ import {
     PROJECT_NAME,
 } from './lookml';
 import { PRESTO, PRESTO_HOST_PORT, PRESTO_DATABASE, PRESTO_USERNAME, PRESTO_PASSWORD } from './presto';
-import { AZURE, BIGQUERY_BETA, CSV, DBT_CLOUD, MYSQL, OKTA, POWER_BI, UNITY_CATALOG, VERTICA } from '../constants';
+import { AZURE, BIGQUERY_BETA, CSV, DBT_CLOUD, MYSQL, OKTA, POWER_BI, SAC, UNITY_CATALOG, VERTICA } from '../constants';
 import { BIGQUERY_BETA_PROJECT_ID, DATASET_ALLOW, DATASET_DENY, PROJECT_ALLOW, PROJECT_DENY } from './bigqueryBeta';
 import { MYSQL_HOST_PORT, MYSQL_PASSWORD, MYSQL_USERNAME } from './mysql';
 import { MSSQL, MSSQL_DATABASE, MSSQL_HOST_PORT, MSSQL_PASSWORD, MSSQL_USERNAME } from './mssql';
@@ -171,6 +171,20 @@ import {
     USER_ALLOW,
     USER_DENY,
 } from './azure';
+import {
+    SAC_TENANT_URL,
+    SAC_TOKEN_URL,
+    SAC_CLIENT_ID,
+    SAC_CLIENT_SECRET,
+    INGEST_STORIES,
+    INGEST_APPLICATIONS,
+    RESOURCE_ID_ALLOW,
+    RESOURCE_ID_DENY,
+    RESOURCE_NAME_ALLOW,
+    RESOURCE_NAME_DENY,
+    FOLDER_ALLOW,
+    FOLDER_DENY,
+} from './sac';
 
 export enum RecipeSections {
     Connection = 0,
@@ -519,8 +533,29 @@ export const RECIPE_FIELDS: RecipeFields = {
         filterFields: [GROUP_ALLOW, GROUP_DENY, USER_ALLOW, USER_DENY],
         advancedFields: [AZURE_INGEST_USERS, AZURE_INGEST_GROUPS, STATEFUL_INGESTION_ENABLED, SKIP_USERS_WITHOUT_GROUP],
     },
+    [SAC]: {
+        fields: [SAC_TENANT_URL, SAC_TOKEN_URL, SAC_CLIENT_ID, SAC_CLIENT_SECRET],
+        filterFields: [
+            INGEST_STORIES,
+            INGEST_APPLICATIONS,
+            RESOURCE_ID_ALLOW,
+            RESOURCE_ID_DENY,
+            RESOURCE_NAME_ALLOW,
+            RESOURCE_NAME_DENY,
+            FOLDER_ALLOW,
+            FOLDER_DENY,
+        ],
+        advancedFields: [STATEFUL_INGESTION_ENABLED],
+    },
 };
 
 export const CONNECTORS_WITH_FORM = new Set(Object.keys(RECIPE_FIELDS));
 
-export const CONNECTORS_WITH_TEST_CONNECTION = new Set([SNOWFLAKE, LOOKER, BIGQUERY_BETA, BIGQUERY, UNITY_CATALOG]);
+export const CONNECTORS_WITH_TEST_CONNECTION = new Set([
+    SNOWFLAKE,
+    LOOKER,
+    BIGQUERY_BETA,
+    BIGQUERY,
+    UNITY_CATALOG,
+    SAC,
+]);
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/sac.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/sac.ts
new file mode 100644
index 00000000000000..3f5c6d0b09a33e
--- /dev/null
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/sac.ts
@@ -0,0 +1,161 @@
+import { RecipeField, FieldType, setListValuesOnRecipe } from './common';
+
+export const SAC_TENANT_URL: RecipeField = {
+    name: 'tenant_url',
+    label: 'Tenant URL',
+    tooltip: 'The URL of the SAP Analytics Cloud tenant.',
+    type: FieldType.TEXT,
+    fieldPath: 'source.config.tenant_url',
+    placeholder: 'https://company.eu10.sapanalytics.cloud',
+    required: true,
+    rules: null,
+};
+
+export const SAC_TOKEN_URL: RecipeField = {
+    name: 'token_url',
+    label: 'Token URL',
+    tooltip: 'The OAuth 2.0 Token Service URL.',
+    type: FieldType.TEXT,
+    fieldPath: 'source.config.token_url',
+    placeholder: 'https://company.eu10.hana.ondemand.com/oauth/token',
+    required: true,
+    rules: null,
+};
+
+export const SAC_CLIENT_ID: RecipeField = {
+    name: 'client_id',
+    label: 'Client ID',
+    tooltip: 'Client ID.',
+    type: FieldType.SECRET,
+    fieldPath: 'source.config.client_id',
+    placeholder: 'client_id',
+    required: true,
+    rules: null,
+};
+
+export const SAC_CLIENT_SECRET: RecipeField = {
+    name: 'client_secret',
+    label: 'Client Secret',
+    tooltip: 'Client Secret.',
+    type: FieldType.SECRET,
+    fieldPath: 'source.config.client_secret',
+    placeholder: 'client_secret',
+    required: true,
+    rules: null,
+};
+
+export const INGEST_STORIES: RecipeField = {
+    name: 'ingest_stories',
+    label: 'Ingest Stories',
+    tooltip: 'Whether stories should be ingested into DataHub.',
+    type: FieldType.BOOLEAN,
+    fieldPath: 'source.config.ingest_stories',
+    rules: null,
+    section: 'Stories and Applications',
+};
+
+export const INGEST_APPLICATIONS: RecipeField = {
+    name: 'ingest_applications',
+    label: 'Ingest Applications',
+    tooltip: 'Whether applications should be ingested into DataHub.',
+    type: FieldType.BOOLEAN,
+    fieldPath: 'source.config.ingest_applications',
+    rules: null,
+    section: 'Stories and Applications',
+};
+
+const resourceIdAllowFieldPath = 'source.config.resource_id_pattern.allow';
+export const RESOURCE_ID_ALLOW: RecipeField = {
+    name: 'resource_id_pattern.allow',
+    label: 'Resource Id Allow Patterns',
+    tooltip:
+        'Only include specific Stories and Applications by providing the id of the ressource, or a Regular Expression (REGEX). If not provided, all Stories and Applications will be included.',
+    type: FieldType.LIST,
+    buttonLabel: 'Add pattern',
+    fieldPath: resourceIdAllowFieldPath,
+    rules: null,
+    section: 'Stories and Applications',
+    placeholder: 'LXTH4JCE36EOYLU41PIINLYPU9XRYM26',
+    setValueOnRecipeOverride: (recipe: any, values: string[]) =>
+        setListValuesOnRecipe(recipe, values, resourceIdAllowFieldPath),
+};
+
+const resourceIdDenyFieldPath = 'source.config.resource_id_pattern.deny';
+export const RESOURCE_ID_DENY: RecipeField = {
+    name: 'resource_id_pattern.deny',
+    label: 'Resource Id Deny Patterns',
+    tooltip:
+        'Exclude specific Stories and Applications by providing the id of the resource, or a Regular Expression (REGEX). If not provided, all Stories and Applications will be included. Deny patterns always take precendence over Allow patterns.',
+    type: FieldType.LIST,
+    buttonLabel: 'Add pattern',
+    fieldPath: resourceIdDenyFieldPath,
+    rules: null,
+    section: 'Stories and Applications',
+    placeholder: 'LXTH4JCE36EOYLU41PIINLYPU9XRYM26',
+    setValueOnRecipeOverride: (recipe: any, values: string[]) =>
+        setListValuesOnRecipe(recipe, values, resourceIdDenyFieldPath),
+};
+
+const resourceNameAllowFieldPath = 'source.config.resource_id_pattern.allow';
+export const RESOURCE_NAME_ALLOW: RecipeField = {
+    name: 'resource_name_pattern.allow',
+    label: 'Resource Name Allow Patterns',
+    tooltip:
+        'Only include specific Stories and Applications by providing the name of the ressource, or a Regular Expression (REGEX). If not provided, all Stories and Applications will be included.',
+    type: FieldType.LIST,
+    buttonLabel: 'Add pattern',
+    fieldPath: resourceNameAllowFieldPath,
+    rules: null,
+    section: 'Stories and Applications',
+    placeholder: 'Name of the story',
+    setValueOnRecipeOverride: (recipe: any, values: string[]) =>
+        setListValuesOnRecipe(recipe, values, resourceNameAllowFieldPath),
+};
+
+const resourceNameDenyFieldPath = 'source.config.resource_name_pattern.deny';
+export const RESOURCE_NAME_DENY: RecipeField = {
+    name: 'resource_name_pattern.deny',
+    label: 'Resource Name Deny Patterns',
+    tooltip:
+        'Exclude specific Stories and Applications by providing the name of the resource, or a Regular Expression (REGEX). If not provided, all Stories and Applications will be included. Deny patterns always take precendence over Allow patterns.',
+    type: FieldType.LIST,
+    buttonLabel: 'Add pattern',
+    fieldPath: resourceNameDenyFieldPath,
+    rules: null,
+    section: 'Stories and Applications',
+    placeholder: 'Name of the story',
+    setValueOnRecipeOverride: (recipe: any, values: string[]) =>
+        setListValuesOnRecipe(recipe, values, resourceNameDenyFieldPath),
+};
+
+const folderAllowFieldPath = 'source.config.resource_id_pattern.allow';
+export const FOLDER_ALLOW: RecipeField = {
+    name: 'folder_pattern.allow',
+    label: 'Folder Allow Patterns',
+    tooltip:
+        'Only include specific Stories and Applications by providing the folder containing the resources, or a Regular Expression (REGEX). If not provided, all Stories and Applications will be included.',
+    type: FieldType.LIST,
+    buttonLabel: 'Add pattern',
+    fieldPath: folderAllowFieldPath,
+    rules: null,
+    section: 'Stories and Applications',
+    placeholder: 'Folder of the story',
+    setValueOnRecipeOverride: (recipe: any, values: string[]) =>
+        setListValuesOnRecipe(recipe, values, folderAllowFieldPath),
+};
+
+const folderDenyFieldPath = 'source.config.folder_pattern.deny';
+export const FOLDER_DENY: RecipeField = {
+    name: 'folder_pattern.deny',
+    label: 'Folder Deny Patterns',
+    tooltip:
+        'Exclude specific Stories and Applications by providing the folder containing the resources, or a Regular Expression (REGEX). If not provided, all Stories and Applications will be included. Deny patterns always take precendence over Allow patterns.',
+    type: FieldType.LIST,
+    buttonLabel: 'Add pattern',
+    fieldPath: folderDenyFieldPath,
+    rules: null,
+    section: 'Stories and Applications',
+    placeholder: 'Folder of the story',
+    setValueOnRecipeOverride: (recipe: any, values: string[]) =>
+        setListValuesOnRecipe(recipe, values, folderDenyFieldPath),
+};
diff --git a/datahub-web-react/src/app/ingest/source/builder/SelectTemplateStep.tsx b/datahub-web-react/src/app/ingest/source/builder/SelectTemplateStep.tsx
index 3998915e07a2ce..e014cdcc8e2240 100644
--- a/datahub-web-react/src/app/ingest/source/builder/SelectTemplateStep.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/SelectTemplateStep.tsx
@@ -104,6 +104,18 @@ export const SelectTemplateStep = ({ state, updateState, goTo, cancel, ingestion
             source.name.toLocaleLowerCase().includes(searchFilter.toLocaleLowerCase()),
     );
 
+    filteredSources.sort((a, b) => {
+        if (a.name === 'custom') {
+            return 1;
+        }
+
+        if (b.name === 'custom') {
+            return -1;
+        }
+
+        return a.displayName.localeCompare(b.displayName);
+    });
+
     return (
         <Container>
             <Section>
diff --git a/datahub-web-react/src/app/ingest/source/builder/constants.ts b/datahub-web-react/src/app/ingest/source/builder/constants.ts
index d90faa91b85a26..b67ca388c10546 100644
--- a/datahub-web-react/src/app/ingest/source/builder/constants.ts
+++ b/datahub-web-react/src/app/ingest/source/builder/constants.ts
@@ -34,6 +34,7 @@ import fivetranLogo from '../../../../images/fivetranlogo.png';
 import csvLogo from '../../../../images/csv-logo.png';
 import qlikLogo from '../../../../images/qliklogo.png';
 import sigmaLogo from '../../../../images/sigmalogo.png';
+import sacLogo from '../../../../images/saclogo.svg';
 
 export const ATHENA = 'athena';
 export const ATHENA_URN = `urn:li:dataPlatform:${ATHENA}`;
@@ -122,6 +123,8 @@ export const QLIK_SENSE = 'qlik-sense';
 export const QLIK_SENSE_URN = `urn:li:dataPlatform:${QLIK_SENSE}`;
 export const SIGMA = 'sigma';
 export const SIGMA_URN = `urn:li:dataPlatform:${SIGMA}`;
+export const SAC = 'sac';
+export const SAC_URN = `urn:li:dataPlatform:${SAC}`;
 
 export const PLATFORM_URN_TO_LOGO = {
     [ATHENA_URN]: athenaLogo,
@@ -161,6 +164,7 @@ export const PLATFORM_URN_TO_LOGO = {
     [CSV_URN]: csvLogo,
     [QLIK_SENSE_URN]: qlikLogo,
     [SIGMA_URN]: sigmaLogo,
+    [SAC_URN]: sacLogo,
 };
 
 export const SOURCE_TO_PLATFORM_URN = {
diff --git a/datahub-web-react/src/app/ingest/source/builder/sources.json b/datahub-web-react/src/app/ingest/source/builder/sources.json
index c35a7a033a8ab3..bb1c1a10ea6e5f 100644
--- a/datahub-web-react/src/app/ingest/source/builder/sources.json
+++ b/datahub-web-react/src/app/ingest/source/builder/sources.json
@@ -287,6 +287,14 @@
         "docsUrl": "https://datahubproject.io/docs/generated/ingestion/sources/csv'",
         "recipe": "source: \n    type: csv-enricher \n    config: \n        # URL of your csv file to ingest \n        filename: \n        array_delimiter: '|' \n        delimiter: ',' \n        write_semantics: PATCH"
     },
+    {
+        "urn": "urn:li:dataPlatform:sac",
+        "name": "sac",
+        "displayName": "SAP Analytics Cloud",
+        "description": "Import Stories, Applications and Models from SAP Analytics Cloud.",
+        "docsUrl": "https://datahubproject.io/docs/generated/ingestion/sources/sac/",
+        "recipe": "source:\n    type: sac\n    config:\n        tenant_url: # Your SAP Analytics Cloud tenant URL, e.g. https://company.eu10.sapanalytics.cloud or https://company.eu10.hcs.cloud.sap\n        token_url: # The Token URL of your SAP Analytics Cloud tenant, e.g. https://company.eu10.hana.ondemand.com/oauth/token.\n\n        # Add secret in Secrets Tab with relevant names for each variable\n        client_id: \"${SAC_CLIENT_ID}\" # Your SAP Analytics Cloud client id\n        client_secret: \"${SAC_CLIENT_SECRET}\" # Your SAP Analytics Cloud client secret"
+    },
     {
         "urn": "urn:li:dataPlatform:custom",
         "name": "custom",
diff --git a/datahub-web-react/src/app/ingest/source/conf/sac/sac.ts b/datahub-web-react/src/app/ingest/source/conf/sac/sac.ts
new file mode 100644
index 00000000000000..e8a3b1f67866af
--- /dev/null
+++ b/datahub-web-react/src/app/ingest/source/conf/sac/sac.ts
@@ -0,0 +1,26 @@
+import { SourceConfig } from '../types';
+import sacLogo from '../../../../../images/saclogo.svg';
+
+const placeholderRecipe = `\
+source:
+    type: sac
+    config:
+        tenant_url: # Your SAP Analytics Cloud tenant URL, e.g. https://company.eu10.sapanalytics.cloud or https://company.eu10.hcs.cloud.sap
+        token_url: # The Token URL of your SAP Analytics Cloud tenant, e.g. https://company.eu10.hana.ondemand.com/oauth/token.
+
+        # Add secret in Secrets Tab with relevant names for each variable
+        client_id: "\${SAC_CLIENT_ID}" # Your SAP Analytics Cloud client id
+        client_secret: "\${SAC_CLIENT_SECRET}" # Your SAP Analytics Cloud client secret
+`;
+
+export const SAC = 'sac';
+
+const sacConfig: SourceConfig = {
+    type: SAC,
+    placeholderRecipe,
+    displayName: 'SAP Analytics Cloud',
+    docsUrl: 'https://datahubproject.io/docs/generated/ingestion/sources/sac/',
+    logoUrl: sacLogo,
+};
+
+export default sacConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/sources.tsx b/datahub-web-react/src/app/ingest/source/conf/sources.tsx
index 4dbeeb5c975e9d..66644cd14ddd5e 100644
--- a/datahub-web-react/src/app/ingest/source/conf/sources.tsx
+++ b/datahub-web-react/src/app/ingest/source/conf/sources.tsx
@@ -17,6 +17,7 @@ import hiveConfig from './hive/hive';
 import oracleConfig from './oracle/oracle';
 import tableauConfig from './tableau/tableau';
 import csvConfig from './csv/csv';
+import sacConfig from './sac/sac';
 
 const baseUrl = window.location.origin;
 
@@ -48,6 +49,7 @@ export const SOURCE_TEMPLATE_CONFIGS: Array<SourceConfig> = [
     oracleConfig,
     hiveConfig,
     csvConfig,
+    sacConfig,
     {
         type: 'custom',
         placeholderRecipe: DEFAULT_PLACEHOLDER_RECIPE,
diff --git a/datahub-web-react/src/app/ingest/source/executions/ExecutionRequestDetailsModal.tsx b/datahub-web-react/src/app/ingest/source/executions/ExecutionRequestDetailsModal.tsx
index 6711f0ad12b03c..c8d41888867507 100644
--- a/datahub-web-react/src/app/ingest/source/executions/ExecutionRequestDetailsModal.tsx
+++ b/datahub-web-react/src/app/ingest/source/executions/ExecutionRequestDetailsModal.tsx
@@ -113,11 +113,11 @@ type DetailsContainerProps = {
 
 type Props = {
     urn: string;
-    visible: boolean;
+    open: boolean;
     onClose: () => void;
 };
 
-export const ExecutionDetailsModal = ({ urn, visible, onClose }: Props) => {
+export const ExecutionDetailsModal = ({ urn, open, onClose }: Props) => {
     const [showExpandedLogs, setShowExpandedLogs] = useState(false);
     const [showExpandedRecipe, setShowExpandedRecipe] = useState(false);
 
@@ -178,7 +178,7 @@ export const ExecutionDetailsModal = ({ urn, visible, onClose }: Props) => {
                     <StyledTitle level={4}>Sync Details</StyledTitle>
                 </HeaderSection>
             }
-            visible={visible}
+            open={open}
             onCancel={onClose}
         >
             {!data && loading && <Message type="loading" content="Loading sync details..." />}
diff --git a/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx b/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx
index 6a75ddb3200c87..9c40a3334df174 100644
--- a/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx
+++ b/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx
@@ -172,7 +172,7 @@ export const IngestionSourceExecutionList = ({ urn, isExpanded, lastRefresh, onR
             {focusExecutionUrn && (
                 <ExecutionDetailsModal
                     urn={focusExecutionUrn}
-                    visible={focusExecutionUrn !== undefined}
+                    open={focusExecutionUrn !== undefined}
                     onClose={() => setFocusExecutionUrn(undefined)}
                 />
             )}
diff --git a/datahub-web-react/src/app/lineage/LineageExplorer.tsx b/datahub-web-react/src/app/lineage/LineageExplorer.tsx
index 26ffaa26a6ca22..6d5815afe7d308 100644
--- a/datahub-web-react/src/app/lineage/LineageExplorer.tsx
+++ b/datahub-web-react/src/app/lineage/LineageExplorer.tsx
@@ -210,7 +210,7 @@ export default function LineageExplorer({ urn, type }: Props) {
                 placement="left"
                 closable={false}
                 onClose={handleClose}
-                visible={isDrawerVisible}
+                open={isDrawerVisible}
                 width={490}
                 bodyStyle={{ overflowX: 'hidden' }}
                 mask={false}
@@ -221,7 +221,9 @@ export default function LineageExplorer({ urn, type }: Props) {
                                 Close
                             </Button>
                             {selectedEntity.type !== EntityType.Restricted && (
-                                <Button href={entityRegistry.getEntityUrl(selectedEntity.type, selectedEntity.urn)}>
+                                <Button
+                                    href={`${entityRegistry.getEntityUrl(selectedEntity.type, selectedEntity.urn)}`}
+                                >
                                     <InfoCircleOutlined /> View details
                                 </Button>
                             )}
diff --git a/datahub-web-react/src/app/lineage/manage/ManageLineageMenu.tsx b/datahub-web-react/src/app/lineage/manage/ManageLineageMenu.tsx
index 3c329b1784fc49..b321075fdef81d 100644
--- a/datahub-web-react/src/app/lineage/manage/ManageLineageMenu.tsx
+++ b/datahub-web-react/src/app/lineage/manage/ManageLineageMenu.tsx
@@ -1,5 +1,5 @@
 import { ArrowDownOutlined, ArrowUpOutlined, MoreOutlined } from '@ant-design/icons';
-import { Dropdown, Menu, Popover, Tooltip } from 'antd';
+import { Dropdown, Popover, Tooltip } from 'antd';
 import React, { useState } from 'react';
 import styled from 'styled-components';
 import FocusIcon from '../../../images/focus.svg';
@@ -7,6 +7,7 @@ import { Direction, UpdatedLineages } from '../types';
 import { EntityType } from '../../../types.generated';
 import ManageLineageModal from './ManageLineageModal';
 import { ENTITY_TYPES_WITH_MANUAL_LINEAGE } from '../../entity/shared/constants';
+import { MenuItemStyle } from '../../entity/view/menu/item/styledComponent';
 
 const DROPDOWN_Z_INDEX = 1;
 const POPOVER_Z_INDEX = 2;
@@ -21,13 +22,7 @@ const UnderlineWrapper = styled.span`
     cursor: pointer;
 `;
 
-const StyledMenuItem = styled(Menu.Item)`
-    padding: 0;
-`;
-
-const MenuItemContent = styled.div`
-    padding: 5px 12px;
-`;
+const MenuItemContent = styled.div``;
 
 function PopoverContent({ centerEntity, direction }: { centerEntity?: () => void; direction: string }) {
     return (
@@ -93,6 +88,65 @@ export default function ManageLineageMenu({
     // if we don't show manual lineage options or the center node option, this menu has no options
     if (!isManualLineageSupported && isCenterNode) return null;
 
+    const items = [
+        isManualLineageSupported
+            ? {
+                  key: 0,
+                  label: (
+                      <MenuItemStyle onClick={() => manageLineage(Direction.Upstream)} disabled={isUpstreamDisabled}>
+                          <Popover
+                              content={
+                                  !canEditLineage ? (
+                                      UNAUTHORIZED_TEXT
+                                  ) : (
+                                      <PopoverContent centerEntity={centerEntity} direction="upstream" />
+                                  )
+                              }
+                              overlayStyle={isUpstreamDisabled ? { zIndex: POPOVER_Z_INDEX } : { display: 'none' }}
+                          >
+                              <MenuItemContent>
+                                  <ArrowUpOutlined />
+                                  &nbsp; Edit Upstream
+                              </MenuItemContent>
+                          </Popover>
+                      </MenuItemStyle>
+                  ),
+              }
+            : null,
+        isManualLineageSupported
+            ? {
+                  key: 1,
+                  label: (
+                      <MenuItemStyle
+                          onClick={() => manageLineage(Direction.Downstream)}
+                          disabled={isDownstreamDisabled}
+                      >
+                          <Popover
+                              content={getDownstreamDisabledPopoverContent(!!canEditLineage, isDashboard, centerEntity)}
+                              overlayStyle={isDownstreamDisabled ? { zIndex: POPOVER_Z_INDEX } : { display: 'none' }}
+                          >
+                              <MenuItemContent>
+                                  <ArrowDownOutlined />
+                                  &nbsp; Edit Downstream
+                              </MenuItemContent>
+                          </Popover>
+                      </MenuItemStyle>
+                  ),
+              }
+            : null,
+        !isCenterNode && centerEntity
+            ? {
+                  key: 2,
+                  label: (
+                      <MenuItemStyle onClick={centerEntity}>
+                          <StyledImage src={FocusIcon} alt="focus on entity" />
+                          &nbsp; Focus on Entity
+                      </MenuItemStyle>
+                  ),
+              }
+            : null,
+    ];
+
     return (
         <>
             <Tooltip title={disableDropdown ? UNAUTHORIZED_TEXT : ''}>
@@ -100,71 +154,7 @@ export default function ManageLineageMenu({
                     <Dropdown
                         overlayStyle={{ zIndex: DROPDOWN_Z_INDEX }}
                         disabled={disableDropdown}
-                        overlay={
-                            <Menu>
-                                {isManualLineageSupported && (
-                                    <>
-                                        <StyledMenuItem
-                                            key="0"
-                                            onClick={() => manageLineage(Direction.Upstream)}
-                                            disabled={isUpstreamDisabled}
-                                        >
-                                            <Popover
-                                                content={
-                                                    !canEditLineage ? (
-                                                        UNAUTHORIZED_TEXT
-                                                    ) : (
-                                                        <PopoverContent
-                                                            centerEntity={centerEntity}
-                                                            direction="upstream"
-                                                        />
-                                                    )
-                                                }
-                                                overlayStyle={
-                                                    isUpstreamDisabled
-                                                        ? { zIndex: POPOVER_Z_INDEX }
-                                                        : { display: 'none' }
-                                                }
-                                            >
-                                                <MenuItemContent>
-                                                    <ArrowUpOutlined />
-                                                    &nbsp; Edit Upstream
-                                                </MenuItemContent>
-                                            </Popover>
-                                        </StyledMenuItem>
-                                        <StyledMenuItem
-                                            key="1"
-                                            onClick={() => manageLineage(Direction.Downstream)}
-                                            disabled={isDownstreamDisabled}
-                                        >
-                                            <Popover
-                                                content={getDownstreamDisabledPopoverContent(
-                                                    !!canEditLineage,
-                                                    isDashboard,
-                                                    centerEntity,
-                                                )}
-                                                overlayStyle={
-                                                    isDownstreamDisabled
-                                                        ? { zIndex: POPOVER_Z_INDEX }
-                                                        : { display: 'none' }
-                                                }
-                                            >
-                                                <MenuItemContent>
-                                                    <ArrowDownOutlined />
-                                                    &nbsp; Edit Downstream
-                                                </MenuItemContent>
-                                            </Popover>
-                                        </StyledMenuItem>
-                                    </>
-                                )}
-                                {!isCenterNode && centerEntity && (
-                                    <Menu.Item key="2" onClick={centerEntity}>
-                                        <StyledImage src={FocusIcon} alt="focus on entity" />
-                                        &nbsp; Focus on Entity
-                                    </Menu.Item>
-                                )}
-                            </Menu>
-                        }
+                        menu={{ items }}
                         trigger={['click']}
                     >
                         {menuIcon || <MoreOutlined style={{ fontSize: 18 }} />}
diff --git a/datahub-web-react/src/app/lineage/manage/ManageLineageModal.tsx b/datahub-web-react/src/app/lineage/manage/ManageLineageModal.tsx
index 6f459034579d3e..ed792724ebedf7 100644
--- a/datahub-web-react/src/app/lineage/manage/ManageLineageModal.tsx
+++ b/datahub-web-react/src/app/lineage/manage/ManageLineageModal.tsx
@@ -117,7 +117,7 @@ export default function ManageLineageModal({
     return (
         <StyledModal
             title={<TitleText>Manage {lineageDirection} Lineage</TitleText>}
-            visible
+            open
             onCancel={closeModal}
             keyboard
             footer={
diff --git a/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx b/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx
index 5838271b3de5b0..51fbc83d320632 100644
--- a/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx
+++ b/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx
@@ -426,7 +426,7 @@ export const ManagePolicies = () => {
                     focusPolicyUrn={focusPolicyUrn}
                     policy={focusPolicy || EMPTY_POLICY}
                     setPolicy={setFocusPolicy}
-                    visible={showPolicyBuilderModal}
+                    open={showPolicyBuilderModal}
                     onClose={onClosePolicyBuilder}
                     onSave={onSavePolicy}
                 />
@@ -434,7 +434,7 @@ export const ManagePolicies = () => {
             {showViewPolicyModal && (
                 <PolicyDetailsModal
                     policy={focusPolicy}
-                    visible={showViewPolicyModal}
+                    open={showViewPolicyModal}
                     onClose={onCancelViewPolicy}
                     privileges={getPrivilegeNames(focusPolicy)}
                 />
diff --git a/datahub-web-react/src/app/permissions/policy/PolicyBuilderModal.tsx b/datahub-web-react/src/app/permissions/policy/PolicyBuilderModal.tsx
index 131a586329ff53..7471aa476dc23e 100644
--- a/datahub-web-react/src/app/permissions/policy/PolicyBuilderModal.tsx
+++ b/datahub-web-react/src/app/permissions/policy/PolicyBuilderModal.tsx
@@ -12,7 +12,7 @@ import ClickOutside from '../../shared/ClickOutside';
 type Props = {
     policy: Omit<Policy, 'urn'>;
     setPolicy: (policy: Omit<Policy, 'urn'>) => void;
-    visible: boolean;
+    open: boolean;
     focusPolicyUrn: string | undefined;
     onClose: () => void;
     onSave: (savePolicy: Omit<Policy, 'urn'>) => void;
@@ -40,7 +40,7 @@ const NextButtonContainer = styled.div`
  * Component used for constructing new policies. The purpose of this flow is to populate or edit a Policy
  * object through a sequence of steps.
  */
-export default function PolicyBuilderModal({ policy, setPolicy, visible, onClose, onSave, focusPolicyUrn }: Props) {
+export default function PolicyBuilderModal({ policy, setPolicy, open, onClose, onSave, focusPolicyUrn }: Props) {
     // Step control-flow.
     const [activeStepIndex, setActiveStepIndex] = useState(0);
     const [selectedTags, setSelectedTags] = useState<any[]>([]);
@@ -168,7 +168,7 @@ export default function PolicyBuilderModal({ policy, setPolicy, visible, onClose
             <Modal
                 wrapClassName="PolicyBuilderModal"
                 title={isEditing ? 'Edit a Policy' : 'Create a new Policy'}
-                visible={visible}
+                open={open}
                 onCancel={onClose}
                 closable
                 width={750}
diff --git a/datahub-web-react/src/app/permissions/policy/PolicyDetailsModal.tsx b/datahub-web-react/src/app/permissions/policy/PolicyDetailsModal.tsx
index 5a1786374f919f..88a1388ba95891 100644
--- a/datahub-web-react/src/app/permissions/policy/PolicyDetailsModal.tsx
+++ b/datahub-web-react/src/app/permissions/policy/PolicyDetailsModal.tsx
@@ -15,7 +15,7 @@ type PrivilegeOptionType = {
 
 type Props = {
     policy: Omit<Policy, 'urn'>;
-    visible: boolean;
+    open: boolean;
     onClose: () => void;
     privileges: PrivilegeOptionType[] | undefined;
 };
@@ -60,7 +60,7 @@ const Privileges = styled.div`
 /**
  * Component used for displaying the details about an existing Policy.
  */
-export default function PolicyDetailsModal({ policy, visible, onClose, privileges }: Props) {
+export default function PolicyDetailsModal({ policy, open, onClose, privileges }: Props) {
     const entityRegistry = useEntityRegistry();
 
     const isActive = policy?.state === PolicyState.Active;
@@ -121,7 +121,7 @@ export default function PolicyDetailsModal({ policy, visible, onClose, privilege
     };
 
     return (
-        <Modal title={policy?.name} visible={visible} onCancel={onClose} closable width={800} footer={actionButtons}>
+        <Modal title={policy?.name} open={open} onCancel={onClose} closable width={800} footer={actionButtons}>
             <PolicyContainer>
                 <div>
                     <Typography.Title level={5}>Type</Typography.Title>
diff --git a/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx b/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx
index 4982be27fa4214..7c2cec63071adb 100644
--- a/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx
+++ b/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx
@@ -284,7 +284,7 @@ export const ManageRoles = () => {
                     showSizeChanger={false}
                 />
             </PaginationContainer>
-            <RoleDetailsModal role={focusRole as DataHubRole} visible={showViewRoleModal} onClose={resetRoleState} />
+            <RoleDetailsModal role={focusRole as DataHubRole} open={showViewRoleModal} onClose={resetRoleState} />
         </PageContainer>
     );
 };
diff --git a/datahub-web-react/src/app/permissions/roles/RoleDetailsModal.tsx b/datahub-web-react/src/app/permissions/roles/RoleDetailsModal.tsx
index c32e9c07823da7..7bca62c040c2db 100644
--- a/datahub-web-react/src/app/permissions/roles/RoleDetailsModal.tsx
+++ b/datahub-web-react/src/app/permissions/roles/RoleDetailsModal.tsx
@@ -7,7 +7,7 @@ import AvatarsGroup from '../AvatarsGroup';
 
 type Props = {
     role: DataHubRole;
-    visible: boolean;
+    open: boolean;
     onClose: () => void;
 };
 
@@ -34,7 +34,7 @@ const ThinDivider = styled(Divider)`
 /**
  * Component used for displaying the details about an existing Role.
  */
-export default function RoleDetailsModal({ role, visible, onClose }: Props) {
+export default function RoleDetailsModal({ role, open, onClose }: Props) {
     const entityRegistry = useEntityRegistry();
 
     const actionButtons = (
@@ -49,7 +49,7 @@ export default function RoleDetailsModal({ role, visible, onClose }: Props) {
     const policies = castedRole?.policies?.relationships.map((relationship) => relationship.entity as DataHubPolicy);
 
     return (
-        <Modal title={role?.name} visible={visible} onCancel={onClose} closable width={800} footer={actionButtons}>
+        <Modal title={role?.name} open={open} onCancel={onClose} closable width={800} footer={actionButtons}>
             <PolicyContainer>
                 <div>
                     <Typography.Title level={5}>Description</Typography.Title>
diff --git a/datahub-web-react/src/app/preview/EntityPaths/EntityPathsModal.tsx b/datahub-web-react/src/app/preview/EntityPaths/EntityPathsModal.tsx
index 2bb76714d6119d..68c754b6b21d36 100644
--- a/datahub-web-react/src/app/preview/EntityPaths/EntityPathsModal.tsx
+++ b/datahub-web-react/src/app/preview/EntityPaths/EntityPathsModal.tsx
@@ -47,7 +47,7 @@ export default function EntityPathsModal({ paths, resultEntityUrn, hideModal }:
                 </Header>
             }
             width="75vw"
-            visible
+            open
             onCancel={hideModal}
             onOk={hideModal}
             footer={null}
diff --git a/datahub-web-react/src/app/search/AdvancedFilterSelectValueModal.tsx b/datahub-web-react/src/app/search/AdvancedFilterSelectValueModal.tsx
index c562fc6e8349a9..056aca56c13137 100644
--- a/datahub-web-react/src/app/search/AdvancedFilterSelectValueModal.tsx
+++ b/datahub-web-react/src/app/search/AdvancedFilterSelectValueModal.tsx
@@ -187,7 +187,7 @@ export const AdvancedFilterSelectValueModal = ({
             <EditTagTermsModal
                 resources={[]}
                 type={EntityType.Tag}
-                visible
+                open
                 onCloseModal={onCloseModal}
                 onOkOverride={(urns) => {
                     onSelect(urns);
@@ -211,7 +211,7 @@ export const AdvancedFilterSelectValueModal = ({
             <EditTagTermsModal
                 resources={[]}
                 type={EntityType.GlossaryTerm}
-                visible
+                open
                 onCloseModal={onCloseModal}
                 onOkOverride={(urns) => {
                     onSelect(urns);
diff --git a/datahub-web-react/src/app/search/ChooseEntityTypeModal.tsx b/datahub-web-react/src/app/search/ChooseEntityTypeModal.tsx
index 1e31bd74ee06f2..dd611bba346c1b 100644
--- a/datahub-web-react/src/app/search/ChooseEntityTypeModal.tsx
+++ b/datahub-web-react/src/app/search/ChooseEntityTypeModal.tsx
@@ -29,7 +29,7 @@ export const ChooseEntityTypeModal = ({ defaultValues, onCloseModal, onOk, title
     return (
         <Modal
             title={title}
-            visible
+            open
             onCancel={onCloseModal}
             keyboard
             footer={
diff --git a/datahub-web-react/src/app/search/EditTextModal.tsx b/datahub-web-react/src/app/search/EditTextModal.tsx
index 43580d2e2b497e..ea11f6f29381a9 100644
--- a/datahub-web-react/src/app/search/EditTextModal.tsx
+++ b/datahub-web-react/src/app/search/EditTextModal.tsx
@@ -13,7 +13,7 @@ export const EditTextModal = ({ defaultValue, onCloseModal, onOk, title }: Props
     return (
         <Modal
             title={title}
-            visible
+            open
             onCancel={onCloseModal}
             keyboard
             footer={
diff --git a/datahub-web-react/src/app/search/SearchResultList.tsx b/datahub-web-react/src/app/search/SearchResultList.tsx
index d85c3674cbd43d..bc0efcfa3f47e8 100644
--- a/datahub-web-react/src/app/search/SearchResultList.tsx
+++ b/datahub-web-react/src/app/search/SearchResultList.tsx
@@ -62,6 +62,7 @@ type Props = {
     selectedEntities: EntityAndType[];
     setSelectedEntities: (entities: EntityAndType[]) => any;
     suggestions: SearchSuggestion[];
+    pageNumber: number;
 };
 
 export const SearchResultList = ({
@@ -73,6 +74,7 @@ export const SearchResultList = ({
     selectedEntities,
     setSelectedEntities,
     suggestions,
+    pageNumber,
 }: Props) => {
     const entityRegistry = useEntityRegistry();
     const selectedEntityUrns = selectedEntities.map((entity) => entity.urn);
@@ -86,6 +88,7 @@ export const SearchResultList = ({
             entityType: result.entity.type,
             index,
             total: totalResultCount,
+            pageNumber,
         });
     };
 
diff --git a/datahub-web-react/src/app/search/SearchResults.tsx b/datahub-web-react/src/app/search/SearchResults.tsx
index dafe9a20b6ab7f..e96e8fd528b9e6 100644
--- a/datahub-web-react/src/app/search/SearchResults.tsx
+++ b/datahub-web-react/src/app/search/SearchResults.tsx
@@ -264,6 +264,7 @@ export const SearchResults = ({
                                         selectedEntities={selectedEntities}
                                         setSelectedEntities={setSelectedEntities}
                                         suggestions={suggestions}
+                                        pageNumber={page}
                                     />
                                     {totalResults > 0 && (
                                         <PaginationControlContainer id="search-pagination">
diff --git a/datahub-web-react/src/app/settings/AccessTokenModal.tsx b/datahub-web-react/src/app/settings/AccessTokenModal.tsx
index 10427210d06928..008cf7999d3eb6 100644
--- a/datahub-web-react/src/app/settings/AccessTokenModal.tsx
+++ b/datahub-web-react/src/app/settings/AccessTokenModal.tsx
@@ -35,13 +35,13 @@ const StyledInfoCircleOutlined = styled(InfoCircleOutlined)`
 `;
 
 type Props = {
-    visible: boolean;
+    open: boolean;
     onClose: () => void;
     accessToken: string;
     expiresInText: string;
 };
 
-export const AccessTokenModal = ({ visible, onClose, accessToken, expiresInText }: Props) => {
+export const AccessTokenModal = ({ open, onClose, accessToken, expiresInText }: Props) => {
     const baseUrl = window.location.origin;
     const accessTokenCurl = `curl -X POST '${baseUrl}/api/graphql' \\
 --header 'Authorization: Bearer ${accessToken}' \\
@@ -56,7 +56,7 @@ export const AccessTokenModal = ({ visible, onClose, accessToken, expiresInText
                     <b> New Personal Access Token</b>
                 </Typography.Text>
             }
-            visible={visible}
+            open={open}
             onCancel={onClose}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/settings/AccessTokens.tsx b/datahub-web-react/src/app/settings/AccessTokens.tsx
index ef58a1b84c1408..6ccca8dd360d70 100644
--- a/datahub-web-react/src/app/settings/AccessTokens.tsx
+++ b/datahub-web-react/src/app/settings/AccessTokens.tsx
@@ -419,7 +419,7 @@ export const AccessTokens = () => {
             </PaginationContainer>
             <CreateTokenModal
                 currentUserUrn={currentUserUrn}
-                visible={isCreatingToken}
+                open={isCreatingToken}
                 onClose={() => setIsCreatingToken(false)}
                 onCreateToken={() => {
                     // Hack to deal with eventual consistency.
diff --git a/datahub-web-react/src/app/settings/CreateTokenModal.tsx b/datahub-web-react/src/app/settings/CreateTokenModal.tsx
index 3cc446651efcbc..e53de77b54e15d 100644
--- a/datahub-web-react/src/app/settings/CreateTokenModal.tsx
+++ b/datahub-web-react/src/app/settings/CreateTokenModal.tsx
@@ -12,7 +12,7 @@ import analytics, { EventType } from '../analytics';
 
 type Props = {
     currentUserUrn: string;
-    visible: boolean;
+    open: boolean;
     onClose: () => void;
     onCreateToken: () => void;
 };
@@ -39,7 +39,7 @@ const OptionText = styled.span<{ isRed: boolean }>`
     ${(props) => props.isRed && `color: ${red[5]};`}
 `;
 
-export default function CreateTokenModal({ currentUserUrn, visible, onClose, onCreateToken }: Props) {
+export default function CreateTokenModal({ currentUserUrn, open, onClose, onCreateToken }: Props) {
     const [selectedTokenDuration, setSelectedTokenDuration] = useState<AccessTokenDuration | null>(null);
 
     const [showModal, setShowModal] = useState(false);
@@ -113,7 +113,7 @@ export default function CreateTokenModal({ currentUserUrn, visible, onClose, onC
         <>
             <Modal
                 title="Create new Token"
-                visible={visible}
+                open={open}
                 onCancel={onModalClose}
                 footer={
                     <>
@@ -192,7 +192,7 @@ export default function CreateTokenModal({ currentUserUrn, visible, onClose, onC
                 </Form>
             </Modal>
             <AccessTokenModal
-                visible={showModal}
+                open={showModal}
                 onClose={onDetailModalClose}
                 accessToken={accessToken || ''}
                 expiresInText={selectedExpiresInText || ''}
diff --git a/datahub-web-react/src/app/settings/SettingsPage.tsx b/datahub-web-react/src/app/settings/SettingsPage.tsx
index e0a15c73a626d0..e3948349546efb 100644
--- a/datahub-web-react/src/app/settings/SettingsPage.tsx
+++ b/datahub-web-react/src/app/settings/SettingsPage.tsx
@@ -8,6 +8,7 @@ import {
     FilterOutlined,
     TeamOutlined,
     PushpinOutlined,
+    ControlOutlined,
 } from '@ant-design/icons';
 import { Redirect, Route, useHistory, useLocation, useRouteMatch, Switch } from 'react-router';
 import styled from 'styled-components';
@@ -17,11 +18,17 @@ import { ManagePermissions } from '../permissions/ManagePermissions';
 import { useAppConfig } from '../useAppConfig';
 import { AccessTokens } from './AccessTokens';
 import { Preferences } from './Preferences';
+import { Features } from './features/Features';
 import { ManageViews } from '../entity/view/ManageViews';
 import { useUserContext } from '../context/useUserContext';
 import { ManageOwnership } from '../entity/ownership/ManageOwnership';
 import ManagePosts from './posts/ManagePosts';
 
+const MenuItem = styled(Menu.Item)`
+    display: flex;
+    align-items: center;
+`;
+
 const PageContainer = styled.div`
     display: flex;
     overflow: auto;
@@ -59,6 +66,17 @@ const ItemTitle = styled.span`
 
 const menuStyle = { width: 256, 'margin-top': 8, overflow: 'hidden auto' };
 
+const NewTag = styled.span`
+    padding: 4px 8px;
+    margin-left: 8px;
+
+    border-radius: 24px;
+    background: #f1fbfe;
+
+    color: #09739a;
+    font-size: 12px;
+`;
+
 /**
  * URL Paths for each settings page.
  */
@@ -70,6 +88,7 @@ const PATHS = [
     { path: 'views', content: <ManageViews /> },
     { path: 'ownership', content: <ManageOwnership /> },
     { path: 'posts', content: <ManagePosts /> },
+    { path: 'features', content: <Features /> },
 ];
 
 /**
@@ -80,6 +99,7 @@ const DEFAULT_PATH = PATHS[0];
 export const SettingsPage = () => {
     const { path, url } = useRouteMatch();
     const { pathname } = useLocation();
+
     const history = useHistory();
     const subRoutes = PATHS.map((p) => p.path.replace('/', ''));
     const currPathName = pathname.replace(path, '');
@@ -101,6 +121,7 @@ export const SettingsPage = () => {
     const showViews = isViewsEnabled || false;
     const showOwnershipTypes = me && me?.platformPrivileges?.manageOwnershipTypes;
     const showHomePagePosts = me && me?.platformPrivileges?.manageGlobalAnnouncements && !readOnlyModeEnabled;
+    const showFeatures = me?.platformPrivileges?.manageIngestion; // TODO: Add feature flag for this
 
     return (
         <PageContainer>
@@ -143,6 +164,13 @@ export const SettingsPage = () => {
                     )}
                     {(showViews || showOwnershipTypes || showHomePagePosts) && (
                         <Menu.ItemGroup title="Manage">
+                            {showFeatures && (
+                                <MenuItem key="features">
+                                    <ControlOutlined />
+                                    <ItemTitle>Features</ItemTitle>
+                                    <NewTag>New!</NewTag>
+                                </MenuItem>
+                            )}
                             {showViews && (
                                 <Menu.Item key="views">
                                     <FilterOutlined /> <ItemTitle>My Views</ItemTitle>
diff --git a/datahub-web-react/src/app/settings/features/Feature.tsx b/datahub-web-react/src/app/settings/features/Feature.tsx
new file mode 100644
index 00000000000000..13453cf8f73252
--- /dev/null
+++ b/datahub-web-react/src/app/settings/features/Feature.tsx
@@ -0,0 +1,184 @@
+import React from 'react';
+
+import styled from 'styled-components';
+
+import { Divider, Typography, Switch, Card, Button, Tooltip } from 'antd';
+import { ArrowRightOutlined } from '@ant-design/icons';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+
+const Title = styled(Typography.Title)`
+    && {
+        margin-bottom: 8px;
+    }
+`;
+
+const FeatureRow = styled.div`
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+`;
+
+const FeatureOptionRow = styled.div`
+    display: flex;
+    justify-content: space-between;
+
+    &:not(:last-child) {
+        margin-bottom: 8px;
+    }
+`;
+
+const SettingsOptionRow = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 16px;
+
+    &:not(:last-child) {
+        margin-bottom: 8px;
+    }
+`;
+
+const DescriptionText = styled(Typography.Text)`
+    color: ${ANTD_GRAY[7]};
+    font-size: 11px;
+`;
+
+const SettingTitle = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    font-size: 14px;
+    margin-bottom: 4px;
+`;
+
+const OptionTitle = styled(Typography.Text)`
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    font-size: 12px;
+`;
+
+const learnMoreLinkStyle = {
+    flex: 1,
+    display: 'flex',
+    alignItems: 'center',
+    gap: '8px',
+    color: '#1890FF',
+    fontSize: '12px',
+    cursor: 'pointer',
+};
+
+const NewTag = styled.div`
+    padding: 4px 8px;
+
+    border-radius: 24px;
+    background: #f1fbfe;
+
+    color: #09739a;
+    font-size: 12px;
+`;
+
+const DataHubOnlyTag = styled.div`
+    padding: 2px 8px;
+
+    border-radius: 24px;
+    background: #c9fff2;
+
+    color: #50a494;
+    font-size: 12px;
+`;
+
+export interface FeatureType {
+    key: string;
+    title: string;
+    description: string;
+    settings: Array<{
+        key: string;
+        title: string;
+        isAvailable: boolean;
+        buttonText: string;
+        onClick?: () => void;
+    }>;
+    options: Array<{
+        key: string;
+        title: string;
+        description: string;
+        isAvailable: boolean;
+        isDisabled: boolean;
+        disabledMessage?: string;
+        checked: boolean;
+        onChange?: (checked: boolean) => void;
+    }>;
+    isNew: boolean;
+    learnMoreLink?: string;
+}
+
+export const Feature = ({ key, title, description, settings, options, isNew, learnMoreLink }: FeatureType) => (
+    <Card style={{ marginBottom: '1rem' }} key={key}>
+        <FeatureRow>
+            <div style={{ flex: 1 }}>
+                <SettingTitle>
+                    <Title level={5} style={{ marginBottom: 0 }}>
+                        {title}
+                    </Title>
+                    {isNew && <NewTag>New!</NewTag>}
+                </SettingTitle>
+                <div>
+                    <Typography.Paragraph type="secondary">{description}</Typography.Paragraph>
+                </div>
+            </div>
+            <div>
+                {learnMoreLink && (
+                    <a href={learnMoreLink} target="_blank" style={learnMoreLinkStyle} rel="noreferrer">
+                        Learn more <ArrowRightOutlined />
+                    </a>
+                )}
+            </div>
+        </FeatureRow>
+        <Divider style={{ margin: `8px 0 24px 0` }} />
+        <Card style={{ margin: `16px auto` }}>
+            {options.map((option, index) => (
+                <>
+                    <FeatureOptionRow key={option.key}>
+                        <span>
+                            <OptionTitle>
+                                <span>{option.title}</span>
+                                {!option.isAvailable && (
+                                    <DataHubOnlyTag>Only available on DataHub Cloud</DataHubOnlyTag>
+                                )}
+                            </OptionTitle>
+                            <div>
+                                <DescriptionText>{option.description}</DescriptionText>
+                            </div>
+                        </span>
+                        <Tooltip title={option.disabledMessage}>
+                            <Switch
+                                checked={option.checked}
+                                onChange={(checked) => (option.onChange ? option.onChange(checked) : null)}
+                                disabled={!option.isAvailable || option.isDisabled}
+                            />
+                        </Tooltip>
+                    </FeatureOptionRow>
+                    {index !== options.length - 1 && <Divider />}
+                </>
+            ))}
+        </Card>
+        {settings.map((option) => (
+            <>
+                <SettingsOptionRow key={option.key}>
+                    <span>
+                        <OptionTitle>
+                            <span>{option.title}</span>
+                            <DataHubOnlyTag>Only available on DataHub Cloud</DataHubOnlyTag>
+                        </OptionTitle>
+                    </span>
+                    <Tooltip title={option.isAvailable ? '' : 'Only available on DataHub Cloud'}>
+                        <Button onClick={option.onClick} disabled={!option.isAvailable}>
+                            {option.buttonText}
+                        </Button>
+                    </Tooltip>
+                </SettingsOptionRow>
+            </>
+        ))}
+    </Card>
+);
diff --git a/datahub-web-react/src/app/settings/features/Features.tsx b/datahub-web-react/src/app/settings/features/Features.tsx
new file mode 100644
index 00000000000000..1d0a0bb469cf86
--- /dev/null
+++ b/datahub-web-react/src/app/settings/features/Features.tsx
@@ -0,0 +1,115 @@
+import React from 'react';
+
+import styled from 'styled-components';
+
+import { Divider, Typography } from 'antd';
+import { v4 as uuidv4 } from 'uuid';
+
+import { Feature, FeatureType } from './Feature';
+
+import { useGetDocPropagationSettings, useUpdateDocPropagationSettings } from './useDocPropagationSettings';
+
+const Page = styled.div`
+    width: 100%;
+    display: flex;
+    justify-content: center;
+`;
+
+const SourceContainer = styled.div`
+    width: 80%;
+    padding-top: 20px;
+    padding-right: 40px;
+    padding-left: 40px;
+`;
+const Container = styled.div`
+    padding-top: 0px;
+`;
+
+const Title = styled(Typography.Title)`
+    && {
+        margin-bottom: 8px;
+    }
+`;
+
+export const Features = () => {
+    /*
+     * Note: When adding new features, make sure to update the features array below
+     * and create a hook file for the new feature in the same directory
+     */
+
+    // Hooks to get and update the document propagation settings
+    const { isColPropagateChecked, setIsColPropagateChecked } = useGetDocPropagationSettings();
+    const { updateDocPropagation } = useUpdateDocPropagationSettings();
+
+    // Features to display
+    const features: FeatureType[] = [
+        {
+            key: uuidv4(),
+            title: 'Documentation Propagation',
+            description: 'Automatically propagate documentation from upstream to downstream columns and assets.',
+            settings: [
+                {
+                    key: uuidv4(),
+                    title: 'Rollback Propagation Changes',
+                    isAvailable: false,
+                    buttonText: 'Rollback',
+                },
+                {
+                    key: uuidv4(),
+                    title: 'Backfill existing documentation from upstream to downstream columns/assets',
+                    isAvailable: false,
+                    buttonText: 'Initialize',
+                },
+            ],
+            options: [
+                {
+                    key: uuidv4(),
+                    title: 'Column Level Propagation',
+                    description:
+                        'Propagate new documentation from upstream to downstream columns based on column-level lineage relationships.',
+                    isAvailable: true,
+                    checked: isColPropagateChecked,
+                    onChange: (checked: boolean) => {
+                        setIsColPropagateChecked(checked);
+                        updateDocPropagation(checked);
+                    },
+                    isDisabled: false,
+                    disabledMessage: undefined,
+                },
+                {
+                    key: uuidv4(),
+                    title: 'Asset Level Propagation',
+                    description:
+                        'Propagate new documentation from upstream to downstream assets based on data lineage relationships.',
+                    checked: false,
+                    onChange: (_: boolean) => null,
+                    isAvailable: true,
+                    isDisabled: true,
+                    disabledMessage: 'Coming soon!',
+                },
+            ],
+            isNew: true,
+            learnMoreLink: 'https://datahubproject.io/docs/automations/docs-propagation',
+        },
+    ];
+
+    // Render
+    return (
+        <Page>
+            <SourceContainer>
+                <Container>
+                    <div>
+                        <Title level={2}>Features</Title>
+                        <Typography.Paragraph type="secondary">
+                            Explore and configure specific features
+                        </Typography.Paragraph>
+                    </div>
+                </Container>
+                <Divider />
+                {features.map((feature) => (
+                    <Feature {...feature} />
+                ))}
+            </SourceContainer>
+        </Page>
+    );
+};
diff --git a/datahub-web-react/src/app/settings/features/useDocPropagationSettings.ts b/datahub-web-react/src/app/settings/features/useDocPropagationSettings.ts
new file mode 100644
index 00000000000000..c93b610cff9d1b
--- /dev/null
+++ b/datahub-web-react/src/app/settings/features/useDocPropagationSettings.ts
@@ -0,0 +1,50 @@
+import { useEffect, useState } from 'react';
+
+import { message } from 'antd';
+
+import {
+    useGetDocPropagationSettingsQuery,
+    useUpdateDocPropagationSettingsMutation,
+} from '../../../graphql/app.generated';
+
+// Hook to get the document propagation settings & manage state
+export const useGetDocPropagationSettings = () => {
+    const { data, refetch } = useGetDocPropagationSettingsQuery();
+    const [isColPropagateChecked, setIsColPropagateChecked] = useState<boolean>(false);
+
+    useEffect(() => {
+        const docPropSetting = data?.docPropagationSettings?.docColumnPropagation;
+        if (docPropSetting !== undefined) setIsColPropagateChecked(!!docPropSetting);
+    }, [data]);
+
+    return {
+        isColPropagateChecked,
+        setIsColPropagateChecked,
+        refetch,
+    };
+};
+
+// Hook to update the document propagation settings
+export const useUpdateDocPropagationSettings = () => {
+    const [updateDocPropagationSettings] = useUpdateDocPropagationSettingsMutation();
+    const { refetch } = useGetDocPropagationSettingsQuery();
+
+    const updateDocPropagation = async (checked: boolean) => {
+        try {
+            await updateDocPropagationSettings({
+                variables: {
+                    input: {
+                        docColumnPropagation: checked,
+                    },
+                },
+            });
+            refetch();
+            message.success('Successfully updated documentation propagation settings');
+        } catch (e) {
+            message.error('Failed to update documentation propagation settings');
+            refetch();
+        }
+    };
+
+    return { updateDocPropagation };
+};
diff --git a/datahub-web-react/src/app/settings/posts/PostItemMenu.tsx b/datahub-web-react/src/app/settings/posts/PostItemMenu.tsx
index 10e2996c36f69f..87bc95f56cbe7c 100644
--- a/datahub-web-react/src/app/settings/posts/PostItemMenu.tsx
+++ b/datahub-web-react/src/app/settings/posts/PostItemMenu.tsx
@@ -1,9 +1,10 @@
 import React from 'react';
 import { DeleteOutlined, EditOutlined } from '@ant-design/icons';
-import { Dropdown, Menu, message, Modal } from 'antd';
+import { Dropdown, message, Modal } from 'antd';
 import { MenuIcon } from '../../entity/shared/EntityDropdown/EntityDropdown';
 import { useDeletePostMutation } from '../../../graphql/post.generated';
 import handleGraphQLError from '../../shared/handleGraphQLError';
+import { MenuItemStyle } from '../../entity/view/menu/item/styledComponent';
 
 type Props = {
     urn: string;
@@ -50,20 +51,27 @@ export default function PostItemMenu({ title, urn, onDelete, onEdit }: Props) {
         });
     };
 
+    const items = [
+        {
+            key: 'delete',
+            label: (
+                <MenuItemStyle onClick={onConfirmDelete}>
+                    <DeleteOutlined /> &nbsp;Delete
+                </MenuItemStyle>
+            ),
+        },
+        {
+            key: 'edit',
+            label: (
+                <MenuItemStyle onClick={onEdit}>
+                    <EditOutlined /> &nbsp;Edit
+                </MenuItemStyle>
+            ),
+        },
+    ];
+
     return (
-        <Dropdown
-            trigger={['click']}
-            overlay={
-                <Menu>
-                    <Menu.Item onClick={onConfirmDelete} key="delete">
-                        <DeleteOutlined /> &nbsp;Delete
-                    </Menu.Item>
-                    <Menu.Item onClick={onEdit} key="edit">
-                        <EditOutlined /> &nbsp;Edit
-                    </Menu.Item>
-                </Menu>
-            }
-        >
+        <Dropdown trigger={['click']} menu={{ items }}>
             <MenuIcon data-testid={`dropdown-menu-${urn}`} fontSize={20} />
         </Dropdown>
     );
diff --git a/datahub-web-react/src/app/shared/ManageAccount.tsx b/datahub-web-react/src/app/shared/ManageAccount.tsx
index 6d496b40362e55..359a7d77dd02c5 100644
--- a/datahub-web-react/src/app/shared/ManageAccount.tsx
+++ b/datahub-web-react/src/app/shared/ManageAccount.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import Cookies from 'js-cookie';
-import { Menu, Dropdown } from 'antd';
+import { Dropdown } from 'antd';
 import { CaretDownOutlined } from '@ant-design/icons';
 import styled, { useTheme } from 'styled-components';
 import { EntityType } from '../../types.generated';
@@ -12,22 +12,7 @@ import analytics, { EventType } from '../analytics';
 import { ANTD_GRAY } from '../entity/shared/constants';
 import { useAppConfig } from '../useAppConfig';
 import { useUserContext } from '../context/useUserContext';
-
-const MenuItem = styled(Menu.Item)`
-    display: flex;
-    justify-content: start;
-    align-items: center;
-    && {
-        margin-top: 2px;
-    }
-    & > a:visited,
-    & > a:active,
-    & > a:focus {
-        clear: both;
-        border: none;
-        outline: 0;
-    }
-`;
+import { MenuItemStyle } from '../entity/view/menu/item/styledComponent';
 
 const DownArrow = styled(CaretDownOutlined)`
     vertical-align: -1px;
@@ -63,55 +48,88 @@ export const ManageAccount = ({ urn: _urn, pictureLink: _pictureLink, name }: Pr
         userContext.updateLocalState({ selectedViewUrn: undefined });
     };
     const version = config?.appVersion;
-    const menu = (
-        <Menu style={{ width: '120px' }}>
-            {version && (
-                <MenuItem key="version" disabled style={{ color: '#8C8C8C' }}>
-                    {version}
-                </MenuItem>
-            )}
-            <Menu.Divider />
-            <MenuItem key="profile">
-                <a
-                    href={`/${entityRegistry.getPathName(EntityType.CorpUser)}/${_urn}`}
-                    rel="noopener noreferrer"
-                    tabIndex={0}
-                >
-                    Your Profile
-                </a>
-            </MenuItem>
-            <Menu.Divider />
-            {themeConfig.content.menu.items.map((value) => {
-                return (
-                    <MenuItem key={value.label}>
-                        <a
-                            href={value.path || ''}
-                            target={value.shouldOpenInNewTab ? '_blank' : ''}
-                            rel="noopener noreferrer"
-                            tabIndex={0}
-                        >
-                            {value.label}
-                        </a>
-                    </MenuItem>
-                );
-            })}
-            <MenuItem key="graphiQLLink">
-                <a href="/api/graphiql">GraphiQL</a>
-            </MenuItem>
-            <MenuItem key="openapiLink">
-                <a href="/openapi/swagger-ui/index.html">OpenAPI</a>
-            </MenuItem>
-            <Menu.Divider />
-            <MenuItem danger key="logout" tabIndex={0}>
-                <a href="/logOut" onClick={handleLogout} data-testid="log-out-menu-item">
-                    Sign Out
-                </a>
-            </MenuItem>
-        </Menu>
-    );
+
+    const themeConfigItems = themeConfig.content.menu.items.map((value) => {
+        return {
+            key: value.label,
+            label: (
+                <MenuItemStyle key={value.label}>
+                    <a
+                        href={value.path || ''}
+                        target={value.shouldOpenInNewTab ? '_blank' : ''}
+                        rel="noopener noreferrer"
+                        tabIndex={0}
+                    >
+                        {value.label}
+                    </a>
+                </MenuItemStyle>
+            ),
+        };
+    });
+
+    const divider = {
+        key: 'divider',
+        type: 'divider',
+    };
+
+    const items = [
+        version
+            ? {
+                  key: 'version',
+                  label: (
+                      <MenuItemStyle key="version" disabled style={{ color: '#8C8C8C' }}>
+                          {version}
+                      </MenuItemStyle>
+                  ),
+              }
+            : null,
+        divider,
+        {
+            key: 'profile',
+            label: (
+                <MenuItemStyle key="profile">
+                    <a
+                        href={`/${entityRegistry.getPathName(EntityType.CorpUser)}/${_urn}`}
+                        rel="noopener noreferrer"
+                        tabIndex={0}
+                    >
+                        Your Profile
+                    </a>
+                </MenuItemStyle>
+            ),
+        },
+        ...themeConfigItems,
+        {
+            key: 'graphiQLLink',
+            label: (
+                <MenuItemStyle key="graphiQLLink">
+                    <a href="/api/graphiql">GraphiQL</a>
+                </MenuItemStyle>
+            ),
+        },
+        {
+            key: 'openapiLink',
+            label: (
+                <MenuItemStyle key="openapiLink">
+                    <a href="/openapi/swagger-ui/index.html">OpenAPI</a>
+                </MenuItemStyle>
+            ),
+        },
+        divider,
+        {
+            key: 'logout',
+            label: (
+                <MenuItemStyle danger key="logout" tabIndex={0}>
+                    <a href="/logOut" onClick={handleLogout} data-testid="log-out-menu-item">
+                        Sign Out
+                    </a>
+                </MenuItemStyle>
+            ),
+        },
+    ];
 
     return (
-        <Dropdown overlay={menu} trigger={['click']}>
+        <Dropdown menu={{ items }} trigger={['click']}>
             <DropdownWrapper data-testid="manage-account-menu">
                 <CustomAvatar photoUrl={_pictureLink} style={{ marginRight: 4 }} name={name} />
                 <DownArrow />
diff --git a/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx b/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx
index cce2a2336515d6..8936a935735c57 100644
--- a/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx
+++ b/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx
@@ -10,7 +10,7 @@ import {
     GlobalOutlined,
 } from '@ant-design/icons';
 import { Link } from 'react-router-dom';
-import { Button, Dropdown, Menu, Tooltip } from 'antd';
+import { Button, Dropdown, Tooltip } from 'antd';
 import { useAppConfig, useBusinessAttributesFlag } from '../../useAppConfig';
 import { ANTD_GRAY } from '../../entity/shared/constants';
 import { HOME_PAGE_INGESTION_ID } from '../../onboarding/config/HomePageOnboardingConfig';
@@ -35,12 +35,6 @@ const LinksWrapper = styled.div<{ areLinksHidden?: boolean }>`
     `}
 `;
 
-const MenuItem = styled(Menu.Item)`
-    font-size: 12px;
-    font-weight: bold;
-    max-width: 240px;
-`;
-
 const NavTitleContainer = styled.span`
     display: flex;
     align-items: center;
@@ -50,6 +44,7 @@ const NavTitleContainer = styled.span`
 
 const NavTitleText = styled.span`
     margin-left: 6px;
+    font-weight: bold;
 `;
 
 const NavTitleDescription = styled.div`
@@ -79,6 +74,59 @@ export function HeaderLinks(props: Props) {
 
     useToggleEducationStepIdsAllowList(!!showIngestion, HOME_PAGE_INGESTION_ID);
 
+    const items = [
+        {
+            key: 0,
+            label: (
+                <Link to="/glossary">
+                    <NavTitleContainer>
+                        <BookOutlined style={{ fontSize: '14px', fontWeight: 'bold' }} />
+                        <NavTitleText>Glossary</NavTitleText>
+                    </NavTitleContainer>
+                    <NavTitleDescription>View and modify your data dictionary</NavTitleDescription>
+                </Link>
+            ),
+        },
+        {
+            key: 1,
+            label: (
+                <Link to="/domains">
+                    <NavTitleContainer>
+                        <DomainIcon
+                            style={{
+                                fontSize: 14,
+                                fontWeight: 'bold',
+                            }}
+                        />
+                        <NavTitleText>Domains</NavTitleText>
+                    </NavTitleContainer>
+                    <NavTitleDescription>Manage related groups of data assets</NavTitleDescription>
+                </Link>
+            ),
+        },
+        ...(businessAttributesFlag
+            ? [
+                  {
+                      key: 2,
+                      label: (
+                          <Link to="/business-attribute">
+                              <NavTitleContainer>
+                                  <GlobalOutlined
+                                      style={{
+                                          fontSize: 14,
+                                          fontWeight: 'bold',
+                                      }}
+                                  />
+                                  <NavTitleText>Business Attribute</NavTitleText>
+                              </NavTitleContainer>
+                              <NavTitleDescription>Universal field for data consistency</NavTitleDescription>
+                          </Link>
+                      ),
+                  },
+              ]
+            : []),
+    ];
+
     return (
         <LinksWrapper areLinksHidden={areLinksHidden}>
             {showAnalytics && (
@@ -95,52 +143,7 @@ export function HeaderLinks(props: Props) {
                     </Link>
                 </LinkWrapper>
             )}
-            <Dropdown
-                trigger={['click']}
-                overlay={
-                    <Menu>
-                        <MenuItem key="0">
-                            <Link to="/glossary">
-                                <NavTitleContainer>
-                                    <BookOutlined style={{ fontSize: '14px', fontWeight: 'bold' }} />
-                                    <NavTitleText>Glossary</NavTitleText>
-                                </NavTitleContainer>
-                                <NavTitleDescription>View and modify your data dictionary</NavTitleDescription>
-                            </Link>
-                        </MenuItem>
-                        <MenuItem key="1">
-                            <Link to="/domains">
-                                <NavTitleContainer>
-                                    <DomainIcon
-                                        style={{
-                                            fontSize: 14,
-                                            fontWeight: 'bold',
-                                        }}
-                                    />
-                                    <NavTitleText>Domains</NavTitleText>
-                                </NavTitleContainer>
-                                <NavTitleDescription>Manage related groups of data assets</NavTitleDescription>
-                            </Link>
-                        </MenuItem>
-                        {businessAttributesFlag && (
-                            <MenuItem key="2">
-                                <Link to="/business-attribute">
-                                    <NavTitleContainer>
-                                        <GlobalOutlined
-                                            style={{
-                                                fontSize: 14,
-                                                fontWeight: 'bold',
-                                            }}
-                                        />
-                                        <NavTitleText>Business Attribute</NavTitleText>
-                                    </NavTitleContainer>
-                                    <NavTitleDescription>Universal field for data consistency</NavTitleDescription>
-                                </Link>
-                            </MenuItem>
-                        )}
-                    </Menu>
-                }
-            >
+            <Dropdown trigger={['click']} menu={{ items }}>
                 <LinkWrapper>
                     <Button type="text">
                         <SolutionOutlined /> Govern <DownOutlined style={{ fontSize: '6px' }} />
diff --git a/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx b/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx
index 5ba0536af1bb34..026cf6f6fa7240 100644
--- a/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx
+++ b/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx
@@ -62,7 +62,7 @@ export const BrowserWrapper = styled.div<{ isHidden: boolean; width?: string; ma
 `;
 
 type EditAttributeModalProps = {
-    visible: boolean;
+    open: boolean;
     onCloseModal: () => void;
     resources: ResourceRefInput[];
     type?: EntityType;
@@ -71,7 +71,7 @@ type EditAttributeModalProps = {
 };
 
 export default function EditBusinessAttributeModal({
-    visible,
+    open,
     type = EntityType.BusinessAttribute,
     operationType = OperationType.ADD,
     onCloseModal,
@@ -316,7 +316,7 @@ export default function EditBusinessAttributeModal({
     return (
         <Modal
             title={`${operationType === OperationType.ADD ? 'Add' : 'Remove'} ${entityRegistry.getEntityName(type)}s`}
-            visible={visible}
+            open={open}
             onCancel={onCloseModal}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/shared/businessAttribute/BusinessAttributeGroup.tsx b/datahub-web-react/src/app/shared/businessAttribute/BusinessAttributeGroup.tsx
index 0e77d650a14332..a8958b028e0ce8 100644
--- a/datahub-web-react/src/app/shared/businessAttribute/BusinessAttributeGroup.tsx
+++ b/datahub-web-react/src/app/shared/businessAttribute/BusinessAttributeGroup.tsx
@@ -84,7 +84,7 @@ export default function BusinessAttributeGroup({
             {showAddModal && !!entityUrn && !!entityType && (
                 <EditBusinessAttributeModal
                     type={addModalType}
-                    visible
+                    open
                     onCloseModal={() => {
                         onOpenModal?.();
                         setShowAddModal(false);
diff --git a/datahub-web-react/src/app/shared/getLogoFromPlatform.tsx b/datahub-web-react/src/app/shared/getLogoFromPlatform.tsx
deleted file mode 100644
index f32ab8b7dbca91..00000000000000
--- a/datahub-web-react/src/app/shared/getLogoFromPlatform.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import lookerLogo from '../../images/lookerlogo.png';
-import supersetLogo from '../../images/supersetlogo.png';
-import airflowLogo from '../../images/airflowlogo.png';
-import redashLogo from '../../images/redashlogo.png';
-
-/**
- * TODO: This is a temporary solution, until the backend can push logos for all data platform types.
- */
-export function getLogoFromPlatform(platform: string) {
-    if (platform.toLowerCase() === 'looker') {
-        return lookerLogo;
-    }
-    if (platform.toLowerCase() === 'superset') {
-        return supersetLogo;
-    }
-    if (platform.toLowerCase() === 'airflow') {
-        return airflowLogo;
-    }
-    if (platform.toLowerCase() === 'redash') {
-        return redashLogo;
-    }
-    return undefined;
-}
diff --git a/datahub-web-react/src/app/shared/health/healthUtils.tsx b/datahub-web-react/src/app/shared/health/healthUtils.tsx
index a3745da26ceea6..426e5d986ca55c 100644
--- a/datahub-web-react/src/app/shared/health/healthUtils.tsx
+++ b/datahub-web-react/src/app/shared/health/healthUtils.tsx
@@ -145,7 +145,7 @@ export const getHealthIcon = (type: HealthStatusType, status: HealthStatus, font
 export const getHealthRedirectPath = (type: HealthStatusType) => {
     switch (type) {
         case HealthStatusType.Assertions: {
-            return 'Validation/Assertions';
+            return 'Quality/List';
         }
         case HealthStatusType.Incidents: {
             return 'Incidents';
diff --git a/datahub-web-react/src/app/shared/share/ShareButton.tsx b/datahub-web-react/src/app/shared/share/ShareButton.tsx
index 7cb41317a587b1..342d367ecf5bbc 100644
--- a/datahub-web-react/src/app/shared/share/ShareButton.tsx
+++ b/datahub-web-react/src/app/shared/share/ShareButton.tsx
@@ -3,7 +3,7 @@ import styled from 'styled-components';
 import { Button, Dropdown } from 'antd';
 import { ShareAltOutlined } from '@ant-design/icons';
 import { EntityType } from '../../../types.generated';
-import ShareButtonMenu from './ShareButtonMenu';
+import useShareButtonMenu from './useShareButtonMenu';
 
 interface ShareButtonProps {
     urn: string;
@@ -22,15 +22,10 @@ const StyledShareIcon = styled(ShareAltOutlined)`
 `;
 
 export default function ShareButton({ urn, entityType, subType, name }: ShareButtonProps) {
+    const items = useShareButtonMenu({ urn, entityType, subType, name });
+
     return (
-        <Dropdown
-            trigger={['click']}
-            overlay={
-                <>
-                    <ShareButtonMenu urn={urn} entityType={entityType} subType={subType} name={name} />
-                </>
-            }
-        >
+        <Dropdown trigger={['click']} menu={items}>
             <StyledButton type="primary">
                 <StyledShareIcon />
                 Share
diff --git a/datahub-web-react/src/app/shared/share/ShareButtonMenu.tsx b/datahub-web-react/src/app/shared/share/ShareButtonMenu.tsx
deleted file mode 100644
index f669836c82186d..00000000000000
--- a/datahub-web-react/src/app/shared/share/ShareButtonMenu.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-import { Menu } from 'antd';
-import { EntityType } from '../../../types.generated';
-import { ANTD_GRAY } from '../../entity/shared/constants';
-import CopyLinkMenuItem from './items/CopyLinkMenuItem';
-import CopyUrnMenuItem from './items/CopyUrnMenuItem';
-import EmailMenuItem from './items/EmailMenuItem';
-import { useEntityRegistry } from '../../useEntityRegistry';
-
-interface ShareButtonMenuProps {
-    urn: string;
-    entityType: EntityType;
-    subType?: string | null;
-    name?: string | null;
-}
-
-const StyledMenu = styled(Menu)`
-    border: 1px solid ${ANTD_GRAY[3]};
-    border-radius: 4px;
-    min-width: 140px;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    gap: 10px;
-`;
-
-export default function ShareButtonMenu({ urn, entityType, subType, name }: ShareButtonMenuProps) {
-    const entityRegistry = useEntityRegistry();
-    const displayName = name || urn;
-    const displayType = subType || entityRegistry.getEntityName(entityType) || entityType;
-
-    return (
-        <StyledMenu selectable={false}>
-            {navigator.clipboard && <CopyLinkMenuItem key="0" />}
-            {navigator.clipboard && <CopyUrnMenuItem key="1" urn={urn} type={displayType} />}
-            <EmailMenuItem key="2" urn={urn} name={displayName} type={displayType} />
-        </StyledMenu>
-    );
-}
diff --git a/datahub-web-react/src/app/shared/share/items/CopyLinkMenuItem.tsx b/datahub-web-react/src/app/shared/share/items/CopyLinkMenuItem.tsx
index 49a3a717dd2004..86345a4ca3a892 100644
--- a/datahub-web-react/src/app/shared/share/items/CopyLinkMenuItem.tsx
+++ b/datahub-web-react/src/app/shared/share/items/CopyLinkMenuItem.tsx
@@ -2,17 +2,11 @@ import React, { useState } from 'react';
 import styled from 'styled-components/macro';
 import { CheckOutlined, LinkOutlined } from '@ant-design/icons';
 import { Tooltip } from 'antd';
-import MenuItem from 'antd/lib/menu/MenuItem';
 import { ANTD_GRAY } from '../../../entity/shared/constants';
 
-interface CopyLinkMenuItemProps {
-    key: string;
-}
-
-const StyledMenuItem = styled(MenuItem)`
+const StyledMenuItem = styled.div`
     && {
         color: ${ANTD_GRAY[8]};
-        background-color: ${ANTD_GRAY[1]};
     }
 `;
 
@@ -24,7 +18,7 @@ const StyledLinkOutlined = styled(LinkOutlined)`
     font-size: 14px;
 `;
 
-export default function CopyLinkMenuItem({ key }: CopyLinkMenuItemProps) {
+export default function CopyLinkMenuItem() {
     /**
      * Whether button has been clicked
      */
@@ -32,7 +26,6 @@ export default function CopyLinkMenuItem({ key }: CopyLinkMenuItemProps) {
 
     return (
         <StyledMenuItem
-            key={key}
             onClick={() => {
                 navigator.clipboard.writeText(window.location.href);
                 setIsClicked(true);
diff --git a/datahub-web-react/src/app/shared/share/items/CopyUrnMenuItem.tsx b/datahub-web-react/src/app/shared/share/items/CopyUrnMenuItem.tsx
index c9388dfe9b181c..9b0d1237c36e8f 100644
--- a/datahub-web-react/src/app/shared/share/items/CopyUrnMenuItem.tsx
+++ b/datahub-web-react/src/app/shared/share/items/CopyUrnMenuItem.tsx
@@ -2,19 +2,16 @@ import React, { useState } from 'react';
 import styled from 'styled-components';
 import { CheckOutlined, CopyOutlined } from '@ant-design/icons';
 import { Tooltip } from 'antd';
-import MenuItem from 'antd/lib/menu/MenuItem';
 import { ANTD_GRAY } from '../../../entity/shared/constants';
 
 interface CopyUrnMenuItemProps {
     urn: string;
-    key: string;
     type: string;
 }
 
-const StyledMenuItem = styled(MenuItem)`
+const StyledMenuItem = styled.div`
     && {
         color: ${ANTD_GRAY[8]};
-        background-color: ${ANTD_GRAY[1]};
     }
 `;
 
@@ -22,7 +19,7 @@ const TextSpan = styled.span`
     padding-left: 12px;
 `;
 
-export default function CopyUrnMenuItem({ urn, key, type }: CopyUrnMenuItemProps) {
+export default function CopyUrnMenuItem({ urn, type }: CopyUrnMenuItemProps) {
     /**
      * Whether button has been clicked
      */
@@ -30,7 +27,6 @@ export default function CopyUrnMenuItem({ urn, key, type }: CopyUrnMenuItemProps
 
     return (
         <StyledMenuItem
-            key={key}
             onClick={() => {
                 navigator.clipboard.writeText(urn);
                 setIsClicked(true);
diff --git a/datahub-web-react/src/app/shared/share/items/EmailMenuItem.tsx b/datahub-web-react/src/app/shared/share/items/EmailMenuItem.tsx
index f65e25b140aeb2..56829e403f6b05 100644
--- a/datahub-web-react/src/app/shared/share/items/EmailMenuItem.tsx
+++ b/datahub-web-react/src/app/shared/share/items/EmailMenuItem.tsx
@@ -3,20 +3,17 @@ import styled from 'styled-components';
 import { Tooltip } from 'antd';
 import { CheckOutlined, MailOutlined } from '@ant-design/icons';
 import qs from 'query-string';
-import MenuItem from 'antd/lib/menu/MenuItem';
 import { ANTD_GRAY } from '../../../entity/shared/constants';
 
 interface EmailMenuItemProps {
     urn: string;
     name: string;
     type: string;
-    key: string;
 }
 
-const StyledMenuItem = styled(MenuItem)`
+const StyledMenuItem = styled.div`
     && {
         color: ${ANTD_GRAY[8]};
-        background-color: ${ANTD_GRAY[1]};
     }
 `;
 
@@ -24,7 +21,7 @@ const TextSpan = styled.span`
     padding-left: 12px;
 `;
 
-export default function EmailMenuItem({ urn, name, type, key }: EmailMenuItemProps) {
+export default function EmailMenuItem({ urn, name, type }: EmailMenuItemProps) {
     /**
      * Whether button has been clicked
      */
@@ -41,7 +38,6 @@ export default function EmailMenuItem({ urn, name, type, key }: EmailMenuItemPro
 
     return (
         <StyledMenuItem
-            key={key}
             onClick={() => {
                 setIsClicked(true);
             }}
diff --git a/datahub-web-react/src/app/shared/share/useShareButtonMenu.tsx b/datahub-web-react/src/app/shared/share/useShareButtonMenu.tsx
new file mode 100644
index 00000000000000..7c53eb510940b8
--- /dev/null
+++ b/datahub-web-react/src/app/shared/share/useShareButtonMenu.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { MenuProps } from 'antd';
+import { EntityType } from '../../../types.generated';
+import CopyLinkMenuItem from './items/CopyLinkMenuItem';
+import CopyUrnMenuItem from './items/CopyUrnMenuItem';
+import EmailMenuItem from './items/EmailMenuItem';
+import { useEntityRegistry } from '../../useEntityRegistry';
+
+interface ShareButtonMenuProps {
+    urn: string;
+    entityType: EntityType;
+    subType?: string | null;
+    name?: string | null;
+}
+
+export default function useShareButtonMenu({ urn, entityType, subType, name }: ShareButtonMenuProps): MenuProps {
+    const entityRegistry = useEntityRegistry();
+    const displayName = name || urn;
+    const displayType = subType || entityRegistry.getEntityName(entityType) || entityType;
+
+    const items = [
+        navigator.clipboard && {
+            key: 0,
+            label: <CopyLinkMenuItem key="0" />,
+        },
+        navigator.clipboard && {
+            key: 1,
+            label: <CopyUrnMenuItem key="1" urn={urn} type={displayType} />,
+        },
+        {
+            key: 2,
+            label: <EmailMenuItem key="2" urn={urn} name={displayName} type={displayType} />,
+        },
+    ];
+
+    return { items };
+}
diff --git a/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx b/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx
index 73e99c319441d6..7f2f80e023a6b9 100644
--- a/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx
+++ b/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx
@@ -29,7 +29,7 @@ export enum OperationType {
 }
 
 type EditTagsModalProps = {
-    visible: boolean;
+    open: boolean;
     onCloseModal: () => void;
     resources: ResourceRefInput[];
     type?: EntityType;
@@ -93,7 +93,7 @@ const defaultValuesToSelectedValue = (defaultValues?: { urn: string; entity?: En
 };
 
 export default function EditTagTermsModal({
-    visible,
+    open,
     onCloseModal,
     resources,
     type = EntityType.Tag,
@@ -213,7 +213,7 @@ export default function EditTagTermsModal({
     if (showCreateModal) {
         return (
             <CreateTagModal
-                visible={visible}
+                open={open}
                 onClose={onCloseModal}
                 onBack={handleOnClickBack}
                 tagName={inputValue}
@@ -443,7 +443,7 @@ export default function EditTagTermsModal({
     return (
         <Modal
             title={`${operationType === OperationType.ADD ? 'Add' : 'Remove'} ${entityRegistry.getEntityName(type)}s`}
-            visible={visible}
+            open={open}
             onCancel={onCloseModal}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/shared/tags/CreateTagModal.tsx b/datahub-web-react/src/app/shared/tags/CreateTagModal.tsx
index 874dd3313f8de2..7c20f9a2d10a42 100644
--- a/datahub-web-react/src/app/shared/tags/CreateTagModal.tsx
+++ b/datahub-web-react/src/app/shared/tags/CreateTagModal.tsx
@@ -8,7 +8,7 @@ import { useEnterKeyListener } from '../useEnterKeyListener';
 import { handleBatchError } from '../../entity/shared/utils';
 
 type CreateTagModalProps = {
-    visible: boolean;
+    open: boolean;
     onClose: () => void;
     onBack: () => void;
     tagName: string;
@@ -19,7 +19,7 @@ const FullWidthSpace = styled(Space)`
     width: 100%;
 `;
 
-export default function CreateTagModal({ onClose, onBack, visible, tagName, resources }: CreateTagModalProps) {
+export default function CreateTagModal({ onClose, onBack, open, tagName, resources }: CreateTagModalProps) {
     const [stagedDescription, setStagedDescription] = useState('');
     const [batchAddTagsMutation] = useBatchAddTagsMutation();
 
@@ -80,7 +80,7 @@ export default function CreateTagModal({ onClose, onBack, visible, tagName, reso
     return (
         <Modal
             title={`Create ${tagName}`}
-            visible={visible}
+            open={open}
             onCancel={onClose}
             footer={
                 <>
diff --git a/datahub-web-react/src/app/shared/tags/TagProfileDrawer.tsx b/datahub-web-react/src/app/shared/tags/TagProfileDrawer.tsx
index ffc27685fdc964..bebbdea027d2d1 100644
--- a/datahub-web-react/src/app/shared/tags/TagProfileDrawer.tsx
+++ b/datahub-web-react/src/app/shared/tags/TagProfileDrawer.tsx
@@ -27,7 +27,7 @@ export const TagProfileDrawer = ({ closeTagProfileDrawer, tagProfileDrawerVisibl
                 placement="right"
                 closable={false}
                 onClose={closeTagProfileDrawer}
-                visible={tagProfileDrawerVisible}
+                open={tagProfileDrawerVisible}
                 footer={
                     <DetailsLayout>
                         <Space>
diff --git a/datahub-web-react/src/app/shared/tags/TagTermGroup.tsx b/datahub-web-react/src/app/shared/tags/TagTermGroup.tsx
index 66ff1eaf628923..70d29cd8be7902 100644
--- a/datahub-web-react/src/app/shared/tags/TagTermGroup.tsx
+++ b/datahub-web-react/src/app/shared/tags/TagTermGroup.tsx
@@ -203,7 +203,7 @@ export default function TagTermGroup({
             {showAddModal && !!entityUrn && !!entityType && (
                 <EditTagTermsModal
                     type={addModalType}
-                    visible
+                    open
                     onCloseModal={() => {
                         onOpenModal?.();
                         setShowAddModal(false);
diff --git a/datahub-web-react/src/app/useAppConfig.ts b/datahub-web-react/src/app/useAppConfig.ts
index 12470acdf64eef..3b7e89166c95a5 100644
--- a/datahub-web-react/src/app/useAppConfig.ts
+++ b/datahub-web-react/src/app/useAppConfig.ts
@@ -28,6 +28,11 @@ export function useIsAppConfigContextLoaded() {
     return appConfig.loaded;
 }
 
+export function useIsEditableDatasetNameEnabled() {
+    const appConfig = useAppConfig();
+    return appConfig.config.featureFlags.editableDatasetNameEnabled;
+}
+
 export function useIsShowSeparateSiblingsEnabled() {
     const appConfig = useAppConfig();
     return appConfig.config.featureFlags.showSeparateSiblings;
diff --git a/datahub-web-react/src/appConfigContext.tsx b/datahub-web-react/src/appConfigContext.tsx
index 54547aaa5642e0..f119f8bc7d53af 100644
--- a/datahub-web-react/src/appConfigContext.tsx
+++ b/datahub-web-react/src/appConfigContext.tsx
@@ -54,6 +54,7 @@ export const DEFAULT_APP_CONFIG = {
         platformBrowseV2: false,
         businessAttributeEntityEnabled: false,
         dataContractsEnabled: false,
+        editableDatasetNameEnabled: false,
         showSeparateSiblings: false,
     },
 };
diff --git a/datahub-web-react/src/conf/Global.ts b/datahub-web-react/src/conf/Global.ts
index 433b0b6416e780..e0172d3f07e41e 100644
--- a/datahub-web-react/src/conf/Global.ts
+++ b/datahub-web-react/src/conf/Global.ts
@@ -41,3 +41,11 @@ export const CLIENT_AUTH_COOKIE = 'actor';
  * Name of the unique browser id cookie generated on client side
  */
 export const BROWSER_ID_COOKIE = 'bid';
+
+/** New Routes Map for redirection */
+export const NEW_ROUTE_MAP = {
+    '/Validation/Assertions': '/Quality/List',
+    '/Validation/Tests': '/Governance/Tests',
+    '/Validation/Data%20Contract': '/Quality/Data%20Contract',
+    '/Validation': '/Quality',
+};
diff --git a/datahub-web-react/src/conf/utils.ts b/datahub-web-react/src/conf/utils.ts
new file mode 100644
index 00000000000000..7adb82cf71be52
--- /dev/null
+++ b/datahub-web-react/src/conf/utils.ts
@@ -0,0 +1,26 @@
+/**
+ *
+ * as per the new route object
+ * We are redirecting older routes to new one
+ * e.g. 
+ * {
+         '/Validation/Assertions': '/Quality/List',
+    }
+ *  */
+
+export const getRedirectUrl = (newRoutes: { [key: string]: string }) => {
+    let newPathname = `${window.location.pathname}${window.location.search}`;
+    if (!newRoutes) {
+        return newPathname;
+    }
+
+    // eslint-disable-next-line no-restricted-syntax
+    for (const path of Object.keys(newRoutes)) {
+        if (newPathname.indexOf(path) !== -1) {
+            newPathname = newPathname.replace(path, newRoutes[path]);
+            break;
+        }
+    }
+
+    return `${newPathname}${window.location.search}`;
+};
diff --git a/datahub-web-react/src/graphql/app.graphql b/datahub-web-react/src/graphql/app.graphql
index bfca27a4ad106a..2a0baf238761f3 100644
--- a/datahub-web-react/src/graphql/app.graphql
+++ b/datahub-web-react/src/graphql/app.graphql
@@ -69,6 +69,7 @@ query appConfig {
             platformBrowseV2
             businessAttributeEntityEnabled
             dataContractsEnabled
+            editableDatasetNameEnabled
             showSeparateSiblings
         }
     }
@@ -89,6 +90,16 @@ query getGlobalViewsSettings {
     }
 }
 
+query getDocPropagationSettings {
+    docPropagationSettings {
+        docColumnPropagation
+    }
+}
+
 mutation updateGlobalViewsSettings($input: UpdateGlobalViewsSettingsInput!) {
     updateGlobalViewsSettings(input: $input)
 }
+
+mutation updateDocPropagationSettings($input: UpdateDocPropagationSettingsInput!) {
+    updateDocPropagationSettings(input: $input)
+}
diff --git a/datahub-web-react/src/graphql/browse.graphql b/datahub-web-react/src/graphql/browse.graphql
index 62ae2168d857ac..dd4445947520fb 100644
--- a/datahub-web-react/src/graphql/browse.graphql
+++ b/datahub-web-react/src/graphql/browse.graphql
@@ -17,6 +17,7 @@ query getBrowseResults($input: BrowseInput!) {
                     description
                 }
                 editableProperties {
+                    name
                     description
                 }
                 platform {
diff --git a/datahub-web-react/src/graphql/fragments.graphql b/datahub-web-react/src/graphql/fragments.graphql
index e8b621df649a95..e5bbb5f0dc29d5 100644
--- a/datahub-web-react/src/graphql/fragments.graphql
+++ b/datahub-web-react/src/graphql/fragments.graphql
@@ -251,6 +251,7 @@ fragment nonRecursiveDatasetFields on Dataset {
         }
     }
     editableProperties {
+        name
         description
     }
     ownership {
@@ -736,6 +737,37 @@ fragment schemaFieldFields on SchemaField {
                 ...businessAttribute
             }
         }
+        documentation {
+            documentations {
+                documentation
+                attribution {
+                    time
+                    actor {
+                        urn
+                        type
+                        ...entityDisplayNameFields
+                    }
+                    source {
+                        urn
+                        type
+                    }
+                    sourceDetail {
+                        key
+                        value
+                    }
+                }
+            }
+        }
+        parent {
+            urn
+            type
+            ...entityDisplayNameFields
+            ... on Dataset {
+                platform {
+                    ...platformFields
+                }
+            }
+        }
     }
 }
 
diff --git a/datahub-web-react/src/graphql/group.graphql b/datahub-web-react/src/graphql/group.graphql
index ee04489540f9c7..60da627fd254df 100644
--- a/datahub-web-react/src/graphql/group.graphql
+++ b/datahub-web-react/src/graphql/group.graphql
@@ -48,6 +48,7 @@ query getGroup($urn: String!, $membersCount: Int!) {
                 direction: INCOMING
                 start: 0
                 count: $membersCount
+                includeSoftDelete: false
             }
         ) {
             start
@@ -86,6 +87,7 @@ query getAllGroupMembers($urn: String!, $start: Int!, $count: Int!) {
                 direction: INCOMING
                 start: $start
                 count: $count
+                includeSoftDelete: false
             }
         ) {
             start
@@ -121,7 +123,15 @@ query getAllGroupMembers($urn: String!, $start: Int!, $count: Int!) {
 
 query getGroupMembers($urn: String!, $start: Int!, $count: Int!) {
     corpGroup(urn: $urn) {
-        relationships(input: { types: ["IsMemberOfGroup"], direction: INCOMING, start: $start, count: $count }) {
+        relationships(
+            input: {
+                types: ["IsMemberOfGroup"]
+                direction: INCOMING
+                start: $start
+                count: $count
+                includeSoftDelete: false
+            }
+        ) {
             start
             count
             total
@@ -155,7 +165,15 @@ query getGroupMembers($urn: String!, $start: Int!, $count: Int!) {
 
 query getNativeGroupMembers($urn: String!, $start: Int!, $count: Int!) {
     corpGroup(urn: $urn) {
-        relationships(input: { types: ["IsMemberOfNativeGroup"], direction: INCOMING, start: $start, count: $count }) {
+        relationships(
+            input: {
+                types: ["IsMemberOfNativeGroup"]
+                direction: INCOMING
+                start: $start
+                count: $count
+                includeSoftDelete: false
+            }
+        ) {
             start
             count
             total
@@ -209,7 +227,13 @@ query listGroups($input: ListGroupsInput!) {
                 pictureLink
             }
             memberCount: relationships(
-                input: { types: ["IsMemberOfGroup", "IsMemberOfNativeGroup"], direction: INCOMING, start: 0, count: 1 }
+                input: {
+                    types: ["IsMemberOfGroup", "IsMemberOfNativeGroup"]
+                    direction: INCOMING
+                    start: 0
+                    count: 1
+                    includeSoftDelete: false
+                }
             ) {
                 total
             }
diff --git a/datahub-web-react/src/graphql/preview.graphql b/datahub-web-react/src/graphql/preview.graphql
index e675f142a1eeb5..1bee614dd7adbe 100644
--- a/datahub-web-react/src/graphql/preview.graphql
+++ b/datahub-web-react/src/graphql/preview.graphql
@@ -9,6 +9,7 @@ fragment entityPreview on Entity {
             ...platformFields
         }
         editableProperties {
+            name
             description
         }
         platformNativeType
diff --git a/datahub-web-react/src/graphql/search.graphql b/datahub-web-react/src/graphql/search.graphql
index b0acc454fa55b2..38c9df0a636d0f 100644
--- a/datahub-web-react/src/graphql/search.graphql
+++ b/datahub-web-react/src/graphql/search.graphql
@@ -335,6 +335,7 @@ fragment nonSiblingsDatasetSearchFields on Dataset {
         ...dataPlatformInstanceFields
     }
     editableProperties {
+        name
         description
     }
     access {
@@ -974,6 +975,12 @@ fragment entityField on SchemaFieldEntity {
     parent {
         urn
         type
+        ...entityDisplayNameFields
+        ... on Dataset {
+            platform {
+                ...platformFields
+            }
+        }
     }
     fieldPath
     structuredProperties {
diff --git a/datahub-web-react/src/graphql/view.graphql b/datahub-web-react/src/graphql/view.graphql
index 9d38a09b8280bc..f7b82a1e46f046 100644
--- a/datahub-web-react/src/graphql/view.graphql
+++ b/datahub-web-react/src/graphql/view.graphql
@@ -39,6 +39,12 @@ query listGlobalViews($start: Int!, $count: Int!, $query: String) {
     }
 }
 
+query getView($urn: String!) {
+    view(urn: $urn) {
+        ...view
+    }
+}
+
 mutation createView($input: CreateViewInput!) {
     createView(input: $input) {
         ...view
diff --git a/datahub-web-react/src/images/dagsterlogo.svg b/datahub-web-react/src/images/dagsterlogo.svg
new file mode 100644
index 00000000000000..d2ae628553a7dd
--- /dev/null
+++ b/datahub-web-react/src/images/dagsterlogo.svg
@@ -0,0 +1,11 @@
+<svg width="560" height="560" viewBox="0 0 560 560" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M221.556 440.815C221.562 442.771 221.97 444.704 222.757 446.494C223.543 448.285 224.689 449.894 226.125 451.221C227.56 452.548 229.254 453.565 231.1 454.208C232.946 454.851 234.905 455.107 236.854 454.959C310.941 449.655 380.913 397.224 403.252 315.332C404.426 310.622 407.96 308.26 412.669 308.26C415.082 308.357 417.36 309.402 419.009 311.168C420.658 312.933 421.545 315.278 421.477 317.694C421.477 335.953 398.006 383.674 364.442 411.368C362.731 412.807 361.367 414.614 360.452 416.654C359.536 418.694 359.092 420.914 359.154 423.149C359.188 424.967 359.58 426.76 360.308 428.425C361.036 430.091 362.086 431.596 363.397 432.855C364.708 434.114 366.254 435.101 367.948 435.761C369.641 436.421 371.448 436.739 373.264 436.699C376.205 436.699 380.913 434.931 386.795 429.627C410.266 408.412 455 348.909 455 283.508C455 187.624 380.872 105 277.418 105C185.106 105 105.138 180.414 105.138 267.611C105.138 325.345 151.004 368.937 211.56 368.937C258.019 368.937 300.945 335.953 312.708 290.58C313.881 285.87 317.402 283.508 322.11 283.508C324.525 283.606 326.804 284.65 328.455 286.415C330.106 288.181 330.996 290.525 330.933 292.942C330.933 313.564 292.122 385.484 213.327 385.484C194.509 385.484 170.996 380.18 154.524 370.746C152.319 369.677 149.917 369.075 147.469 368.978C145.594 368.906 143.725 369.223 141.979 369.909C140.232 370.594 138.647 371.634 137.321 372.962C135.996 374.291 134.96 375.879 134.278 377.627C133.596 379.376 133.283 381.247 133.359 383.122C133.435 385.524 134.123 387.867 135.357 389.929C136.592 391.991 138.332 393.703 140.414 394.904C162.173 407.334 188.047 413.757 214.501 413.757C280.359 413.757 340.335 368.978 357.98 302.997C359.154 298.287 362.688 295.926 367.383 295.926C369.797 296.023 372.077 297.067 373.728 298.832C375.379 300.598 376.269 302.943 376.205 305.359C376.205 332.459 327.992 419.655 235.087 426.727C231.492 426.994 228.123 428.579 225.625 431.18C223.128 433.78 221.679 437.211 221.556 440.815V440.815Z" fill="#4F43DD"/>
+<path d="M313.62 215.178C326.301 215.083 338.748 218.589 349.517 225.288C350.605 219.33 351.206 213.292 351.312 207.236C351.312 179.266 329.995 154.211 304.038 154.211C283.853 154.211 271.233 170.937 271.233 191.6C271.137 202.763 275.057 213.588 282.279 222.098C292.062 217.431 302.782 215.064 313.62 215.178V215.178Z" fill="white"/>
+<path d="M374.439 316.505C378.042 304.185 379.63 295.635 379.63 290.083C379.52 287.685 378.493 285.421 376.761 283.76C375.028 282.099 372.724 281.168 370.325 281.16C368.089 281.202 365.932 281.99 364.196 283.399C362.46 284.808 361.244 286.757 360.743 288.936C359.762 292.983 357.664 303.95 355.593 310.912C356.449 308.306 357.231 305.658 357.94 302.97C359.114 298.246 362.648 295.898 367.342 295.898C369.756 295.991 372.035 297.033 373.687 298.796C375.338 300.559 376.228 302.902 376.165 305.318C376.054 309.115 375.446 312.881 374.356 316.519L374.439 316.505Z" fill="#352D8E"/>
+<path d="M424.418 303.632C424.305 301.237 423.278 298.977 421.55 297.317C419.821 295.658 417.522 294.724 415.126 294.709C412.893 294.754 410.739 295.543 409.006 296.952C407.272 298.36 406.059 300.308 405.558 302.485C404.564 306.629 402.424 317.761 400.325 324.709H400.422C401.444 321.615 402.396 318.48 403.183 315.289C404.357 310.565 407.891 308.217 412.599 308.217C415.012 308.311 417.29 309.353 418.939 311.116C420.588 312.88 421.475 315.223 421.408 317.637C421.341 320.569 420.938 323.485 420.207 326.325C423.134 316.049 424.418 308.618 424.418 303.632Z" fill="#352D8E"/>
+<path d="M313.619 215.178C319.921 215.166 326.196 216.007 332.272 217.678C335.462 213.326 337.056 208.008 336.786 202.618C336.516 197.228 334.398 192.095 330.789 188.084C327.18 184.073 322.3 181.428 316.97 180.594C311.64 179.761 306.185 180.789 301.524 183.507L311.189 199.419L293.089 191.587C290.637 195.545 289.407 200.139 289.555 204.793C289.702 209.446 291.22 213.953 293.917 217.747C300.34 216.016 306.967 215.152 313.619 215.178V215.178Z" fill="#030615"/>
+<path d="M174.172 317.583C181.797 317.583 187.979 311.399 187.979 303.771C187.979 296.143 181.797 289.959 174.172 289.959C166.547 289.959 160.365 296.143 160.365 303.771C160.365 311.399 166.547 317.583 174.172 317.583Z" fill="#352D8E"/>
+<path d="M174.172 262.335C181.797 262.335 187.979 256.151 187.979 248.523C187.979 240.895 181.797 234.711 174.172 234.711C166.547 234.711 160.365 240.895 160.365 248.523C160.365 256.151 166.547 262.335 174.172 262.335Z" fill="#352D8E"/>
+<path d="M146.558 289.958C154.183 289.958 160.364 283.774 160.364 276.146C160.364 268.518 154.183 262.334 146.558 262.334C138.932 262.334 132.751 268.518 132.751 276.146C132.751 283.774 138.932 289.958 146.558 289.958Z" fill="#352D8E"/>
+<path d="M208.688 368.91H211.45C257.909 368.91 300.835 335.927 312.598 290.554C313.771 285.844 317.292 283.482 322 283.482C324.415 283.579 326.694 284.624 328.345 286.389C329.996 288.155 330.886 290.499 330.823 292.916C330.612 297.737 329.522 302.479 327.606 306.908C327.939 306.393 328.23 305.853 328.476 305.292C331.969 297.304 333.774 288.679 333.777 279.96C333.777 266.41 324.361 257.571 310.844 257.571C287.276 257.571 282.554 278.151 272.614 300.154C262.3 322.999 243.357 347.709 195.586 347.709C145.951 347.709 94.9487 312.944 107.389 242.253C107.54 241.369 107.665 240.582 107.761 239.85C105.939 248.982 105.014 258.272 105 267.584C105.138 324.491 149.582 367.585 208.688 368.91Z" fill="#352D8E"/>
+</svg>
diff --git a/datahub-web-react/src/images/prefectlogo.svg b/datahub-web-react/src/images/prefectlogo.svg
new file mode 100644
index 00000000000000..54c4e7f553327b
--- /dev/null
+++ b/datahub-web-react/src/images/prefectlogo.svg
@@ -0,0 +1 @@
+<svg viewBox="-0.06000000000002065 -0.26 372.94 603.6800000000001" xmlns="http://www.w3.org/2000/svg" width="1544" height="2500"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="321.038" x2="190.456" y1="372.543" y2="236.209"><stop offset="0" stop-color="#b4c0c9"/><stop offset="1" stop-color="#94a5b2"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="18.929" x2="216.256" y1="266.734" y2="622.904"><stop offset="0" stop-color="#647989"/><stop offset="1" stop-color="#2f383e"/></linearGradient><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="125.8" x2="336.043" y1="36.466" y2="236.983"><stop offset="0" stop-color="#2edaff"/><stop offset="1" stop-color="#004bff"/></linearGradient><path d="M372.88 279.56l-186.55-93.5v190.06z" fill="url(#a)"/><path d="M210.09 363.81l-23.76-141.29v153.6zM348.97 267.48l-162.64-81.42v20.73z" fill="#0d3958" opacity=".2"/><path d="M11.23 597.97c.39-.23 171.36-83.14 171.51-83.23 2.34-1.44 3.66-1.79 3.74-5.91l-.08-322.77c-72.43 36.23-174.39 87.12-183.19 91.8-2.81 1.56-3.2 2.89-3.2 4.91v306.87c-.07 6.93.39 13.78 11.22 8.33z" fill="url(#b)"/><path d="M372.88 96.68v182.81S24.85 105.32 12.81 99.09c-8.03-4.2-8.03-8.19 0-12.69C20.2 82.26 161.42 11.82 183.07.98c2.8-1.24 3.67-1.24 6.15-.23l180.17 90.31c2.57 1.26 3.35 2.5 3.49 5.62z" fill="url(#c)"/></svg>
\ No newline at end of file
diff --git a/datahub-web-react/src/images/saclogo.svg b/datahub-web-react/src/images/saclogo.svg
new file mode 100644
index 00000000000000..91bacb51f92a49
--- /dev/null
+++ b/datahub-web-react/src/images/saclogo.svg
@@ -0,0 +1,19 @@
+<svg width="256" height="256" viewBox="10 10 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip1_3169_9404)">
+<path d="M19.3121 12.7918C20.9626 12.1015 22.7391 11.7867 24.5142 11.8619C24.537 11.8628 24.5476 11.8677 24.5539 11.8711C24.5621 11.8756 24.5762 11.8858 24.5919 11.9069C24.6253 11.9519 24.6528 12.0308 24.6363 12.1286L22.8975 22.4223C22.6578 23.8417 23.4472 25.2344 24.7881 25.7578L34.513 29.5538C34.6054 29.5899 34.6589 29.6541 34.6804 29.7058C34.6905 29.7301 34.692 29.7474 34.6916 29.7568C34.6914 29.764 34.6901 29.7756 34.6792 29.7956C33.8318 31.3572 32.6491 32.7197 31.2091 33.7811C29.3599 35.1441 27.1623 35.955 24.8711 36.1197C22.5798 36.2844 20.2888 35.7961 18.2637 34.7116C16.2387 33.6271 14.5626 31.9907 13.4299 29.9922C12.2971 27.9937 11.7541 25.7151 11.8639 23.4205C11.9736 21.126 12.7316 18.9096 14.0499 17.0283C15.3682 15.1471 17.1928 13.6781 19.3121 12.7918Z" stroke="url(#paint1_linear_3169_9404)" stroke-width="2.7"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.3878 25.3829C36.3778 25.7644 37.4764 25.1449 37.4976 24.0841C37.5056 23.6807 37.495 23.2764 37.4656 22.8723C37.322 20.899 36.7332 18.982 35.7421 17.2613C34.751 15.5405 33.3827 14.0592 31.7368 12.9254C31.3966 12.6911 31.0463 12.4728 30.6872 12.2711C29.7615 11.7512 28.6668 12.3792 28.489 13.4259L27.2378 20.7923C27.1034 21.5839 27.5454 22.3607 28.2947 22.6495L35.3878 25.3829Z" fill="url(#paint2_linear_3169_9404)"/>
+</g>
+<defs>
+<linearGradient id="paint1_linear_3169_9404" x1="14.3288" y1="14.5387" x2="33.2053" y2="32.4019" gradientUnits="userSpaceOnUse">
+<stop stop-color="#0195FF"/>
+<stop offset="0.991028" stop-color="#1147E9"/>
+</linearGradient>
+<linearGradient id="paint2_linear_3169_9404" x1="28.7346" y1="14.058" x2="37.8097" y2="21.0485" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1348FF"/>
+<stop offset="1" stop-color="#06238D"/>
+</linearGradient>
+<clipPath id="clip1_3169_9404">
+<rect width="27" height="27" fill="white" transform="translate(10.5 10.501)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/datahub-web-react/yarn.lock b/datahub-web-react/yarn.lock
index 4268acf155de1d..db55cb4f095c08 100644
--- a/datahub-web-react/yarn.lock
+++ b/datahub-web-react/yarn.lock
@@ -4510,7 +4510,14 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
+  dependencies:
+    fill-range "^7.1.1"
+
+braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -6052,6 +6059,13 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 filter-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
@@ -7654,11 +7668,11 @@ micromark@^2.11.3, micromark@~2.11.0, micromark@~2.11.3:
     parse-entities "^2.0.0"
 
 micromatch@^4.0.4, micromatch@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 mime-db@1.52.0:
diff --git a/docker/datahub-frontend/Dockerfile b/docker/datahub-frontend/Dockerfile
index a828f1d8c27ad5..89974e56575b07 100644
--- a/docker/datahub-frontend/Dockerfile
+++ b/docker/datahub-frontend/Dockerfile
@@ -25,24 +25,25 @@ RUN apk --no-cache --update-cache --available upgrade \
 
 ENV LD_LIBRARY_PATH="/lib:/lib64"
 
-FROM base as prod-install
+FROM base AS unpack
 
 COPY ./datahub-frontend.zip /
-RUN unzip datahub-frontend.zip -d /datahub-frontend \
-   && mv /datahub-frontend/main/* /datahub-frontend \
-   && rmdir /datahub-frontend/main \
-   && rm datahub-frontend.zip
+RUN unzip datahub-frontend.zip -d /tmp/out \
+   && mv /tmp/out/main /datahub-frontend
 COPY ./docker/monitoring/client-prometheus-config.yaml /datahub-frontend/
 RUN chown -R datahub:datahub /datahub-frontend && chmod 755 /datahub-frontend
 
-FROM base as dev-install
+FROM base AS prod-install
+
+COPY --from=unpack /datahub-frontend/ /datahub-frontend/
+
+FROM base AS dev-install
 # Dummy stage for development. Assumes code is built on your machine and mounted to this image.
 # See this excellent thread https://github.com/docker/cli/issues/1134
 VOLUME [ "/datahub-frontend" ]
 
-FROM ${APP_ENV}-install as final
-COPY ./docker/datahub-frontend/start.sh /
-RUN chown datahub:datahub /start.sh && chmod 755 /start.sh
+FROM ${APP_ENV}-install AS final
+COPY --chown=datahub:datahub --chmod=755 ./docker/datahub-frontend/start.sh /
 USER datahub
 
 ARG SERVER_PORT=9002
diff --git a/docker/datahub-frontend/env/docker.env b/docker/datahub-frontend/env/docker.env
index 655efb4b202bc0..7e490813c93cfd 100644
--- a/docker/datahub-frontend/env/docker.env
+++ b/docker/datahub-frontend/env/docker.env
@@ -22,9 +22,9 @@ JAVA_OPTS=-Xms512m -Xmx512m -Dhttp.port=9002 -Dconfig.file=datahub-frontend/conf
 # Uncomment & populate these configs to enable OIDC SSO in React application.
 # Required OIDC configs
 # AUTH_OIDC_ENABLED=true
-# AUTH_OIDC_CLIENT_ID=1030786188615-rr9ics9gl8n4acngj9opqbf2mruflqpr.apps.googleusercontent.com
-# AUTH_OIDC_CLIENT_SECRET=acEdaGcnfd7KxvsXRFDD7FNF
-# AUTH_OIDC_DISCOVERY_URI=https://accounts.google.com/.well-known/openid-configuration
+# AUTH_OIDC_CLIENT_ID=<client id>
+# AUTH_OIDC_CLIENT_SECRET=<client secret>
+# AUTH_OIDC_DISCOVERY_URI=https://<idp host>/.well-known/openid-configuration
 # AUTH_OIDC_BASE_URL=http://localhost:9001
 # Optional OIDC configs
 # AUTH_OIDC_USER_NAME_CLAIM=email
@@ -68,4 +68,4 @@ ELASTIC_CLIENT_PORT=9200
 # To use simple username/password authentication to Elasticsearch over HTTPS
 # set ELASTIC_CLIENT_USE_SSL=true and uncomment:
 # ELASTIC_CLIENT_USERNAME=
-# ELASTIC_CLIENT_PASSWORD=
\ No newline at end of file
+# ELASTIC_CLIENT_PASSWORD=
diff --git a/docker/datahub-gms/Dockerfile b/docker/datahub-gms/Dockerfile
index d30dbd84930578..b15bf3c6f9f17b 100644
--- a/docker/datahub-gms/Dockerfile
+++ b/docker/datahub-gms/Dockerfile
@@ -11,7 +11,7 @@ FROM golang:1-alpine3.20 AS binary
 # Re-declaring arg from above to make it available in this stage (will inherit default value)
 ARG ALPINE_REPO_URL
 
-ENV DOCKERIZE_VERSION v0.6.1
+ENV DOCKERIZE_VERSION=v0.6.1
 WORKDIR /go/src/github.com/jwilder
 
 # Optionally set corporate mirror for apk
@@ -52,7 +52,7 @@ COPY --from=binary /go/bin/dockerize /usr/local/bin
 
 ENV LD_LIBRARY_PATH="/lib:/lib64"
 
-FROM base as prod-install
+FROM base AS prod-install
 COPY war.war /datahub/datahub-gms/bin/war.war
 COPY metadata-models/src/main/resources/entity-registry.yml /datahub/datahub-gms/resources/entity-registry.yml
 COPY docker/datahub-gms/start.sh /datahub/datahub-gms/scripts/start.sh
@@ -61,11 +61,11 @@ COPY docker/datahub-gms/jetty-jmx.xml /datahub/datahub-gms/scripts/jetty-jmx.xml
 COPY docker/monitoring/client-prometheus-config.yaml /datahub/datahub-gms/scripts/prometheus-config.yaml
 RUN chmod +x /datahub/datahub-gms/scripts/start.sh
 
-FROM base as dev-install
+FROM base AS dev-install
 # Dummy stage for development. Assumes code is built on your machine and mounted to this image.
 # See this excellent thread https://github.com/docker/cli/issues/1134
 
-FROM ${APP_ENV}-install as final
+FROM ${APP_ENV}-install AS final
 
 RUN mkdir -p /etc/datahub/plugins/auth/resources
 
diff --git a/docker/datahub-ingestion-base/Dockerfile b/docker/datahub-ingestion-base/Dockerfile
index 383478b675640f..92b17620998823 100644
--- a/docker/datahub-ingestion-base/Dockerfile
+++ b/docker/datahub-ingestion-base/Dockerfile
@@ -5,41 +5,35 @@ ARG BASE_IMAGE=base
 ARG ALPINE_REPO_URL=http://dl-cdn.alpinelinux.org/alpine
 ARG GITHUB_REPO_URL=https://github.com
 ARG DEBIAN_REPO_URL=https://deb.debian.org/debian
+ARG UBUNTU_REPO_URL=http://ports.ubuntu.com/ubuntu-ports
 ARG PIP_MIRROR_URL=https://pypi.python.org/simple
 
-FROM golang:1-alpine3.20 AS dockerize-binary
+FROM powerman/dockerize:0.19 AS dockerize-binary
 
-# Re-declaring arg from above to make it available in this stage (will inherit default value)
-ARG ALPINE_REPO_URL
-
-ENV DOCKERIZE_VERSION v0.6.1
-WORKDIR /go/src/github.com/jwilder
-
-# Optionally set corporate mirror for apk
-RUN if [ "${ALPINE_REPO_URL}" != "http://dl-cdn.alpinelinux.org/alpine" ] ; then sed -i "s#http.*://dl-cdn.alpinelinux.org/alpine#${ALPINE_REPO_URL}#g" /etc/apk/repositories ; fi
-
-RUN apk --no-cache --update add openssl git tar curl
-
-WORKDIR /go/src/github.com/jwilder/dockerize
-
-RUN go install github.com/jwilder/dockerize@$DOCKERIZE_VERSION
-
-FROM python:3.10 as base
+FROM ubuntu:22.04 AS base
 
 ARG GITHUB_REPO_URL
 
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 # Optionally set corporate mirror for deb
 ARG DEBIAN_REPO_URL
-RUN if [ "${DEBIAN_REPO_URL}" != "http://deb.debian.org/debian" ] ; then sed -i "s#http.*://deb.debian.org/debian#${DEBIAN_REPO_URL}#g" /etc/apt/sources.list.d/debian.sources ; fi
+ARG UBUNTU_REPO_URL
+RUN if [ "${DEBIAN_REPO_URL}" != "http://deb.debian.org/debian" ] ; then sed -i "s#http.*://deb.debian.org/debian#${DEBIAN_REPO_URL}#g" /etc/apt/sources.list ; fi
+RUN if [ "${UBUNTU_REPO_URL}" != "http://ports.ubuntu.com/ubuntu-ports" ] ; then sed -i "s#http.*://ports.ubuntu.com/ubuntu-ports#${UBUNTU_REPO_URL}#g" /etc/apt/sources.list ; fi
 
 # Optionally set corporate mirror for pip
 ARG PIP_MIRROR_URL
 RUN if [ "${PIP_MIRROR_URL}" != "https://pypi.python.org/simple" ] ; then pip config set global.index-url ${PIP_MIRROR_URL} ; fi
 ENV UV_INDEX_URL=${PIP_MIRROR_URL}
 
-RUN apt-get update && apt-get install -y -qq \
+RUN apt-get update && apt-get upgrade -y \
+    && apt-get install -y -qq \
+    lsb-release \
+    python3 \
+    python3-pip \
+    python3-venv \
+    python-is-python3 \
     python3-ldap \
     libldap2-dev \
     libsasl2-dev \
@@ -47,19 +41,20 @@ RUN apt-get update && apt-get install -y -qq \
     libaio1 \
     libsasl2-modules-gssapi-mit \
     krb5-user \
+    krb5-config \
+    libkrb5-dev \
     wget \
     zip \
     unzip \
     ldap-utils \
     unixodbc \
     libodbc2 \
-    && python -m pip install --no-cache --upgrade pip uv>=0.1.10 wheel setuptools \
-    && rm -rf /var/lib/apt/lists/* /var/cache/apk/*
+    && python -m pip install --no-cache --upgrade pip 'uv>=0.1.10' wheel setuptools \
+    && apt-get clean \
+    && rm -rf /var/lib/{apt,dpkg,cache,log}/
 
-# compiled against newer golang for security fixes
-COPY --from=dockerize-binary /go/bin/dockerize /usr/local/bin
+COPY --from=powerman/dockerize:0.19 /usr/local/bin/dockerize /usr/local/bin
 
-COPY ./docker/datahub-ingestion-base/base-requirements.txt requirements.txt
 COPY ./docker/datahub-ingestion-base/entrypoint.sh /entrypoint.sh
 
 RUN addgroup --gid 1000 datahub && \
@@ -71,11 +66,18 @@ ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
 ENV VIRTUAL_ENV=/datahub-ingestion/.venv
 ENV PATH="${VIRTUAL_ENV}/bin:$PATH"
 RUN python3 -m venv $VIRTUAL_ENV && \
-    uv pip install --no-cache -r requirements.txt
+    uv pip install --no-cache --upgrade pip setuptools wheel
+
+# Note: Normally uv will create hardlinks from the cache directory to the venv.
+# In our docker files, we normally use `RUN --mount=type=cache,... uv pip install ...`,
+# which means the cache directory is on a separate filesystem. uv will emit a warning:
+#   Failed to hardlink files; falling back to full copy. This may lead to degraded performance.
+#   If the cache and target directories are on different filesystems, hardlinking may not be supported.
+#   If this is intentional, set `export UV_LINK_MODE=copy` or use `--link-mode=copy` to suppress this warning.
 
 ENTRYPOINT [ "/entrypoint.sh" ]
 
-FROM ${BASE_IMAGE} as full-install
+FROM ${BASE_IMAGE} AS full-install
 
 USER 0
 RUN apt-get update && apt-get install -y -qq \
@@ -85,24 +87,24 @@ RUN apt-get update && apt-get install -y -qq \
 RUN if [ $(arch) = "x86_64" ]; then \
     mkdir /opt/oracle && \
     cd /opt/oracle && \
-    wget --no-verbose -c https://download.oracle.com/otn_software/linux/instantclient/216000/instantclient-basic-linux.x64-21.6.0.0.0dbru.zip && \
-    unzip instantclient-basic-linux.x64-21.6.0.0.0dbru.zip && \
-    rm instantclient-basic-linux.x64-21.6.0.0.0dbru.zip && \
-    sh -c "echo /opt/oracle/instantclient_21_6 > /etc/ld.so.conf.d/oracle-instantclient.conf" && \
+    wget --no-verbose -c https://download.oracle.com/otn_software/linux/instantclient/2115000/instantclient-basic-linux.x64-21.15.0.0.0dbru.zip && \
+    unzip instantclient-basic-linux.x64-21.15.0.0.0dbru.zip && \
+    rm instantclient-basic-linux.x64-21.15.0.0.0dbru.zip && \
+    sh -c "echo /opt/oracle/instantclient_21_15 > /etc/ld.so.conf.d/oracle-instantclient.conf" && \
     ldconfig; \
     else \
     mkdir /opt/oracle && \
     cd /opt/oracle && \
-    wget --no-verbose -c https://download.oracle.com/otn_software/linux/instantclient/191000/instantclient-basic-linux.arm64-19.10.0.0.0dbru.zip && \
-    unzip instantclient-basic-linux.arm64-19.10.0.0.0dbru.zip && \
-    rm instantclient-basic-linux.arm64-19.10.0.0.0dbru.zip && \
-    sh -c "echo /opt/oracle/instantclient_19_10 > /etc/ld.so.conf.d/oracle-instantclient.conf" && \
+    wget --no-verbose -c https://download.oracle.com/otn_software/linux/instantclient/1923000/instantclient-basic-linux.arm64-19.23.0.0.0dbru.zip && \
+    unzip instantclient-basic-linux.arm64-19.23.0.0.0dbru.zip && \
+    rm instantclient-basic-linux.arm64-19.23.0.0.0dbru.zip && \
+    sh -c "echo /opt/oracle/instantclient_19_23 > /etc/ld.so.conf.d/oracle-instantclient.conf" && \
     ldconfig; \
     fi;
 
 USER datahub
 
-FROM ${BASE_IMAGE} as slim-install
+FROM ${BASE_IMAGE} AS slim-install
 # Do nothing else on top of base
 
 FROM ${APP_ENV}-install
diff --git a/docker/datahub-ingestion-base/base-requirements.txt b/docker/datahub-ingestion-base/base-requirements.txt
deleted file mode 100644
index 2f2b64723f0edd..00000000000000
--- a/docker/datahub-ingestion-base/base-requirements.txt
+++ /dev/null
@@ -1,376 +0,0 @@
-# Generated requirements file. Run ./regenerate-base-requirements.sh to regenerate.
-acryl-datahub-classify==0.0.10
-acryl-PyHive==0.6.16
-acryl-sqlglot==24.0.1.dev7
-aenum==3.1.15
-aiohttp==3.9.5
-aiosignal==1.3.1
-alembic==1.13.1
-altair==4.2.0
-anyio==4.4.0
-apache-airflow==2.9.2
-apache-airflow-providers-common-io==1.3.2
-apache-airflow-providers-common-sql==1.14.0
-apache-airflow-providers-fab==1.1.1
-apache-airflow-providers-ftp==3.9.1
-apache-airflow-providers-http==4.11.1
-apache-airflow-providers-imap==3.6.1
-apache-airflow-providers-smtp==1.7.1
-apache-airflow-providers-sqlite==3.8.1
-apispec==6.6.1
-appnope==0.1.4
-argcomplete==3.4.0
-argon2-cffi==23.1.0
-argon2-cffi-bindings==21.2.0
-asgiref==3.8.1
-asn1crypto==1.5.1
-asttokens==2.4.1
-async-timeout==4.0.3
-asynch==0.2.3
-attrs==23.2.0
-avro==1.11.3
-avro-gen3==0.7.13
-Babel==2.15.0
-backoff==2.2.1
-beautifulsoup4==4.12.3
-bleach==6.1.0
-blinker==1.8.2
-blis==0.7.11
-boto3==1.34.129
-botocore==1.34.129
-bracex==2.4
-cached-property==1.5.2
-cachelib==0.9.0
-cachetools==5.3.3
-catalogue==2.0.10
-cattrs==23.2.3
-certifi==2024.6.2
-cffi==1.16.0
-chardet==5.2.0
-charset-normalizer==3.3.2
-ciso8601==2.3.1
-click==8.1.7
-click-default-group==1.2.4
-click-spinner==0.1.10
-clickclick==20.10.2
-clickhouse-driver==0.2.8
-clickhouse-sqlalchemy==0.2.4
-cloudpickle==3.0.0
-colorama==0.4.6
-colorlog==4.8.0
-comm==0.2.2
-confection==0.1.5
-ConfigUpdater==3.2
-confluent-kafka==2.4.0
-connexion==2.14.1
-cron-descriptor==1.4.3
-croniter==2.0.5
-cryptography==42.0.8
-cx_Oracle==8.3.0
-cymem==2.0.8
-databricks-dbapi==0.6.0
-databricks-sdk==0.28.0
-databricks-sql-connector==2.9.6
-dataflows-tabulator==1.54.3
-db-dtypes==1.2.0
-debugpy==1.8.1
-decorator==5.1.1
-defusedxml==0.7.1
-deltalake==0.17.4
-Deprecated==1.2.14
-dill==0.3.8
-dnspython==2.6.1
-docker==7.1.0
-docutils==0.21.2
-ecdsa==0.19.0
-elasticsearch==7.13.4
-email_validator==2.1.2
-entrypoints==0.4
-et-xmlfile==1.1.0
-exceptiongroup==1.2.1
-executing==2.0.1
-expandvars==0.12.0
-fastavro==1.9.4
-fastjsonschema==2.20.0
-filelock==3.15.1
-Flask==2.2.5
-flatdict==4.0.1
-frozenlist==1.4.1
-fsspec==2023.12.2
-future==1.0.0
-GeoAlchemy2==0.15.1
-gitdb==4.0.11
-GitPython==3.1.43
-google-api-core==2.19.0
-google-auth==2.30.0
-google-cloud-appengine-logging==1.4.3
-google-cloud-audit-log==0.2.5
-google-cloud-bigquery==3.24.0
-google-cloud-core==2.4.1
-google-cloud-datacatalog==3.19.0
-google-cloud-datacatalog-lineage==0.2.2
-google-cloud-logging==3.5.0
-google-crc32c==1.5.0
-google-re2==1.1.20240601
-google-resumable-media==2.7.1
-googleapis-common-protos==1.63.1
-gql==3.5.0
-graphql-core==3.2.3
-great-expectations==0.15.50
-greenlet==3.0.3
-grpc-google-iam-v1==0.13.0
-grpcio==1.64.1
-grpcio-status==1.62.2
-grpcio-tools==1.62.2
-gssapi==1.8.3
-gunicorn==22.0.0
-h11==0.14.0
-httpcore==1.0.5
-httpx==0.27.0
-humanfriendly==10.0
-idna==3.7
-ijson==3.3.0
-importlib_metadata==7.1.0
-importlib_resources==6.4.0
-inflection==0.5.1
-ipaddress==1.0.23
-ipykernel==6.17.1
-ipython==8.21.0
-ipython-genutils==0.2.0
-ipywidgets==8.1.3
-isodate==0.6.1
-itsdangerous==2.2.0
-jedi==0.19.1
-Jinja2==3.1.4
-jmespath==1.0.1
-JPype1==1.5.0
-jsonlines==4.0.0
-jsonpatch==1.33
-jsonpointer==3.0.0
-jsonref==1.1.0
-jsonschema==4.22.0
-jsonschema-specifications==2023.12.1
-jupyter-server==1.16.0
-jupyter_client==7.4.9
-jupyter_core==4.12.0
-jupyterlab_pygments==0.3.0
-jupyterlab_widgets==3.0.11
-langcodes==3.4.0
-language_data==1.2.0
-lark==1.1.4
-lazy-object-proxy==1.10.0
-leb128==1.0.7
-limits==3.12.0
-linear-tsv==1.1.0
-linkify-it-py==2.0.3
-lkml==1.3.4
-lockfile==0.12.2
-looker-sdk==23.0.0
-lxml==5.2.2
-lz4==4.3.3
-makefun==1.15.2
-Mako==1.3.5
-marisa-trie==1.2.0
-markdown-it-py==3.0.0
-MarkupSafe==2.1.5
-marshmallow==3.21.3
-marshmallow-oneofschema==3.1.1
-marshmallow-sqlalchemy==0.28.2
-matplotlib-inline==0.1.7
-mdit-py-plugins==0.4.1
-mdurl==0.1.2
-methodtools==0.4.7
-mistune==3.0.2
-mixpanel==4.10.1
-mlflow-skinny==2.14.0
-mmhash3==3.0.1
-more-itertools==10.3.0
-moto==4.2.14
-msal==1.22.0
-multidict==6.0.5
-murmurhash==1.0.10
-mypy-extensions==1.0.0
-nbclassic==1.1.0
-nbclient==0.6.3
-nbconvert==7.16.4
-nbformat==5.10.4
-nest-asyncio==1.6.0
-networkx==3.3
-notebook==6.5.7
-notebook_shim==0.2.4
-numpy==1.26.4
-oauthlib==3.2.2
-okta==1.7.0
-openlineage-airflow==1.12.0
-openlineage-integration-common==1.12.0
-openlineage-python==1.12.0
-openlineage_sql==1.12.0
-openpyxl==3.1.4
-opentelemetry-api==1.25.0
-opentelemetry-exporter-otlp==1.25.0
-opentelemetry-exporter-otlp-proto-common==1.25.0
-opentelemetry-exporter-otlp-proto-grpc==1.25.0
-opentelemetry-exporter-otlp-proto-http==1.25.0
-opentelemetry-proto==1.25.0
-opentelemetry-sdk==1.25.0
-opentelemetry-semantic-conventions==0.46b0
-ordered-set==4.1.0
-packaging==24.1
-pandas==2.1.4
-pandocfilters==1.5.1
-parse==1.20.2
-parso==0.8.4
-pathlib_abc==0.1.1
-pathspec==0.12.1
-pathy==0.11.0
-pendulum==3.0.0
-pexpect==4.9.0
-phonenumbers==8.13.0
-platformdirs==4.2.2
-pluggy==1.5.0
-preshed==3.0.9
-prison==0.2.1
-progressbar2==4.4.2
-prometheus_client==0.20.0
-prompt_toolkit==3.0.47
-proto-plus==1.23.0
-protobuf==4.25.3
-psutil==6.0.0
-psycopg2-binary==2.9.9
-ptyprocess==0.7.0
-pure-eval==0.2.2
-pure-sasl==0.6.2
-py-partiql-parser==0.5.0
-pyarrow==16.1.0
-pyarrow-hotfix==0.6
-pyasn1==0.6.0
-pyasn1_modules==0.4.0
-pyathena==2.25.2
-pycountry==24.6.1
-pycparser==2.22
-pycryptodome==3.20.0
-pydantic==1.10.16
-pydash==8.0.1
-pydruid==0.6.9
-Pygments==2.18.0
-pyiceberg==0.4.0
-pymongo==4.7.3
-PyMySQL==1.1.1
-pyOpenSSL==24.1.0
-pyparsing==3.0.9
-pyspnego==0.11.0
-python-daemon==3.0.1
-python-dateutil==2.9.0.post0
-python-jose==3.3.0
-python-ldap==3.4.4
-python-liquid==1.12.1
-python-nvd3==0.16.0
-python-slugify==8.0.4
-python-stdnum==1.20
-python-tds==1.15.0
-python-utils==3.8.2
-pytz==2024.1
-PyYAML==6.0.1
-pyzmq==26.0.3
-redash-toolbelt==0.1.9
-redshift-connector==2.1.1
-referencing==0.35.1
-regex==2024.5.15
-requests==2.32.3
-requests-file==2.1.0
-requests-gssapi==1.3.0
-requests-toolbelt==1.0.0
-requests_ntlm==1.3.0
-responses==0.25.3
-rfc3339-validator==0.1.4
-rfc3986==2.0.0
-rich==13.7.1
-rich-argparse==1.5.2
-rpds-py==0.18.1
-rsa==4.9
-rstr==3.2.2
-ruamel.yaml==0.17.17
-s3transfer==0.10.1
-schwifty==2024.6.1
-scipy==1.13.1
-scramp==1.4.5
-Send2Trash==1.8.3
-sentry-sdk==2.5.1
-setproctitle==1.3.3
-simple-salesforce==1.12.6
-six==1.16.0
-slack-sdk==3.18.1
-smart-open==6.4.0
-smmap==5.0.1
-sniffio==1.3.1
-snowflake-connector-python==3.11.0
-snowflake-sqlalchemy==1.5.3
-sortedcontainers==2.4.0
-soupsieve==2.5
-spacy==3.5.0
-spacy-legacy==3.0.12
-spacy-loggers==1.0.5
-sql-metadata==2.2.2
-SQLAlchemy==1.4.44
-sqlalchemy-bigquery==1.11.0
-sqlalchemy-cockroachdb==1.4.4
-SQLAlchemy-JSONField==1.0.2
-sqlalchemy-pytds==0.3.5
-sqlalchemy-redshift==0.8.14
-SQLAlchemy-Utils==0.41.2
-sqlglotrs==0.2.5
-sqllineage==1.3.8
-sqlparse==0.4.4
-srsly==2.4.8
-stack-data==0.6.3
-strictyaml==1.7.3
-tableauserverclient==0.25
-tableschema==1.20.11
-tabulate==0.9.0
-tenacity==8.4.1
-teradatasql==20.0.0.12
-teradatasqlalchemy==20.0.0.1
-termcolor==2.4.0
-terminado==0.18.1
-text-unidecode==1.3
-thinc==8.1.12
-thrift==0.16.0
-thrift-sasl==0.4.3
-time-machine==2.14.1
-tinycss2==1.3.0
-toml==0.10.2
-tomlkit==0.12.5
-toolz==0.12.1
-tornado==6.4.1
-tqdm==4.66.4
-traitlets==5.2.1.post0
-trino==0.328.0
-typer==0.7.0
-typing-inspect==0.9.0
-typing_extensions==4.12.2
-tzdata==2024.1
-tzlocal==5.2
-uc-micro-py==1.0.3
-ujson==5.10.0
-unicodecsv==0.14.1
-universal_pathlib==0.2.2
-urllib3==1.26.19
-vertica-python==1.3.8
-vertica-sqlalchemy-dialect==0.0.8.2
-vininfo==1.8.0
-wasabi==1.1.3
-wcmatch==8.5.2
-wcwidth==0.2.13
-webencodings==0.5.1
-websocket-client==1.8.0
-Werkzeug==2.3.8
-widgetsnbextension==4.0.11
-wirerope==0.4.7
-wrapt==1.16.0
-WTForms==3.1.2
-xlrd==2.0.1
-xmltodict==0.13.0
-yarl==1.9.4
-zeep==4.2.1
-zipp==3.19.2
-zstd==1.5.5.1
diff --git a/docker/datahub-ingestion-base/build.gradle b/docker/datahub-ingestion-base/build.gradle
index faa0589cfbfbbf..ef482de9256a33 100644
--- a/docker/datahub-ingestion-base/build.gradle
+++ b/docker/datahub-ingestion-base/build.gradle
@@ -12,7 +12,7 @@ ext {
     docker_target = project.getProperties().getOrDefault("dockerTarget", "slim")
     docker_version = "${version}${docker_target == 'slim' ? '-slim' : ''}"
 
-    revision = 3 // increment to trigger rebuild
+    revision = 7 // increment to trigger rebuild
 }
 
 docker {
diff --git a/docker/datahub-ingestion-base/regenerate-base-requirements.sh b/docker/datahub-ingestion-base/regenerate-base-requirements.sh
deleted file mode 100755
index 13d74922d9013b..00000000000000
--- a/docker/datahub-ingestion-base/regenerate-base-requirements.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# This script is used to regenerate the base-requirements.txt file
-
-set -euxo pipefail
-cd "$( dirname "${BASH_SOURCE[0]}" )"
-
-SCRIPT_NAME=$(basename "$0")
-DATAHUB_DIR=$(pwd)/../..
-
-# Create a virtualenv.
-VENV_DIR=$(mktemp -d)
-python -c "import sys; assert sys.version_info >= (3, 9), 'Python 3.9 or higher is required.'"
-python -m venv $VENV_DIR
-source $VENV_DIR/bin/activate
-pip install --upgrade pip uv setuptools wheel
-echo "Using virtualenv at $VENV_DIR"
-
-# Install stuff.
-pushd $DATAHUB_DIR/metadata-ingestion
-uv pip install -e '.[all]' -e '../metadata-ingestion-modules/airflow-plugin/[plugin-v2]'
-popd
-
-# Generate the requirements file.
-# Removing Flask deps due as per https://github.com/datahub-project/datahub/pull/6867/files
-# Removing py4j and PyJWT due to https://github.com/datahub-project/datahub/pull/6868/files
-# Removing pyspark and pydeequ because we don't want them in the slim image, so they can be added separately.
-# TODO: It's unclear if these removals are still actually needed.
-echo "# Generated requirements file. Run ./$SCRIPT_NAME to regenerate." > base-requirements.txt
-pip freeze \
-    | grep -v -E "^-e" \
-    | grep -v -E "^uv==" \
-    | grep -v "Flask-" \
-    | grep -v -E "(py4j|PyJWT)==" \
-    | grep -v -E "(pyspark|pydeequ)==" \
-    >> base-requirements.txt
diff --git a/docker/datahub-ingestion/Dockerfile b/docker/datahub-ingestion/Dockerfile
index 068911695811f5..ee0333e1cb1d1f 100644
--- a/docker/datahub-ingestion/Dockerfile
+++ b/docker/datahub-ingestion/Dockerfile
@@ -1,16 +1,19 @@
 # Defining environment
 ARG APP_ENV=full
 ARG BASE_IMAGE=acryldata/datahub-ingestion-base
-ARG DOCKER_VERSION=head
+ARG DOCKER_VERSION=head-full
 ARG DEBIAN_REPO_URL=https://deb.debian.org/debian
+ARG UBUNTU_REPO_URL=http://ports.ubuntu.com/ubuntu-ports
 ARG PIP_MIRROR_URL=https://pypi.python.org/simple
 
-FROM $BASE_IMAGE:$DOCKER_VERSION as base
+FROM $BASE_IMAGE:$DOCKER_VERSION AS base
 
 # Optionally set corporate mirror for deb
 USER 0
 ARG DEBIAN_REPO_URL
-RUN if [ "${DEBIAN_REPO_URL}" != "http://deb.debian.org/debian" ] ; then sed -i "s#http.*://deb.debian.org/debian#${DEBIAN_REPO_URL}#g" /etc/apt/sources.list.d/debian.sources ; fi
+ARG UBUNTU_REPO_URL
+RUN if [ "${DEBIAN_REPO_URL}" != "http://deb.debian.org/debian" ] ; then sed -i "s#http.*://deb.debian.org/debian#${DEBIAN_REPO_URL}#g" /etc/apt/sources.list ; fi
+RUN if [ "${UBUNTU_REPO_URL}" != "http://ports.ubuntu.com/ubuntu-ports" ] ; then sed -i "s#http.*://ports.ubuntu.com/ubuntu-ports#${UBUNTU_REPO_URL}#g" /etc/apt/sources.list ; fi
 USER datahub
 
 # Optionally set corporate mirror for pip
@@ -18,21 +21,22 @@ ARG PIP_MIRROR_URL
 RUN if [ "${PIP_MIRROR_URL}" != "https://pypi.python.org/simple" ] ; then pip config set global.index-url ${PIP_MIRROR_URL} ; fi
 ENV UV_INDEX_URL=${PIP_MIRROR_URL}
 
-COPY --chown=datahub ./metadata-ingestion /datahub-ingestion
-COPY --chown=datahub ./metadata-ingestion-modules/airflow-plugin /datahub-ingestion/airflow-plugin
+COPY --chown=datahub ./metadata-ingestion /metadata-ingestion
+COPY --chown=datahub ./metadata-ingestion-modules/airflow-plugin /metadata-ingestion/airflow-plugin
 
 ARG RELEASE_VERSION
-WORKDIR /datahub-ingestion
+WORKDIR /metadata-ingestion
 RUN sed -i.bak "s/__version__ = \"1\!0.0.0.dev0\"/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/datahub/__init__.py && \
     sed -i.bak "s/__version__ = \"1\!0.0.0.dev0\"/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" airflow-plugin/src/datahub_airflow_plugin/__init__.py && \
     cat src/datahub/__init__.py | grep __version__ && \
     cat airflow-plugin/src/datahub_airflow_plugin/__init__.py | grep __version__
 
-FROM base as slim-install
+FROM base AS slim-install
 
-RUN uv pip install --no-cache -e ".[base,datahub-rest,datahub-kafka,snowflake,bigquery,redshift,mysql,postgres,hive,clickhouse,glue,dbt,looker,lookml,tableau,powerbi,superset,datahub-business-glossary]"
+RUN --mount=type=cache,target=/datahub-ingestion/.cache/uv,uid=1000,gid=1000 \
+    UV_LINK_MODE=copy uv pip install -e ".[base,datahub-rest,datahub-kafka,snowflake,bigquery,redshift,mysql,postgres,hive,clickhouse,glue,dbt,looker,lookml,tableau,powerbi,superset,datahub-business-glossary]"
 
-FROM base as full-install-build
+FROM base AS full-install-build
 
 USER 0
 RUN apt-get update && apt-get install -y -qq maven
@@ -40,18 +44,21 @@ RUN apt-get update && apt-get install -y -qq maven
 USER datahub
 COPY ./docker/datahub-ingestion/pyspark_jars.sh .
 
-RUN uv pip install --no-cache -e ".[base,all]" "./airflow-plugin[plugin-v2]" && \
+RUN --mount=type=cache,target=/datahub-ingestion/.cache/uv,uid=1000,gid=1000 \
+    UV_LINK_MODE=copy uv pip install -e ".[base,all]" "./airflow-plugin[plugin-v2]" && \
+    ./pyspark_jars.sh && \
     datahub --version
-RUN ./pyspark_jars.sh
 
-FROM base as full-install
+FROM base AS full-install
 
 COPY --from=full-install-build ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 
-FROM base as dev-install
+FROM base AS dev-install
 # Dummy stage for development. Assumes code is built on your machine and mounted to this image.
 # See this excellent thread https://github.com/docker/cli/issues/1134
 
-FROM ${APP_ENV}-install as final
+FROM ${APP_ENV}-install AS final
+
+WORKDIR /datahub-ingestion
 
 USER datahub
diff --git a/docker/datahub-ingestion/Dockerfile-slim-only b/docker/datahub-ingestion/Dockerfile-slim-only
index f17c8df63ae9d3..6ade262f2feded 100644
--- a/docker/datahub-ingestion/Dockerfile-slim-only
+++ b/docker/datahub-ingestion/Dockerfile-slim-only
@@ -11,18 +11,21 @@ ARG PIP_MIRROR_URL
 RUN if [ "${PIP_MIRROR_URL}" != "https://pypi.python.org/simple" ] ; then pip config set global.index-url ${PIP_MIRROR_URL} ; fi
 ENV UV_INDEX_URL=${PIP_MIRROR_URL}
 
-COPY --chown=datahub ./metadata-ingestion /datahub-ingestion
+COPY --chown=datahub ./metadata-ingestion /metadata-ingestion
 
 ARG RELEASE_VERSION
-WORKDIR /datahub-ingestion
+WORKDIR /metadata-ingestion
 RUN sed -i.bak "s/__version__ = \"1\!0.0.0.dev0\"/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/datahub/__init__.py && \
     cat src/datahub/__init__.py
 
 FROM base as slim-install
 
-RUN uv pip install --no-cache -e ".[base,datahub-rest,datahub-kafka,snowflake,bigquery,redshift,mysql,postgres,hive,clickhouse,glue,dbt,looker,lookml,tableau,powerbi,superset,datahub-business-glossary]" && \
+RUN --mount=type=cache,target=/datahub-ingestion/.cache/uv,uid=1000,gid=1000 \
+    UV_LINK_MODE=copy uv pip install -e ".[base,datahub-rest,datahub-kafka,snowflake,bigquery,redshift,mysql,postgres,hive,clickhouse,glue,dbt,looker,lookml,tableau,powerbi,superset,datahub-business-glossary]" && \
     datahub --version
 
 FROM slim-install as final
 
+WORKDIR /datahub-ingestion
+
 USER datahub
diff --git a/docker/datahub-ingestion/build.gradle b/docker/datahub-ingestion/build.gradle
index b9ab546674a031..113a6dcf0a1bd4 100644
--- a/docker/datahub-ingestion/build.gradle
+++ b/docker/datahub-ingestion/build.gradle
@@ -12,7 +12,7 @@ ext {
     docker_target = project.getProperties().getOrDefault("dockerTarget", "slim")
     docker_version = "${version}${docker_target == 'slim' ? '-slim' : ''}"
 
-    revision = 3 // increment to trigger rebuild
+    revision = 8 // increment to trigger rebuild
 }
 
 dependencies {
diff --git a/docker/datahub-mae-consumer/Dockerfile b/docker/datahub-mae-consumer/Dockerfile
index 0ee55821f2579f..6edaa29ee1a8bb 100644
--- a/docker/datahub-mae-consumer/Dockerfile
+++ b/docker/datahub-mae-consumer/Dockerfile
@@ -11,7 +11,7 @@ FROM golang:1-alpine3.20 AS binary
 # Re-declaring arg from above to make it available in this stage (will inherit default value)
 ARG ALPINE_REPO_URL
 
-ENV DOCKERIZE_VERSION v0.6.1
+ENV DOCKERIZE_VERSION=v0.6.1
 WORKDIR /go/src/github.com/jwilder
 
 # Optionally set corporate mirror for apk
@@ -47,18 +47,18 @@ COPY --from=binary /go/bin/dockerize /usr/local/bin
 
 ENV LD_LIBRARY_PATH="/lib:/lib64"
 
-FROM base as prod-install
+FROM base AS prod-install
 COPY mae-consumer-job.jar /datahub/datahub-mae-consumer/bin/
 COPY metadata-models/src/main/resources/entity-registry.yml /datahub/datahub-mae-consumer/resources/entity-registry.yml
 COPY docker/datahub-mae-consumer/start.sh /datahub/datahub-mae-consumer/scripts/
 COPY docker/monitoring/client-prometheus-config.yaml /datahub/datahub-mae-consumer/scripts/prometheus-config.yaml
 RUN chmod +x /datahub/datahub-mae-consumer/scripts/start.sh
 
-FROM base as dev-install
+FROM base AS dev-install
 # Dummy stage for development. Assumes code is built on your machine and mounted to this image.
 # See this excellent thread https://github.com/docker/cli/issues/1134
 
-FROM ${APP_ENV}-install as final
+FROM ${APP_ENV}-install AS final
 
 RUN addgroup -S datahub && adduser -S datahub -G datahub
 USER datahub
diff --git a/docker/datahub-mce-consumer/Dockerfile b/docker/datahub-mce-consumer/Dockerfile
index 8f85b432a10711..1eb56633c561e6 100644
--- a/docker/datahub-mce-consumer/Dockerfile
+++ b/docker/datahub-mce-consumer/Dockerfile
@@ -11,7 +11,7 @@ FROM golang:1-alpine3.20 AS binary
 # Re-declaring arg from above to make it available in this stage (will inherit default value)
 ARG ALPINE_REPO_URL
 
-ENV DOCKERIZE_VERSION v0.6.1
+ENV DOCKERIZE_VERSION=v0.6.1
 WORKDIR /go/src/github.com/jwilder
 
 # Optionally set corporate mirror for apk
@@ -45,7 +45,7 @@ RUN apk --no-cache --update-cache --available upgrade \
     && cp /usr/lib/jvm/java-17-openjdk/jre/lib/security/cacerts /tmp/kafka.client.truststore.jks
 COPY --from=binary /go/bin/dockerize /usr/local/bin
 
-FROM base as prod-install
+FROM base AS prod-install
 COPY mce-consumer-job.jar /datahub/datahub-mce-consumer/bin/
 COPY metadata-models/src/main/resources/entity-registry.yml /datahub/datahub-mce-consumer/resources/entity-registry.yml
 COPY docker/datahub-mce-consumer/start.sh /datahub/datahub-mce-consumer/scripts/
@@ -54,12 +54,12 @@ RUN chmod +x /datahub/datahub-mce-consumer/scripts/start.sh
 
 ENV LD_LIBRARY_PATH="/lib:/lib64"
 
-FROM base as dev-install
+FROM base AS dev-install
 # Dummy stage for development. Assumes code is built on your machine and mounted to this image.
 # See this excellent thread https://github.com/docker/cli/issues/1134
 COPY metadata-models/src/main/resources/entity-registry.yml /datahub/datahub-mce-consumer/resources/entity-registry.yml
 
-FROM ${APP_ENV}-install as final
+FROM ${APP_ENV}-install AS final
 
 RUN addgroup -S datahub && adduser -S datahub -G datahub
 USER datahub
diff --git a/docker/datahub-upgrade/Dockerfile b/docker/datahub-upgrade/Dockerfile
index 675e24ab87109e..3d59a903414b1a 100644
--- a/docker/datahub-upgrade/Dockerfile
+++ b/docker/datahub-upgrade/Dockerfile
@@ -11,7 +11,7 @@ FROM golang:1-alpine3.20 AS binary
 # Re-declaring arg from above to make it available in this stage (will inherit default value)
 ARG ALPINE_REPO_URL
 
-ENV DOCKERIZE_VERSION v0.6.1
+ENV DOCKERIZE_VERSION=v0.6.1
 WORKDIR /go/src/github.com/jwilder
 
 # Optionally set corporate mirror for apk
@@ -51,15 +51,15 @@ COPY --from=binary /go/bin/dockerize /usr/local/bin
 
 ENV LD_LIBRARY_PATH="/lib:/lib64"
 
-FROM base as prod-install
+FROM base AS prod-install
 COPY datahub-upgrade.jar /datahub/datahub-upgrade/bin/
 COPY metadata-models/src/main/resources/entity-registry.yml /datahub/datahub-gms/resources/entity-registry.yml
 
-FROM base as dev-install
+FROM base AS dev-install
 # Dummy stage for development. Assumes code is built on your machine and mounted to this image.
 # See this excellent thread https://github.com/docker/cli/issues/1134
 
-FROM ${APP_ENV}-install as final
+FROM ${APP_ENV}-install AS final
 
 RUN addgroup -S datahub && adduser -S datahub -G datahub
 USER datahub
diff --git a/docker/docker-compose-with-cassandra.yml b/docker/docker-compose-with-cassandra.yml
index d722b07b9a7af4..de766f76cb626e 100644
--- a/docker/docker-compose-with-cassandra.yml
+++ b/docker/docker-compose-with-cassandra.yml
@@ -144,7 +144,7 @@ services:
       - neo4jdata:/data
   schema-registry:
     hostname: schema-registry
-    image: confluentinc/cp-schema-registry:7.4.0
+    image: ${DATAHUB_CONFLUENT_SCHEMA_REGISTRY_IMAGE:-confluentinc/cp-schema-registry}:${DATAHUB_CONFLUENT_VERSION:-7.4.0}
     ports:
       - ${DATAHUB_MAPPED_SCHEMA_REGISTRY_PORT:-8081}:8081
     env_file: schema-registry/env/docker.env
@@ -159,7 +159,7 @@ services:
         condition: service_healthy
   broker:
     hostname: broker
-    image: confluentinc/cp-kafka:7.4.0
+    image: ${DATAHUB_CONFLUENT_KAFKA_IMAGE:-confluentinc/cp-kafka}:${DATAHUB_CONFLUENT_VERSION:-7.4.0}
     ports:
       - 29092:29092
       - 9092:9092
@@ -177,7 +177,7 @@ services:
       - broker:/var/lib/kafka/data/
   zookeeper:
     hostname: zookeeper
-    image: confluentinc/cp-zookeeper:7.4.0
+    image: ${DATAHUB_CONFLUENT_ZOOKEEPER_IMAGE:-confluentinc/cp-zookeeper}:${DATAHUB_CONFLUENT_VERSION:-7.4.0}
     ports:
       - 2181:2181
     env_file: zookeeper/env/docker.env
diff --git a/docker/docker-compose-without-neo4j.yml b/docker/docker-compose-without-neo4j.yml
index eae36fb849fd5c..748a2cc9e04167 100644
--- a/docker/docker-compose-without-neo4j.yml
+++ b/docker/docker-compose-without-neo4j.yml
@@ -123,7 +123,7 @@ services:
     - esdata:/usr/share/elasticsearch/data
   schema-registry:
     hostname: schema-registry
-    image: confluentinc/cp-schema-registry:7.4.0
+    image: ${DATAHUB_CONFLUENT_SCHEMA_REGISTRY_IMAGE:-confluentinc/cp-schema-registry}:${DATAHUB_CONFLUENT_VERSION:-7.4.0}
     ports:
     - ${DATAHUB_MAPPED_SCHEMA_REGISTRY_PORT:-8081}:8081
     env_file: schema-registry/env/docker.env
@@ -138,7 +138,7 @@ services:
         condition: service_healthy
   broker:
     hostname: broker
-    image: confluentinc/cp-kafka:7.4.0
+    image: ${DATAHUB_CONFLUENT_KAFKA_IMAGE:-confluentinc/cp-kafka}:${DATAHUB_CONFLUENT_VERSION:-7.4.0}
     ports:
     - ${DATAHUB_MAPPED_KAFKA_BROKER_PORT:-9092}:9092
     env_file: broker/env/docker.env
@@ -155,7 +155,7 @@ services:
     - broker:/var/lib/kafka/data/
   zookeeper:
     hostname: zookeeper
-    image: confluentinc/cp-zookeeper:7.4.0
+    image: ${DATAHUB_CONFLUENT_ZOOKEEPER_IMAGE:-confluentinc/cp-zookeeper}:${DATAHUB_CONFLUENT_VERSION:-7.4.0}
     ports:
     - ${DATAHUB_MAPPED_ZK_PORT:-2181}:2181
     env_file: zookeeper/env/docker.env
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 96f37496859a46..ae55861580becd 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -143,7 +143,7 @@ services:
     - neo4jdata:/data
   schema-registry:
     hostname: schema-registry
-    image: confluentinc/cp-schema-registry:7.4.0
+    image: ${DATAHUB_CONFLUENT_SCHEMA_REGISTRY_IMAGE:-confluentinc/cp-schema-registry}:${DATAHUB_CONFLUENT_VERSION:-7.4.0}
     ports:
     - ${DATAHUB_MAPPED_SCHEMA_REGISTRY_PORT:-8081}:8081
     env_file: schema-registry/env/docker.env
@@ -158,7 +158,7 @@ services:
         condition: service_healthy
   broker:
     hostname: broker
-    image: confluentinc/cp-kafka:7.4.0
+    image: ${DATAHUB_CONFLUENT_KAFKA_IMAGE:-confluentinc/cp-kafka}:${DATAHUB_CONFLUENT_VERSION:-7.4.0}
     ports:
     - ${DATAHUB_MAPPED_KAFKA_BROKER_PORT:-9092}:9092
     env_file: broker/env/docker.env
@@ -175,7 +175,7 @@ services:
     - broker:/var/lib/kafka/data/
   zookeeper:
     hostname: zookeeper
-    image: confluentinc/cp-zookeeper:7.4.0
+    image: ${DATAHUB_CONFLUENT_ZOOKEEPER_IMAGE:-confluentinc/cp-zookeeper}:${DATAHUB_CONFLUENT_VERSION:-7.4.0}
     ports:
     - ${DATAHUB_MAPPED_ZK_PORT:-2181}:2181
     env_file: zookeeper/env/docker.env
diff --git a/docker/elasticsearch-setup/Dockerfile b/docker/elasticsearch-setup/Dockerfile
index 7390e3579dcf8f..4e64dcbc1e452c 100644
--- a/docker/elasticsearch-setup/Dockerfile
+++ b/docker/elasticsearch-setup/Dockerfile
@@ -10,7 +10,7 @@ FROM golang:1-alpine3.20 AS binary
 
 ARG ALPINE_REPO_URL
 
-ENV DOCKERIZE_VERSION v0.6.1
+ENV DOCKERIZE_VERSION=v0.6.1
 WORKDIR /go/src/github.com/jwilder
 
 # Optionally set corporate mirror for apk
diff --git a/docker/kafka-setup/Dockerfile b/docker/kafka-setup/Dockerfile
index a68da4e41d4df9..dd88060cd7165f 100644
--- a/docker/kafka-setup/Dockerfile
+++ b/docker/kafka-setup/Dockerfile
@@ -1,4 +1,4 @@
-ARG KAFKA_DOCKER_VERSION=7.4.4
+ARG KAFKA_DOCKER_VERSION=7.4.6
 
 # Defining custom repo urls for use in enterprise environments. Re-used between stages below.
 ARG ALPINE_REPO_URL=http://dl-cdn.alpinelinux.org/alpine
@@ -6,8 +6,8 @@ ARG GITHUB_REPO_URL=https://github.com
 ARG MAVEN_CENTRAL_REPO_URL=https://repo1.maven.org/maven2
 ARG APACHE_DOWNLOAD_URL=null
 
-# Using as a base image because to get the needed jars for confluent utils
-FROM confluentinc/cp-base-new:$KAFKA_DOCKER_VERSION as confluent_base
+# Using AS a base image because to get the needed jars for confluent utils
+FROM confluentinc/cp-base-new:$KAFKA_DOCKER_VERSION AS confluent_base
 
 ARG MAVEN_CENTRAL_REPO_URL
 ARG SNAKEYAML_VERSION="2.0"
@@ -22,8 +22,8 @@ ARG ALPINE_REPO_URL
 ARG APACHE_DOWNLOAD_URL
 ARG GITHUB_REPO_URL
 
-ENV KAFKA_VERSION 3.7.0
-ENV SCALA_VERSION 2.13
+ENV KAFKA_VERSION=3.7.1
+ENV SCALA_VERSION=2.13
 
 LABEL name="kafka" version=${KAFKA_VERSION}
 
@@ -44,7 +44,7 @@ RUN mkdir -p /opt \
   && rm -rf /tmp/* \
   && apk del --purge .build-deps
 
-ENV PATH /sbin:/opt/kafka/bin/:$PATH
+ENV PATH=/sbin:/opt/kafka/bin/:$PATH
 
 WORKDIR /opt/kafka
 
@@ -71,6 +71,7 @@ COPY docker/kafka-setup/kafka-setup.sh ./kafka-setup.sh
 COPY docker/kafka-setup/kafka-config.sh ./kafka-config.sh
 COPY docker/kafka-setup/kafka-topic-workers.sh ./kafka-topic-workers.sh
 COPY docker/kafka-setup/kafka-ready.sh ./kafka-ready.sh
+COPY docker/kafka-setup/env_to_properties.py ./env_to_properties.py
 
 RUN chmod +x ./kafka-setup.sh ./kafka-topic-workers.sh ./kafka-ready.sh
 
diff --git a/docker/kafka-setup/env_to_properties.py b/docker/kafka-setup/env_to_properties.py
new file mode 100644
index 00000000000000..8d8b8c3cc7b59f
--- /dev/null
+++ b/docker/kafka-setup/env_to_properties.py
@@ -0,0 +1,24 @@
+import os
+import re
+import sys
+
+
+def env_to_properties(env_prefix: str, properties_file: str):
+    pattern = re.compile('(?<=[^_])_(?=[^_])')
+    props = {}
+
+    for (env_name, val) in os.environ.items():
+        if env_name.startswith(env_prefix):
+            raw_name = env_name[len(env_prefix):].lower()
+            prop_dot = '.'.join(pattern.split(raw_name))
+            props[prop_dot] = val
+
+    with open(properties_file, 'a') as f:
+        for k, v in props.items():
+            f.writelines(f'{k}={v}\n')
+
+
+if __name__ == '__main__':
+    env_prefix = sys.argv[1]
+    properties_file = sys.argv[2]
+    env_to_properties(env_prefix, properties_file)
diff --git a/docker/kafka-setup/kafka-setup.sh b/docker/kafka-setup/kafka-setup.sh
index 439ffb4d4d8295..392cca94666419 100755
--- a/docker/kafka-setup/kafka-setup.sh
+++ b/docker/kafka-setup/kafka-setup.sh
@@ -10,46 +10,8 @@ fi
 . kafka-config.sh
 
 echo "bootstrap.servers=$KAFKA_BOOTSTRAP_SERVER" > $CONNECTION_PROPERTIES_PATH
-echo "security.protocol=$KAFKA_PROPERTIES_SECURITY_PROTOCOL" >> $CONNECTION_PROPERTIES_PATH
 
-## Add support for SASL_PLAINTEXT
-if [[ $KAFKA_PROPERTIES_SECURITY_PROTOCOL == "SASL_PLAINTEXT" ]]; then
-    echo "sasl.mechanism=$KAFKA_PROPERTIES_SASL_MECHANISM" >> $CONNECTION_PROPERTIES_PATH
-    echo "sasl.jaas.config=$KAFKA_PROPERTIES_SASL_JAAS_CONFIG" >> $CONNECTION_PROPERTIES_PATH
-    echo "sasl.kerberos.service.name=$KAFKA_PROPERTIES_SASL_KERBEROS_SERVICE_NAME" >> $CONNECTION_PROPERTIES_PATH
-fi
-
-## Add support for SASL_SSL
-if [[ $KAFKA_PROPERTIES_SECURITY_PROTOCOL == "SASL_SSL" ]]; then
-    echo "sasl.jaas.config=$KAFKA_PROPERTIES_SASL_JAAS_CONFIG" >> $CONNECTION_PROPERTIES_PATH
-    echo "sasl.mechanism=$KAFKA_PROPERTIES_SASL_MECHANISM" >> $CONNECTION_PROPERTIES_PATH
-fi
-
-if [[ $KAFKA_PROPERTIES_SECURITY_PROTOCOL == "SSL" ]]; then
-    if [[ -n $KAFKA_PROPERTIES_SSL_KEYSTORE_LOCATION ]]; then
-        echo "ssl.keystore.location=$KAFKA_PROPERTIES_SSL_KEYSTORE_LOCATION" >> $CONNECTION_PROPERTIES_PATH
-        echo "ssl.keystore.password=$KAFKA_PROPERTIES_SSL_KEYSTORE_PASSWORD" >> $CONNECTION_PROPERTIES_PATH
-        echo "ssl.key.password=$KAFKA_PROPERTIES_SSL_KEY_PASSWORD" >> $CONNECTION_PROPERTIES_PATH
-        if [[ -n $KAFKA_PROPERTIES_SSL_KEYSTORE_TYPE ]]; then
-            echo "ssl.keystore.type=$KAFKA_PROPERTIES_SSL_KEYSTORE_TYPE" >> $CONNECTION_PROPERTIES_PATH
-        fi
-    fi
-    if [[ -n $KAFKA_PROPERTIES_SSL_TRUSTSTORE_LOCATION ]]; then
-        echo "ssl.truststore.location=$KAFKA_PROPERTIES_SSL_TRUSTSTORE_LOCATION" >> $CONNECTION_PROPERTIES_PATH
-        if [[ $KAFKA_PROPERTIES_SSL_TRUSTSTORE_TYPE != "PEM" ]]; then
-          echo "ssl.truststore.password=$KAFKA_PROPERTIES_SSL_TRUSTSTORE_PASSWORD" >> $CONNECTION_PROPERTIES_PATH
-        fi
-        if [[ -n $KAFKA_PROPERTIES_SSL_TRUSTSTORE_TYPE ]]; then
-            echo "ssl.truststore.type=$KAFKA_PROPERTIES_SSL_TRUSTSTORE_TYPE" >> $CONNECTION_PROPERTIES_PATH
-        fi
-    fi
-    echo "ssl.endpoint.identification.algorithm=$KAFKA_PROPERTIES_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM" >> $CONNECTION_PROPERTIES_PATH
-fi
-
-# Add support for SASL_CLIENT_CALLBACK_HANDLER_CLASS
-if [[ -n "$KAFKA_PROPERTIES_SASL_CLIENT_CALLBACK_HANDLER_CLASS" ]]; then
-    echo "sasl.client.callback.handler.class=$KAFKA_PROPERTIES_SASL_CLIENT_CALLBACK_HANDLER_CLASS" >> $CONNECTION_PROPERTIES_PATH
-fi
+python env_to_properties.py KAFKA_PROPERTIES_ $CONNECTION_PROPERTIES_PATH
 
 # cub kafka-ready -c $CONNECTION_PROPERTIES_PATH -b $KAFKA_BOOTSTRAP_SERVER 1 180
 . kafka-ready.sh
diff --git a/docker/monitoring/grafana/dashboards/datahub_dashboard.json b/docker/monitoring/grafana/dashboards/datahub_dashboard.json
index 3b932756e5e117..352f84829b0923 100644
--- a/docker/monitoring/grafana/dashboards/datahub_dashboard.json
+++ b/docker/monitoring/grafana/dashboards/datahub_dashboard.json
@@ -24,7 +24,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 95,
+  "id": 56,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -65,6 +65,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -78,6 +79,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -136,10 +138,12 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityResource_get_Count{}[1m])/60",
+          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityV2Resource_get_Count{}[1m])/60",
           "interval": "",
           "legendFormat": "Get QPS",
+          "range": true,
           "refId": "A"
         },
         {
@@ -147,11 +151,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityResource_get_failed_Count{}[1m])/60",
+          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityV2Resource_get_failed_Count{}[1m])/60",
           "hide": false,
           "interval": "",
           "legendFormat": "Get Failure",
+          "range": true,
           "refId": "B"
         },
         {
@@ -159,11 +165,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityResource_batchGet_Count{}[1m])/60",
+          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityV2Resource_batchGet_Count{}[1m])/60",
           "hide": false,
           "interval": "",
           "legendFormat": "BatchGet QPS",
+          "range": true,
           "refId": "C"
         },
         {
@@ -171,11 +179,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityResource_batchGet_failed_Count{}[1m])/60",
+          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityV2Resource_batchGet_failed_Count{}[1m])/60",
           "hide": false,
           "interval": "",
           "legendFormat": "BatchGet Failure",
+          "range": true,
           "refId": "D"
         }
       ],
@@ -193,6 +203,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -206,6 +217,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -264,10 +276,12 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityResource_get_Mean{}",
+          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityV2Resource_get_Mean{}",
           "interval": "",
           "legendFormat": "Get Avg",
+          "range": true,
           "refId": "A"
         },
         {
@@ -275,11 +289,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityResource_get_75thPercentile{}",
+          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityV2Resource_get_75thPercentile{}",
           "hide": false,
           "interval": "",
           "legendFormat": "Get P75",
+          "range": true,
           "refId": "B"
         },
         {
@@ -287,11 +303,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityResource_get_95thPercentile{}",
+          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityV2Resource_get_95thPercentile{}",
           "hide": false,
           "interval": "",
           "legendFormat": "Get P95",
+          "range": true,
           "refId": "C"
         },
         {
@@ -299,11 +317,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityResource_batchGet_Mean{}",
+          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityV2Resource_batchGet_Mean{}",
           "hide": false,
           "interval": "",
           "legendFormat": "BatchGet Avg",
+          "range": true,
           "refId": "D"
         },
         {
@@ -311,11 +331,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityResource_batchGet_75thPercentile{}",
+          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityV2Resource_batchGet_75thPercentile{}",
           "hide": false,
           "interval": "",
           "legendFormat": "BatchGet P75",
+          "range": true,
           "refId": "E"
         },
         {
@@ -323,11 +345,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityResource_batchGet_95thPercentile{}",
+          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityV2Resource_batchGet_95thPercentile{}",
           "hide": false,
           "interval": "",
           "legendFormat": "BatchGet P95",
+          "range": true,
           "refId": "F"
         }
       ],
@@ -371,6 +395,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -384,6 +409,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -442,20 +468,9 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "exemplar": true,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityResource_ingest_Count{}[1m])/60",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "Ingest Count",
-          "refId": "E"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityResource_batchIngest_Count{}[1m])/60",
+          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_AspectResource_ingestProposal_Count{}[1m])/60",
           "hide": false,
           "instant": false,
           "interval": "",
@@ -467,24 +482,28 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityResource_ingest_failed_Count[1m])/60",
+          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_AspectResource_ingestProposal_success_Count{}[1m])/60",
           "hide": false,
           "interval": "",
-          "legendFormat": "Ingest Failure",
-          "refId": "C"
+          "legendFormat": "Ingest Count",
+          "range": true,
+          "refId": "E"
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "builder",
           "exemplar": true,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityResource_batchIngest_failed_Count[1m])/60",
-          "hide": false,
+          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_AspectResource_ingestProposal_failed_Count{}[1m])/60",
+          "hide": true,
           "interval": "",
-          "legendFormat": "BatchIngest Failure",
-          "refId": "D"
+          "legendFormat": "Ingest Failure",
+          "range": true,
+          "refId": "C"
         }
       ],
       "title": "Ingest QPS",
@@ -501,6 +520,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -514,6 +534,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -583,11 +604,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
           "expr": "metrics_com_linkedin_metadata_resources_entity_EntityResource_ingest_75thPercentile{}",
           "hide": false,
           "interval": "",
           "legendFormat": "P75",
+          "range": true,
           "refId": "B"
         },
         {
@@ -595,11 +618,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityResource_ingest_95thPercentile{}",
+          "expr": "metrics_com_linkedin_metadata_resources_entity_AspectResource_ingestProposal_95thPercentile{}",
           "hide": false,
           "interval": "",
           "legendFormat": "P95",
+          "range": true,
           "refId": "C"
         }
       ],
@@ -617,6 +642,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -630,6 +656,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -688,11 +715,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_entity_EntityService_ingestAspectsToLocalDB_Mean{}",
+          "expr": "metrics_com_linkedin_metadata_entity_EntityServiceImpl_ingestAspectsToLocalDB_MeanRate{}",
           "hide": false,
           "interval": "",
           "legendFormat": "Ingest To DB",
+          "range": true,
           "refId": "B"
         },
         {
@@ -700,11 +729,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
           "expr": "metrics_com_linkedin_metadata_entity_EntityService_produceMAE_Mean{}",
-          "hide": false,
+          "hide": true,
           "interval": "",
           "legendFormat": "Produce MAE",
+          "range": true,
           "refId": "C"
         }
       ],
@@ -722,6 +753,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -735,6 +767,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -793,10 +826,12 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_kafka_MetadataChangeLogProcessor_maeProcess_Mean",
+          "expr": "metrics_postEntity_MeanRate",
           "interval": "",
           "legendFormat": "Avg",
+          "range": true,
           "refId": "A"
         },
         {
@@ -804,11 +839,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "builder",
           "exemplar": true,
           "expr": "metrics_com_linkedin_metadata_kafka_MetadataAuditEventsProcessor_maeProcess_75thPercentile",
-          "hide": false,
+          "hide": true,
           "interval": "",
           "legendFormat": "P75",
+          "range": true,
           "refId": "B"
         },
         {
@@ -816,11 +853,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
           "expr": "metrics_com_linkedin_metadata_kafka_MetadataAuditEventsProcessor_maeProcess_95thPercentile",
-          "hide": false,
+          "hide": true,
           "interval": "",
           "legendFormat": "P95",
+          "range": true,
           "refId": "C"
         }
       ],
@@ -838,6 +877,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -851,6 +891,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -958,6 +999,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -971,6 +1013,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1077,6 +1120,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1090,6 +1134,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1148,9 +1193,9 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_kafka_MetadataChangeLogProcessor_MetadataTestHook_latency_Mean",
+          "expr": "metrics_com_linkedin_metadata_kafka_MetadataChangeLogProcessor_UpdateIndicesHook_latency_Mean",
           "legendFormat": "Avg",
           "range": true,
           "refId": "A"
@@ -1160,9 +1205,9 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_kafka_MetadataChangeLogProcessor_MetadataTestHook_latency_75thPercentile",
+          "expr": "metrics_com_linkedin_metadata_kafka_MetadataChangeLogProcessor_UpdateIndicesHook_latency_75thPercentile",
           "hide": false,
           "legendFormat": "P75",
           "range": true,
@@ -1173,16 +1218,16 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_kafka_MetadataChangeLogProcessor_MetadataTestHook_latency_95thPercentile",
+          "expr": "metrics_com_linkedin_metadata_kafka_MetadataChangeLogProcessor_UpdateIndicesHook_latency_95thPercentile",
           "hide": false,
           "legendFormat": "P95",
           "range": true,
           "refId": "C"
         }
       ],
-      "title": "Metadata Test Latency",
+      "title": "Metadata Update Latency",
       "type": "timeseries"
     },
     {
@@ -1196,6 +1241,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1209,6 +1255,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1248,7 +1295,7 @@
         "x": 7,
         "y": 26
       },
-      "id": 51,
+      "id": 56,
       "options": {
         "legend": {
           "calcs": [],
@@ -1267,9 +1314,10 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_kafka_MetadataChangeLogProcessor_NotificationGeneratorHook_latency_Mean",
+          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityResource_delete_Mean{}",
+          "interval": "",
           "legendFormat": "Avg",
           "range": true,
           "refId": "A"
@@ -1279,10 +1327,24 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "editorMode": "builder",
+          "editorMode": "code",
+          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityResource_delete_StdDev{}",
+          "hide": false,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "D"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${datasource}"
+          },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_kafka_MetadataChangeLogProcessor_NotificationGeneratorHook_latency_75thPercentile",
+          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityResource_delete_75thPercentile{}",
           "hide": false,
+          "interval": "",
           "legendFormat": "P75",
           "range": true,
           "refId": "B"
@@ -1292,16 +1354,17 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_kafka_MetadataChangeLogProcessor_NotificationGeneratorHook_latency_95thPercentile",
+          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityResource_delete_95thPercentile{}",
           "hide": false,
+          "interval": "",
           "legendFormat": "P95",
           "range": true,
           "refId": "C"
         }
       ],
-      "title": "Notification Generator latency",
+      "title": "Delete Latency",
       "type": "timeseries"
     },
     {
@@ -1315,6 +1378,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1328,6 +1392,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1434,6 +1499,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1447,6 +1513,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1580,6 +1647,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1593,6 +1661,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1651,23 +1720,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityResource_search_Count{}[1m])/60",
+          "expr": "increase(metrics_com_linkedin_metadata_search_elasticsearch_query_ESSearchDAO_searchRequest_Count{}[1m])/60",
           "interval": "",
           "legendFormat": "QPS",
+          "range": true,
           "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "exemplar": true,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityResource_search_failed_Count{}[1m])/60",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "Failure",
-          "refId": "B"
         }
       ],
       "title": "Search QPS",
@@ -1684,6 +1743,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1697,6 +1757,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1755,10 +1816,12 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityResource_search_Mean{}",
+          "expr": "metrics_com_linkedin_metadata_search_elasticsearch_query_ESSearchDAO_searchRequest_Mean{}",
           "interval": "",
           "legendFormat": "Avg",
+          "range": true,
           "refId": "A"
         },
         {
@@ -1766,11 +1829,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityResource_search_75thPercentile{}",
+          "expr": "metrics_com_linkedin_metadata_search_elasticsearch_query_ESSearchDAO_searchRequest_75thPercentile{}",
           "hide": false,
           "interval": "",
           "legendFormat": "P75",
+          "range": true,
           "refId": "B"
         },
         {
@@ -1778,11 +1843,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_resources_entity_EntityResource_search_95thPercentile{}",
+          "expr": "metrics_com_linkedin_metadata_search_elasticsearch_query_ESSearchDAO_searchRequest_95thPercentile{}",
           "hide": false,
           "interval": "",
           "legendFormat": "P95",
+          "range": true,
           "refId": "C"
         }
       ],
@@ -1800,6 +1867,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1813,6 +1881,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -1943,6 +2012,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1956,6 +2026,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2014,23 +2085,17 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "disableTextWrap": false,
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityResource_browse_Count{}[1m])/60",
+          "expr": "increase(metrics_com_datahub_graphql_GraphQLController_browseV2_Count[1m]) / 60",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "interval": "",
           "legendFormat": "QPS",
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "exemplar": true,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_entity_EntityResource_browse_failed_Count{}[1m])/60",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "Failure",
-          "refId": "B"
+          "range": true,
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Browse QPS",
@@ -2047,6 +2112,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2060,6 +2126,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2118,10 +2185,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_datahub_graphql_GraphQLController_browse_Mean{}",
+          "expr": "metrics_com_datahub_graphql_GraphQLController_browseV2_Mean{}",
+          "hide": false,
           "interval": "",
           "legendFormat": "Avg",
+          "range": true,
           "refId": "A"
         },
         {
@@ -2129,23 +2199,31 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "disableTextWrap": false,
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_datahub_graphql_GraphQLController_browse_75thPercentile{}",
+          "expr": "metrics_com_datahub_graphql_GraphQLController_browseV2_75thPercentile{}",
+          "fullMetaSearch": false,
           "hide": false,
+          "includeNullMetadata": true,
           "interval": "",
           "legendFormat": "P75",
-          "refId": "B"
+          "range": true,
+          "refId": "B",
+          "useBackend": false
         },
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_datahub_graphql_GraphQLController_browse_95thPercentile{}",
+          "expr": "metrics_com_datahub_graphql_GraphQLController_browseV2_95thPercentile{}",
           "hide": false,
           "interval": "",
           "legendFormat": "P95",
+          "range": true,
           "refId": "C"
         }
       ],
@@ -2163,6 +2241,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2176,6 +2255,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2306,6 +2386,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2319,6 +2400,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2377,47 +2459,14 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_lineage_Relationships_getLineage_Count{}[1m])/60",
+          "expr": "increase(metrics_com_linkedin_metadata_graph_elastic_ESGraphQueryDAO_esQuery_Count{}[1m])/60",
+          "hide": false,
           "interval": "",
           "legendFormat": "Relationships QPS",
+          "range": true,
           "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "exemplar": true,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_lineage_Relationships_getLineage_Count{}[1m])/60",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "Lineage QPS",
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "exemplar": true,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_lineage_Relationships_getLineage_failed_Count{}[1m])/60",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "Relationships Failure",
-          "refId": "C"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "exemplar": true,
-          "expr": "increase(metrics_com_linkedin_metadata_resources_lineage_Lineage_get_failed_Count{}[1m])/60",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "Lineage Failure",
-          "refId": "D"
         }
       ],
       "title": "Graph QPS",
@@ -2434,6 +2483,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2447,6 +2497,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2505,10 +2556,12 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_resources_lineage_Relationships_getLineage_Mean{}",
+          "expr": "metrics_com_linkedin_metadata_entity_validation_ValidationUtils_validateLineageResult_Mean{}",
           "interval": "",
           "legendFormat": "Avg",
+          "range": true,
           "refId": "A"
         },
         {
@@ -2516,11 +2569,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_resources_lineage_Relationships_getLineage_75thPercentile{}",
+          "expr": "metrics_com_linkedin_metadata_entity_validation_ValidationUtils_validateLineageResult_75thPercentile{}",
           "hide": false,
           "interval": "",
           "legendFormat": "P75",
+          "range": true,
           "refId": "B"
         },
         {
@@ -2528,11 +2583,13 @@
             "type": "prometheus",
             "uid": "${datasource}"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "metrics_com_linkedin_metadata_resources_lineage_Relationships_getLineage_95thPercentile{}",
+          "expr": "metrics_com_linkedin_metadata_entity_validation_ValidationUtils_validateLineageResult_95thPercentile{}",
           "hide": false,
           "interval": "",
           "legendFormat": "P95",
+          "range": true,
           "refId": "C"
         }
       ],
@@ -2576,6 +2633,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2589,6 +2647,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2668,6 +2727,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2681,6 +2741,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2760,6 +2821,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2773,6 +2835,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2876,6 +2939,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2889,6 +2953,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -2992,6 +3057,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -3005,6 +3071,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -3108,6 +3175,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -3121,6 +3189,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -3224,6 +3293,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -3237,6 +3307,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -3331,16 +3402,15 @@
     }
   ],
   "refresh": "5s",
-  "schemaVersion": 37,
-  "style": "dark",
+  "schemaVersion": 39,
   "tags": [],
   "templating": {
     "list": [
       {
         "current": {
-          "selected": true,
+          "selected": false,
           "text": "Prometheus",
-          "value": "Prometheus"
+          "value": "prometheus"
         },
         "hide": 0,
         "includeAll": false,
@@ -3358,13 +3428,13 @@
     ]
   },
   "time": {
-    "from": "now-30m",
+    "from": "now-12h",
     "to": "now"
   },
   "timepicker": {},
   "timezone": "",
   "title": "DataHub Dashboard",
   "uid": "x4fS54Vnk",
-  "version": 2,
+  "version": 6,
   "weekStart": ""
-}
+}
\ No newline at end of file
diff --git a/docker/mysql-setup/Dockerfile b/docker/mysql-setup/Dockerfile
index 46969352d81746..b0ca45ad8f6f24 100644
--- a/docker/mysql-setup/Dockerfile
+++ b/docker/mysql-setup/Dockerfile
@@ -5,7 +5,7 @@ FROM golang:1-alpine3.20 AS binary
 
 ARG ALPINE_REPO_URL
 
-ENV DOCKERIZE_VERSION v0.6.1
+ENV DOCKERIZE_VERSION=v0.6.1
 WORKDIR /go/src/github.com/jwilder
 
 # Optionally set corporate mirror for apk
diff --git a/docker/postgres-setup/Dockerfile b/docker/postgres-setup/Dockerfile
index 8ab211218f2406..e145456e807d4d 100644
--- a/docker/postgres-setup/Dockerfile
+++ b/docker/postgres-setup/Dockerfile
@@ -5,7 +5,7 @@ FROM golang:1-alpine3.20 AS binary
 
 ARG ALPINE_REPO_URL
 
-ENV DOCKERIZE_VERSION v0.6.1
+ENV DOCKERIZE_VERSION=v0.6.1
 WORKDIR /go/src/github.com/jwilder
 
 # Optionally set corporate mirror for apk
diff --git a/docker/profiles/docker-compose.frontend.yml b/docker/profiles/docker-compose.frontend.yml
index b43db8297cb1e0..b5b2d50143927f 100644
--- a/docker/profiles/docker-compose.frontend.yml
+++ b/docker/profiles/docker-compose.frontend.yml
@@ -10,6 +10,7 @@ x-datahub-frontend-service: &datahub-frontend-service
     - ${DATAHUB_LOCAL_FRONTEND_ENV:-empty2.env}
   environment: &datahub-frontend-service-env
     KAFKA_BOOTSTRAP_SERVER: broker:29092
+    DATAHUB_GMS_HOST: ${DATAHUB_GMS_HOST:-datahub-gms}
   volumes:
     - ${HOME}/.datahub/plugins:/etc/datahub/plugins
 
diff --git a/docker/profiles/docker-compose.gms.yml b/docker/profiles/docker-compose.gms.yml
index 8cfff2280e2fea..c9448fa34c6870 100644
--- a/docker/profiles/docker-compose.gms.yml
+++ b/docker/profiles/docker-compose.gms.yml
@@ -40,6 +40,7 @@ x-kafka-env: &kafka-env
   # KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
   SCHEMA_REGISTRY_TYPE: INTERNAL
   KAFKA_SCHEMAREGISTRY_URL: http://datahub-gms:8080/schema-registry/api/
+  SPRING_KAFKA_CONSUMER_AUTO_OFFSET_RESET: ${SPRING_KAFKA_CONSUMER_AUTO_OFFSET_RESET:-earliest}
 
 x-datahub-quickstart-telemetry-env: &datahub-quickstart-telemetry-env
   DATAHUB_SERVER_TYPE: ${DATAHUB_SERVER_TYPE:-quickstart}
diff --git a/docker/profiles/docker-compose.prerequisites.yml b/docker/profiles/docker-compose.prerequisites.yml
index 08ebc8b65d8c9c..eed23a749628fe 100644
--- a/docker/profiles/docker-compose.prerequisites.yml
+++ b/docker/profiles/docker-compose.prerequisites.yml
@@ -210,7 +210,7 @@ services:
       - neo4jdata:/data
   kafka-broker:
     hostname: broker
-    image: confluentinc/cp-kafka:7.4.0
+    image: ${DATAHUB_CONFLUENT_KAFKA_IMAGE:-confluentinc/cp-kafka}:${DATAHUB_CONFLUENT_VERSION:-7.4.0}
     command:
       - /bin/bash
       - -c
@@ -234,7 +234,7 @@ services:
     env_file: kafka-broker/env/docker.env
     environment:
       KAFKA_NODE_ID: 1
-      KAFKA_ADVERTISED_LISTENERS: BROKER://broker:29092,EXTERNAL://broker:9092
+      KAFKA_ADVERTISED_LISTENERS: BROKER://broker:29092,EXTERNAL://localhost:9092
       KAFKA_LISTENERS: BROKER://broker:29092,EXTERNAL://broker:9092,CONTROLLER://broker:39092
       KAFKA_INTER_BROKER_LISTENER_NAME: BROKER
       KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
diff --git a/docs-website/README.md b/docs-website/README.md
index c70ae0ea730d93..3b24cb869a444d 100644
--- a/docs-website/README.md
+++ b/docs-website/README.md
@@ -36,12 +36,12 @@ Please use the following steps when adding/managing content for the docs site.
 - [Feature Guide Template](../docs/_feature-guide-template.md)
 - [Metadata Ingestion Source Template](../metadata-ingestion/source-docs-template.md)
 
-### Self-Hosted vs. Managed DataHub
+### Self-Hosted vs. DataHub Cloud
 
-The docs site includes resources for both self-hosted (aka open-source) DataHub and Managed DataHub alike.
+The docs site includes resources for both self-hosted (aka open-source) DataHub and DataHub Cloud alike.
 
 - All Feature Guides should include the `FeatureAvailability` component within the markdown file itself
-- Features only available via Managed DataHub should have the `saasOnly` class if they are included in `sidebar.js` to display the small "cloud" icon:
+- Features only available via DataHub Cloud should have the `saasOnly` class if they are included in `sidebar.js` to display the small "cloud" icon:
 
 ```
 {
diff --git a/docs-website/adoptionStoriesIndexes.json b/docs-website/adoptionStoriesIndexes.json
new file mode 100644
index 00000000000000..d54dd6bcfa4f0a
--- /dev/null
+++ b/docs-website/adoptionStoriesIndexes.json
@@ -0,0 +1,341 @@
+{
+  "companies": [
+    {
+      "name": "Netflix",
+      "slug": "netflix",
+      "imageUrl": "/img/logos/companies/netflix.png",
+      "imageSize": "large",
+      "link": "https://blog.datahubproject.io/how-netflix-is-collaborating-with-datahub-to-enhance-its-extensibility-a34d33f45947",
+      "linkType": "blog",
+      "tagline": "How Netflix is collaborating with DataHub to enhance its extensibility",
+      "category": "B2B & B2C",
+      "description": "<i>\"DataHub gave us the extensibility features we needed to define new entity types easily and augment existing ones. DataHub performed exceptionally well in managing our traffic load and data volume. It offers <b>a great developer experience, a well-documented taxonomy, and — very importantly — solid community support.</b>\"<br /><br /><div style='color: gray;'>— Ajoy Majumdar, Software Architect at Netflix</div></i><br />"
+    },
+    {
+      "name": "Visa",
+      "slug": "visa",
+      "imageUrl": "/img/logos/companies/visa.png",
+      "imageSize": "large",
+      "link": "https://blog.datahubproject.io/how-visa-uses-datahub-to-scale-data-governance-cace052d61c5",
+      "linkType": "blog",
+      "tagline": "How Visa uses DataHub to scale data governance",
+      "category": "Financial & Fintech",
+      "description": "<i>\"We found DataHub to provide excellent coverage for our needs. What we appreciate most about DataHub is <b>its powerful API platform.</b>\"<br /><br /><div style='color: gray;'>— Jean-Pierre Dijcks, Sr. Dir. Product Management at VISA</div></i><br />"
+    },
+    {
+      "name": "Optum",
+      "slug": "optum",
+      "imageUrl": "/img/logos/companies/optum.jpg",
+      "imageSize": "medium",
+      "link": "https://opensource.optum.com/blog/2022/03/23/data-mesh-via-datahub",
+      "linkType": "blog",
+      "tagline": "Data Mesh via DataHub",
+      "category": "And More",
+      "description": "<i>“DataHub’s event driven architecture provides us a mechanism to act on any metadata changes in real time. This allows us to perform various actions like provisioning access to a data product, notifying consumers on any schema changes that may affect their application or triggering data movement jobs to move data from source to sink platforms.”</i>"
+    },
+    {
+      "name": "Pinterest",
+      "slug": "pinterest",
+      "imageUrl": "/img/logos/companies/pinterest.png",
+      "imageSize": "small",
+      "link": "https://www.youtube.com/watch?v=YoxTg8tQSwg&feature=youtu.be",
+      "linkType": "blog",
+      "tagline": "DataHub Project at Pinterest",
+      "category": "B2B & B2C",
+      "description": "Pinterest adopted a DataHub project to enhance metadata management for its big data query platform, facilitating better data navigation and understanding."
+    },
+    {
+      "name": "Airtel",
+      "slug": "airtel",
+      "imageUrl": "/img/logos/companies/airtel.png",
+      "imageSize": "large",
+      "link": "https://www.youtube.com/watch?v=yr24mM91BN4",
+      "linkType": "video",
+      "tagline": "A transformative journey to Airtel's data mesh architecture with DataHub",
+      "category": "B2B & B2C",
+      "description": "Airtel is a leading global telecommunication provider. DataHub is the bedrock of Data Mesh at Airtel by providing the requisite governance and metadata management functionality to <b>ensure their Data Products are discoverable, addressable, trustworthy, self-describing, and secure.</b><br /><br />Get a closer look at how the Airtel team has successfully integrated DataHub to take their data mesh implementation to the next level."
+    },
+    {
+      "name": "Coursera",
+      "slug": "coursera",
+      "imageUrl": "/img/logos/companies/coursera.svg",
+      "imageSize": "small",
+      "link": "https://www.youtube.com/watch?v=bd5v4fn4d4s",
+      "linkType": "video",
+      "tagline": "Coursera's DataHub Journey",
+      "category": "B2B & B2C",
+      "description": "<i>“DataHub aligns with our needs [for] data documentation, a unified search experience, lineage information, and additional metadata. We are also very impressed with the vibrant and supportive community.”</i>"
+    },
+    {
+      "name": "Zynga",
+      "slug": "zynga",
+      "imageUrl": "/img/logos/companies/zynga.png",
+      "imageSize": "default",
+      "link": "https://www.youtube.com/watch?v=VCU3-Hd_glI",
+      "linkType": "video",
+      "tagline": "Zynga's DataHub Implementation",
+      "category": "B2B & B2C",
+      "description": "<i>“We looked around for data catalog tool, and DataHub was a clear winner.”</i> <br /> <br /> Zynga levels up data management using DataHub, highlighting its role in enhancing data management, tracing data lineage, and ensuring data quality."
+    },
+    {
+      "name": "Chime",
+      "slug": "chime",
+      "imageUrl": "/img/logos/companies/chime.png",
+      "imageSize": "default",
+      "link": "https://www.youtube.com/watch?v=GktS-XJhK30",
+      "linkType": "video",
+      "tagline": "A Story of schema, contracts, and data discovery",
+      "category": "Financial & Fintech",
+      "description": "<i>“At Chime, DataHub serves as our guide for navigating the complexities of data cataloging and discovery.”</i> <br /> <br /> Chime uses Datahub (DataHub Cloud) for ingesting metadata from diverse infrastructure components like Snowflake, Looker, Terraform, and so many others."
+    },
+    {
+      "name": "Checkout.com",
+      "slug": "checkout-com",
+      "imageUrl": "/img/logos/companies/checkout-com.svg",
+      "imageSize": "small",
+      "link": "https://www.youtube.com/watch?v=emkpKO0bTkI",
+      "linkType": "video",
+      "tagline": "Self-Serve Data Governance with DataHub Action Framework",
+      "category": "Financial & Fintech",
+      "description": "Discover how Checkout leverage DataHub for advanced data management and compliance, especially in managing sensitive data types."
+    },
+    {
+      "name": "MediaMarkt Saturn",
+      "slug": "mediamarkt-saturn",
+      "imageUrl": "/img/logos/companies/mediamarkt-saturn.png",
+      "imageSize": "large",
+      "link": "https://www.youtube.com/watch?v=wsCFnElN_Wo",
+      "linkType": "video",
+      "tagline": "DataHub + MediaMarktSaturn Access Management Journey",
+      "category": "B2B & B2C",
+      "description": "Europe’s #1 consumer electronics retailer implemented DataHub for three reasons:<br /><br />1. DataHub provides an extremely <b>flexible and customizable metadata platform at scale</b>.<br />2. Open-source means lower cost to implement and removes the headache of license management.<br />3. Community-driven project which continually evolves with industry trends and best practices."
+    },
+    {
+      "name": "Adevinta",
+      "slug": "adevinta",
+      "imageUrl": "/img/logos/companies/adevinta.png",
+      "imageSize": "medium",
+      "link": "https://medium.com/@adevinta/building-the-data-catalogue-the-beginning-of-a-journey-d64e828f955c",
+      "linkType": "blog",
+      "tagline": "Building the data catalogue",
+      "category": "E-Commerce",
+      "description": "<i>“DataHub allows us to solve the data discovery problem, which was a big challenge in our organization, and now we are solving it.”</i>"
+    },
+    {
+      "name": "Wolt",
+      "slug": "wolt",
+      "imageUrl": "/img/logos/companies/wolt.png",
+      "imageSize": "default",
+      "link": "https://blog.datahubproject.io/humans-of-datahub-fredrik-sannholm-d673b1877f2b",
+      "linkType": "blog",
+      "tagline": "Wolt's DataHub Integration",
+      "category": "E-Commerce",
+      "description": "<i>“[DataHub] has made our legal team very happy with being able to keep track of our sensitive data [to answer questions like] Where’s it going? How’s it being processed? Where’s it ending up? Which third party tool or API’s are we sending it to and why? Who is responsible for this integration?”</i>"
+    },
+    {
+      "name": "Geotab",
+      "slug": "geotab",
+      "imageUrl": "/img/logos/companies/geotab.jpg",
+      "imageSize": "small",
+      "link": "https://www.youtube.com/watch?v=boyjT2OrlU4",
+      "linkType": "video",
+      "tagline": "Geotab's Experience with DataHub",
+      "category": "B2B & B2C",
+      "description": "<i>“The key evaluation metric for selecting DataHub was the approachability and technical capabilities of its leading development team.”<i><br /> <br /> Geotab’s data adoption journey explores challenges in data management, governance, and the decision to utilize DataHub for improved productivity and collaboration."
+    },
+    {
+      "name": "Hurb",
+      "slug": "hurb",
+      "imageUrl": "/img/logos/companies/hurb.png",
+      "imageSize": "medium",
+      "link": "https://blog.datahubproject.io/humans-of-datahub-patrick-franco-braz-b02b55a4c5384",
+      "linkType": "blog",
+      "tagline": "Hurb's DataHub Journey",
+      "category": "B2B & B2C",
+      "description": "<i>“The main points that drove our decision to implement DataHub were its user-friendly interface, active and receptive community, contribution opportunities, and built-in ingestion sources for our primary services.”</i><br /><br /> Hurb implemented DataHub to enhance data governance, streamline data access, and improve decision-making through a structured integration process."
+    },
+    {
+      "name": "Grofers",
+      "slug": "grofers",
+      "imageUrl": "/img/logos/companies/grofers.png",
+      "imageSize": "medium",
+      "link": "https://www.youtube.com/watch?v=m9kUYAuezFI",
+      "linkType": "video",
+      "tagline": "Grofers' Success with DataHub",
+      "category": "E-Commerce",
+      "description": "Grofers provides a closer look into how their team has leveraged DataHub as the source of truth for data governance."
+    },
+    {
+      "name": "Viasat",
+      "slug": "viasat",
+      "imageUrl": "/img/logos/companies/viasat.png",
+      "imageSize": "medium",
+      "link": "https://www.youtube.com/watch?v=2SrDAJnzkjE",
+      "linkType": "video",
+      "tagline": "Viasat's DataHub Implementation",
+      "category": "And More",
+      "description": "Viasat highlights why they chose DataHub over other open source and commercial technologies and their plans with it."
+    },
+    {
+      "name": "LinkedIn",
+      "slug": "linkedin",
+      "imageUrl": "/img/logos/companies/linkedin.svg",
+      "imageSize": "medium",
+      "category": "B2B & B2C"
+    },
+    {
+      "name": "Udemy",
+      "slug": "udemy",
+      "imageUrl": "/img/logos/companies/udemy.png",
+      "imageSize": "medium",
+      "category": "B2B & B2C"
+    },
+    {
+      "name": "ThoughtWorks",
+      "slug": "thoughtworks",
+      "imageUrl": "/img/logos/companies/thoughtworks.png",
+      "imageSize": "medium",
+      "category": "B2B & B2C"
+    },
+    {
+      "name": "Expedia Group",
+      "slug": "expedia-group",
+      "imageUrl": "/img/logos/companies/expedia.svg",
+      "imageSize": "medium",
+      "category": "B2B & B2C"
+    },
+    {
+      "name": "Typeform",
+      "slug": "typeform",
+      "imageUrl": "/img/logos/companies/typeform.svg",
+      "imageSize": "medium",
+      "category": "B2B & B2C"
+    },
+    {
+      "name": "Peloton",
+      "slug": "peloton",
+      "imageUrl": "/img/logos/companies/peloton.png",
+      "imageSize": "default",
+      "category": "B2B & B2C"
+    },
+    {
+      "name": "Razer",
+      "slug": "razer",
+      "imageUrl": "/img/logos/companies/razer.jpeg",
+      "imageSize": "large",
+      "category": "B2B & B2C"
+    },
+    {
+      "name": "ClassDojo",
+      "slug": "classdojo",
+      "imageUrl": "/img/logos/companies/classdojo.png",
+      "imageSize": "medium",
+      "category": "B2B & B2C"
+    },
+    {
+      "name": "Klarna",
+      "slug": "klarna",
+      "imageUrl": "/img/logos/companies/klarna.svg",
+      "imageSize": "medium",
+      "category": "Financial & Fintech"
+    },
+    {
+      "name": "N26",
+      "slug": "n26",
+      "imageUrl": "/img/logos/companies/n26.svg",
+      "imageSize": "medium",
+      "category": "Financial & Fintech"
+    },
+    {
+      "name": "BankSalad",
+      "slug": "banksalad",
+      "imageUrl": "/img/logos/companies/banksalad.png",
+      "imageSize": "default",
+      "category": "Financial & Fintech"
+    },
+    {
+      "name": "Uphold",
+      "slug": "uphold",
+      "imageUrl": "/img/logos/companies/uphold.png",
+      "imageSize": "default",
+      "category": "Financial & Fintech"
+    },
+    {
+      "name": "Stash",
+      "slug": "stash",
+      "imageUrl": "/img/logos/companies/stash.svg",
+      "imageSize": "medium",
+      "category": "Financial & Fintech"
+    },
+    {
+      "name": "SumUp",
+      "slug": "sumup",
+      "imageUrl": "/img/logos/companies/sumup.png",
+      "imageSize": "medium",
+      "category": "Financial & Fintech"
+    },
+    {
+      "name": "VanMoof",
+      "slug": "vanmoof",
+      "imageUrl": "/img/logos/companies/vanmoof.png",
+      "imageSize": "small",
+      "category": "E-Commerce"
+    },
+    {
+      "name": "SpotHero",
+      "slug": "spothero",
+      "imageUrl": "/img/logos/companies/spothero.png",
+      "imageSize": "default",
+      "category": "E-Commerce"
+    },
+    {
+      "name": "hipages",
+      "slug": "hipages",
+      "imageUrl": "/img/logos/companies/hipages.png",
+      "imageSize": "medium",
+      "category": "E-Commerce"
+    },
+    {
+      "name": "Showroomprive.com",
+      "slug": "showroomprive-com",
+      "imageUrl": "/img/logos/companies/showroomprive.png",
+      "imageSize": "small",
+      "category": "E-Commerce"
+    },
+    {
+      "name": "Wikimedia Foundation",
+      "slug": "wikimedia-foundation",
+      "imageUrl": "/img/logos/companies/wikimedia-foundation.png",
+      "imageSize": "medium",
+      "category": "And More"
+    },
+    {
+      "name": "Cabify",
+      "slug": "cabify",
+      "imageUrl": "/img/logos/companies/cabify.png",
+      "imageSize": "medium",
+      "category": "And More"
+    },
+    {
+      "name": "Digital Turbine",
+      "slug": "digital-turbine",
+      "imageUrl": "/img/logos/companies/digitalturbine.svg",
+      "imageSize": "medium",
+      "category": "And More"
+    },
+    {
+      "name": "DFDS",
+      "slug": "dfds",
+      "imageUrl": "/img/logos/companies/dfds.png",
+      "imageSize": "medium",
+      "category": "And More"
+    },
+    {
+      "name": "Moloco",
+      "slug": "moloco",
+      "imageUrl": "/img/logos/companies/moloco.png",
+      "imageSize": "medium",
+      "category": "And More"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/docs-website/build.gradle b/docs-website/build.gradle
index 798047a562ffd2..3b78804eafd9d2 100644
--- a/docs-website/build.gradle
+++ b/docs-website/build.gradle
@@ -86,6 +86,8 @@ task yarnGenerate(type: YarnTask, dependsOn: [yarnInstall,
     ':metadata-ingestion:buildWheel',
     ':metadata-ingestion-modules:airflow-plugin:buildWheel',
     ':metadata-ingestion-modules:dagster-plugin:buildWheel',
+    ':metadata-ingestion-modules:prefect-plugin:buildWheel',
+    ':metadata-ingestion-modules:gx-plugin:buildWheel',
     ]) {
   inputs.files(projectMdFiles)
   outputs.cacheIf { true }
diff --git a/docs-website/docusaurus.config.js b/docs-website/docusaurus.config.js
index 5f823a93b4b439..9b1b89afb329a5 100644
--- a/docs-website/docusaurus.config.js
+++ b/docs-website/docusaurus.config.js
@@ -23,6 +23,9 @@ module.exports = {
       src: "/scripts/rb2b.js",
       async: true,
       defer: true,
+    },
+    {
+      src: "https://app.revenuehero.io/scheduler.min.js"
     }
   ],
   noIndex: isSaas,
@@ -56,7 +59,7 @@ module.exports = {
       announcementBar: {
         id: "announcement",
         content:
-          '<div><img src="/img/acryl-logo-white-mark.svg" /><p><strong>Acryl DataHub</strong><span> &nbsp;Acryl Data delivers an easy to consume DataHub platform for the enterprise</span></p></div> <a href="https://www.acryldata.io/datahub-sign-up?utm_source=datahub&utm_medium=referral&utm_campaign=acryl_signup" target="_blank" class="button button--primary">Sign Up for Acryl DataHub&nbsp;→</a>',
+          '<div><img src="/img/acryl-logo-white-mark.svg" /><p><strong>DataHub Cloud</strong><span> &nbsp;Acryl Data delivers an easy to consume DataHub platform for the enterprise</span></p></div> <a href="https://www.acryldata.io/datahub-sign-up?utm_source=datahub&utm_medium=referral&utm_campaign=acryl_signup" target="_blank" class="button button--primary">Sign Up for DataHub Cloud&nbsp;→</a>',
         backgroundColor: "#070707",
         textColor: "#ffffff",
         isCloseable: false,
@@ -76,6 +79,12 @@ module.exports = {
           label: "Docs",
           position: "right",
         },
+        {
+          to: "/cloud",
+          activeBasePath: "cloud",
+          html: "Cloud",
+          position: "right",
+        },
         {
           to: "/learn",
           activeBasePath: "learn",
@@ -141,8 +150,8 @@ module.exports = {
               label: "YouTube",
             },
             {
-              href: "https://www.youtube.com/playlist?list=PLdCtLs64vZvGCKMQC2dJEZ6cUqWsREbFi",
-              label: "Case Studies",
+              href: "/adoption-stories",
+              label: "Adoption Stories",
             },
             {
               href: "https://www.youtube.com/playlist?list=PLdCtLs64vZvErAXMiqUYH9e63wyDaMBgg",
diff --git a/docs-website/download_historical_versions.py b/docs-website/download_historical_versions.py
index 7493210ffa2a5f..0998d8d9972624 100644
--- a/docs-website/download_historical_versions.py
+++ b/docs-website/download_historical_versions.py
@@ -3,6 +3,7 @@
 import tarfile
 import time
 import urllib.request
+import shutil
 
 repo_url = "https://api.github.com/repos/datahub-project/static-assets"
 
@@ -18,7 +19,7 @@ def download_file(url, destination):
 
 
 def fetch_urls(
-    repo_url: str, folder_path: str, file_format: str, max_retries=3, retry_delay=5
+    repo_url: str, folder_path: str, file_format: str, active_versions: list, max_retries=3, retry_delay=5
 ):
     api_url = f"{repo_url}/contents/{folder_path}"
     for attempt in range(max_retries + 1):
@@ -30,7 +31,7 @@ def fetch_urls(
             urls = [
                 file["download_url"]
                 for file in json.loads(data)
-                if file["name"].endswith(file_format)
+                if file["name"].endswith(file_format) and any(version in file["name"] for version in active_versions)
             ]
             print(urls)
             return urls
@@ -48,12 +49,22 @@ def extract_tar_file(destination_path):
         tar.extractall()
     os.remove(destination_path)
 
+def get_active_versions():
+    # read versions.json
+    with open("versions.json") as f:
+        versions = json.load(f)
+    return versions
+
+def clear_directory(directory):
+    if os.path.exists(directory):
+        shutil.rmtree(directory)
+    os.makedirs(directory)
 
 def download_versioned_docs(folder_path: str, destination_dir: str, file_format: str):
-    if not os.path.exists(destination_dir):
-        os.makedirs(destination_dir)
+    clear_directory(destination_dir)  # Clear the directory before downloading
 
-    urls = fetch_urls(repo_url, folder_path, file_format)
+    active_versions = get_active_versions()
+    urls = fetch_urls(repo_url, folder_path, file_format, active_versions)
 
     for url in urls:
         filename = os.path.basename(url)
diff --git a/docs-website/filterTagIndexes.json b/docs-website/filterTagIndexes.json
index 2fa00120fd2cc3..2309593b2c3b9f 100644
--- a/docs-website/filterTagIndexes.json
+++ b/docs-website/filterTagIndexes.json
@@ -85,7 +85,7 @@
       "tags": {
         "Platform Type": "Orchestrator",
         "Connection Type": "Pull",
-        "Features": "Stateful Ingestion, UI Ingestion, Status Aspect"
+        "Features": "Status Aspect"
       }
     },
     {
@@ -103,7 +103,7 @@
       "Path": "docs/generated/ingestion/sources/datahub",
       "imgPath": "img/acryl-logo-light-mark.png",
       "Title": "DataHub",
-      "Description": "Integrate your open source DataHub instance with Acryl Cloud or other on-prem DataHub instances",
+      "Description": "Integrate your open source DataHub instance with DataHub Cloud or other on-prem DataHub instances",
       "tags": {
         "Platform Type": "Metadata",
         "Connection Type": "Pull",
@@ -429,6 +429,17 @@
         "Features": "Stateful Ingestion, Lower Casing, Status Aspect"
       }
     },
+    {
+      "Path": "docs/lineage/prefect",
+      "imgPath": "img/logos/platforms/prefect.svg",
+      "Title": "Prefect",
+      "Description": "Prefect is a modern workflow orchestration for data and ML engineers.",
+      "tags": {
+        "Platform Type": "Orchestrator",
+        "Connection Type": "Pull",
+        "Features": "Status Aspect"
+      }
+    },
     {
       "Path": "docs/generated/ingestion/sources/presto",
       "imgPath": "img/logos/platforms/presto.svg",
diff --git a/docs-website/generateDocsDir.ts b/docs-website/generateDocsDir.ts
index 9116218290d32d..032e912c7190e1 100644
--- a/docs-website/generateDocsDir.ts
+++ b/docs-website/generateDocsDir.ts
@@ -176,7 +176,7 @@ const hardcoded_titles = {
   "docs/actions/README.md": "Introduction",
   "docs/actions/concepts.md": "Concepts",
   "docs/actions/quickstart.md": "Quickstart",
-  "docs/saas.md": "Managed DataHub",
+  "docs/saas.md": "DataHub Cloud",
 };
 // titles that have been hardcoded in sidebars.js
 // (for cases where doc is reference multiple times with different titles)
@@ -573,6 +573,8 @@ function copy_python_wheels(): void {
     "../metadata-ingestion/dist",
     "../metadata-ingestion-modules/airflow-plugin/dist",
     "../metadata-ingestion-modules/dagster-plugin/dist",
+    "../metadata-ingestion-modules/prefect-plugin/dist",
+    "../metadata-ingestion-modules/gx-plugin/dist",
   ];
 
   const wheel_output_directory = path.join(STATIC_DIRECTORY, "wheels");
diff --git a/docs-website/package.json b/docs-website/package.json
index 62d12888323036..58820fbf42b21b 100644
--- a/docs-website/package.json
+++ b/docs-website/package.json
@@ -48,6 +48,7 @@
     "react-dom": "18.2.0",
     "sass": "^1.43.2",
     "swc-loader": "^0.2.6",
+    "swiper": "^11.1.4",
     "uuid": "^9.0.0"
   },
   "browserslist": {
diff --git a/docs-website/sidebars.js b/docs-website/sidebars.js
index a7aece48be3bcf..fe1ee9e6236ab7 100644
--- a/docs-website/sidebars.js
+++ b/docs-website/sidebars.js
@@ -31,7 +31,11 @@ module.exports = {
           label: "Demo",
           href: "https://demo.datahubproject.io/",
         },
-        "docs/what-is-datahub/customer-stories",
+        {
+          type: "link",
+          label: "Adoption Stories",
+          href: "/adoption-stories",
+        },
         "docs/what-is-datahub/datahub-concepts",
       ],
     },
@@ -94,6 +98,23 @@ module.exports = {
             },
           ],
         },
+        {
+          label: "Automations",
+          type: "category",
+          items: [
+            {
+              label: "Documentation Propagation",
+              type: "doc",
+              id: "docs/automations/docs-propagation",
+            },
+            {
+              label: "Snowflake Tag Sync",
+              type: "doc",
+              id: "docs/automations/snowflake-tag-propagation",
+              className: "saasOnly",
+            },
+          ],
+        },
         {
           label: "Business Attributes",
           type: "doc",
@@ -200,7 +221,7 @@ module.exports = {
       ],
     },
     {
-      label: "Managed DataHub",
+      label: "DataHub Cloud",
       type: "category",
       collapsed: true,
       link: {
@@ -254,6 +275,11 @@ module.exports = {
               id: "docs/managed-datahub/slack/saas-slack-app",
               className: "saasOnly",
             },
+            {
+              type: "doc",
+              id: "docs/managed-datahub/slack/saas-slack-troubleshoot",
+              className: "saasOnly",
+            },
           ],
         },
         {
@@ -280,7 +306,9 @@ module.exports = {
           className: "saasOnly",
         },
         {
-          "Managed DataHub Release History": [
+          "DataHub Cloud Release History": [
+            "docs/managed-datahub/release-notes/v_0_3_5",
+            "docs/managed-datahub/release-notes/v_0_3_4",
             "docs/managed-datahub/release-notes/v_0_3_3",
             "docs/managed-datahub/release-notes/v_0_3_2",
             "docs/managed-datahub/release-notes/v_0_3_1",
@@ -417,6 +445,11 @@ module.exports = {
           id: "docs/lineage/openlineage",
           label: "OpenLineage",
         },
+        {
+          type: "doc",
+          id: "docs/lineage/prefect",
+          label: "Prefect",
+        },
         {
           type: "doc",
           id: "metadata-integration/java/acryl-spark-lineage/README",
@@ -517,7 +550,12 @@ module.exports = {
       "Advanced Guides": [
         "docs/how/delete-metadata",
         "docs/how/configuring-authorization-with-apache-ranger",
-        "docs/managed-datahub/configuring-identity-provisioning-with-ms-entra",
+        {
+          "SCIM Provisioning": [
+            "docs/managed-datahub/configuring-identity-provisioning-with-ms-entra",
+            "docs/managed-datahub/configuring-identity-provisioning-with-okta",
+          ],
+        },
         "docs/how/backup-datahub",
         "docs/how/restore-indices",
         "docs/advanced/db-retention",
@@ -810,7 +848,6 @@ module.exports = {
     },
     {
       "API & SDK Guides": [
-        "docs/api/tutorials/custom-properties",
         "docs/api/tutorials/datasets",
         "docs/api/tutorials/deprecation",
         "docs/api/tutorials/descriptions",
@@ -886,6 +923,8 @@ module.exports = {
     // "metadata-integration/java/openlineage-converter/README"
     //"metadata-ingestion-modules/airflow-plugin/README"
     //"metadata-ingestion-modules/dagster-plugin/README"
+    //"metadata-ingestion-modules/prefect-plugin/README"
+    //"metadata-ingestion-modules/gx-plugin/README"
     // "metadata-ingestion/schedule_docs/datahub", // we can delete this
     // TODO: change the titles of these, removing the "What is..." portion from the sidebar"
     // "docs/what/entity",
@@ -915,6 +954,8 @@ module.exports = {
     // "docs/_api-guide-template"
     // - "metadata-service/services/README"
     // "metadata-ingestion/examples/structured_properties/README"
+    // "smoke-test/tests/openapi/README"
+    // "docs/SECURITY_STANCE"
     // ],
   ],
 };
diff --git a/docs-website/src/components/FeatureAvailability/index.js b/docs-website/src/components/FeatureAvailability/index.js
index 27e7424432b599..b3e776952aa968 100644
--- a/docs-website/src/components/FeatureAvailability/index.js
+++ b/docs-website/src/components/FeatureAvailability/index.js
@@ -14,7 +14,7 @@ const FeatureAvailability = ({ saasOnly, ossOnly }) => (
     <div>
       <CloudOutlined className={styles.managedIcon} />
       <span className={clsx(styles.platform, !ossOnly && styles.platformAvailable)}>
-        Managed DataHub {ossOnly ? <CloseCircleFilled /> : <CheckCircleFilled />}
+        DataHub Cloud {ossOnly ? <CloseCircleFilled /> : <CheckCircleFilled />}
       </span>
     </div>
   </div>
diff --git a/docs-website/src/learn/_components/LearnListPage/index.jsx b/docs-website/src/learn/_components/LearnListPage/index.jsx
index 4df87a340f21ee..1ceec9afa1e8a3 100644
--- a/docs-website/src/learn/_components/LearnListPage/index.jsx
+++ b/docs-website/src/learn/_components/LearnListPage/index.jsx
@@ -58,8 +58,9 @@ function BlogListPageContent(props) {
             <strong>For: </strong>
             {audiences.map((audience) => (
               <button
-                className={`button button--secondary ${activeFilters.includes(audience) && "button--active"}`}
+                className={clsx(styles.button, "button button--secondary", { [styles.buttonActive]: activeFilters.includes(audience) })}
                 onClick={() => handleFilterToggle(audience)}
+                key={audience}
               >
                 {audience}
               </button>
diff --git a/docs-website/src/learn/_components/LearnListPage/styles.module.scss b/docs-website/src/learn/_components/LearnListPage/styles.module.scss
index d08b48a011de07..ce86e124afdb81 100644
--- a/docs-website/src/learn/_components/LearnListPage/styles.module.scss
+++ b/docs-website/src/learn/_components/LearnListPage/styles.module.scss
@@ -4,4 +4,10 @@
   align-items: center;
   gap: 10px;
   flex-wrap: wrap;
-}
\ No newline at end of file
+
+  .buttonActive {
+    background-color: var(--ifm-color-primary);
+    border: 1px solid var(--ifm-color-primary);
+    color: #ffffff;
+  }
+}
diff --git a/docs-website/src/learn/business-glossary.md b/docs-website/src/learn/business-glossary.md
index d6b249617fc5ac..4568406a1667fc 100644
--- a/docs-website/src/learn/business-glossary.md
+++ b/docs-website/src/learn/business-glossary.md
@@ -91,7 +91,7 @@ Some companies use manual methods to track data terminology and manage access re
 
 ### Our Solution
 
-Acryl DataHub offers comprehensive features designed to support the authoring of a unified business glossary for your organization:
+DataHub Cloud offers comprehensive features designed to support the authoring of a unified business glossary for your organization:
 
 <p align="center">
   <img width="80%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/blogs/glossary-terms/business-glossary-center.png"/>
diff --git a/docs-website/src/learn/business-metric.md b/docs-website/src/learn/business-metric.md
index 39221a67d40abc..1378168f42195e 100644
--- a/docs-website/src/learn/business-metric.md
+++ b/docs-website/src/learn/business-metric.md
@@ -54,7 +54,7 @@ Some companies try to align metric definitions through emails and meetings. Whil
 
 ### Our Solution
 
-Acryl DataHub offers comprehensive features designed to tackle the challenges of defining and standardizing business metrics:
+DataHub Cloud offers comprehensive features designed to tackle the challenges of defining and standardizing business metrics:
 
 <p align="center">
   <img width="80%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/blogs/glossary-terms/business-glossary-center.png"/>
@@ -72,13 +72,14 @@ Acryl DataHub offers comprehensive features designed to tackle the challenges of
 </p>
 
 - **[Approval Flows](https://datahubproject.io/docs/managed-datahub/approval-workflows):** Structured workflows for approving changes to metric definitions, maintaining accuracy and reliability.
-    - 
 
-![Untitled](https://prod-files-secure.s3.us-west-2.amazonaws.com/f818df0d-1067-44ab-99e1-8cf45d930c01/33ebd070-32a1-4875-b220-c31373f5eedf/Untitled.png)
+<p align="center">
+  <img width="80%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/blogs/data-freshness/lineage.png"/>
+ <br />
+  <i style={{color:"grey"}}>Lineage Tracking</i>
+</p>
 
 - **[Lineage Tracking](https://datahubproject.io/docs/generated/lineage/lineage-feature-guide):** Tools to track the origin and transformations of metrics, ensuring they align with standardized definitions.
-    -
-![Screenshot 2024-07-10 at 12.07.28 PM.png](https://prod-files-secure.s3.us-west-2.amazonaws.com/f818df0d-1067-44ab-99e1-8cf45d930c01/39503957-ad64-4d2d-a5b2-b140abfc1f6c/Screenshot_2024-07-10_at_12.07.28_PM.png)
 
 By implementing these solutions, you can ensure that your business metrics are consistently defined and accurately used across all teams, supporting reliable analysis and decision-making.
 
diff --git a/docs-website/src/learn/data-freshness.md b/docs-website/src/learn/data-freshness.md
index e97e9b054b256d..528b2975f7528e 100644
--- a/docs-website/src/learn/data-freshness.md
+++ b/docs-website/src/learn/data-freshness.md
@@ -91,7 +91,7 @@ DataHub offers comprehensive features designed to tackle data freshness challeng
 </p>
 
 
-**Freshness Monitoring & Alerting:** Automatically detect and alert when data freshness issues occur, to ensure timely updates by proactively monitoring key datasets for updates. Check out [Assertions](https://datahubproject.io/docs/managed-datahub/observe/assertions) and [Freshness Assertions](https://datahubproject.io/docs/managed-datahub/observe/freshness-assertions), Available in **Acryl Managed DataHub Only.**
+**Freshness Monitoring & Alerting:** Automatically detect and alert when data freshness issues occur, to ensure timely updates by proactively monitoring key datasets for updates. Check out [Assertions](https://datahubproject.io/docs/managed-datahub/observe/assertions) and [Freshness Assertions](https://datahubproject.io/docs/managed-datahub/observe/freshness-assertions), Available in **DataHub Cloud Only.**
 
 <p align="center">
   <img width="80%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/blogs/data-freshness/freshness-assertions.png"/>
diff --git a/docs-website/src/learn/data-mesh.md b/docs-website/src/learn/data-mesh.md
index f9a625d103ae71..038fcb971f5da2 100644
--- a/docs-website/src/learn/data-mesh.md
+++ b/docs-website/src/learn/data-mesh.md
@@ -90,7 +90,7 @@ While a centralized data lake or warehouse can simplify data governance by virtu
 
 ### Our Solution
 
-Acryl DataHub offers a comprehensive set of features designed to support the implementation of a Data Mesh at your organization:
+DataHub Cloud offers a comprehensive set of features designed to support the implementation of a Data Mesh at your organization:
 
 - **[Data Domains](https://datahubproject.io/docs/domains)**: Clearly define and manage data products within each business unit.
 - **[Data Products](https://datahubproject.io/docs/dataproducts):** Ensure each domain owns and manages its data products, promoting autonomy and agility.
@@ -100,7 +100,7 @@ Acryl DataHub offers a comprehensive set of features designed to support the imp
 <p align="center">
   <img width="80%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/blogs/data-mesh/data-contract.png"/> 
   <br />
-  <i style={{color:"grey"}}>Data Contracts in Acryl DataHub UI</i>
+  <i style={{color:"grey"}}>Data Contracts in DataHub Cloud UI</i>
 </p>
 
 
@@ -128,4 +128,4 @@ By implementing these solutions, you can effectively manage decentralized data,
 
 ## Conclusion
 
-Implementing a Data Mesh can significantly improve your organization's ability to manage and leverage decentralized data. By understanding the benefits of data mesh and following best practices for implementation, you can overcome the limitations of centralized data systems and enhance your agility, scalability, and ability to generate insights. Acryl DataHub was built from the ground up to help you achieve this, providing the tools and features necessary to implement a large-scale Data Mesh successfully.
\ No newline at end of file
+Implementing a Data Mesh can significantly improve your organization's ability to manage and leverage decentralized data. By understanding the benefits of data mesh and following best practices for implementation, you can overcome the limitations of centralized data systems and enhance your agility, scalability, and ability to generate insights. DataHub Cloud was built from the ground up to help you achieve this, providing the tools and features necessary to implement a large-scale Data Mesh successfully.
\ No newline at end of file
diff --git a/docs-website/src/learn/data-pipeline.md b/docs-website/src/learn/data-pipeline.md
index f5e5bb6615f48b..d57341c30a8c73 100644
--- a/docs-website/src/learn/data-pipeline.md
+++ b/docs-website/src/learn/data-pipeline.md
@@ -61,7 +61,7 @@ Some companies resort to manual debugging or use communication tools like Slack
 
 ### Our Solution
 
-Acryl DataHub offers comprehensive features designed to optimize data pipelines:
+DataHub Cloud offers comprehensive features designed to optimize data pipelines:
 
 <p align="center">
   <img width="80%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/blogs/data-pipeline/lineage-tracking.png"/>
diff --git a/docs-website/src/pages/_components/CardCTAs/cardCTAs.module.scss b/docs-website/src/pages/_components/CardCTAs/cardCTAs.module.scss
deleted file mode 100644
index fcd3666d03ddc9..00000000000000
--- a/docs-website/src/pages/_components/CardCTAs/cardCTAs.module.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-.flexCol {
-  display: flex;
-}
-
-.ctaCard {
-  flex-direction: row;
-  align-items: flex-start;
-  justify-content: space-between;
-  row-gap: 1rem;
-  padding: 1rem;
-  &:hover {
-    text-decoration: none;
-    border: 1px solid var(--ifm-color-primary);
-    background-color: var(--ifm-background-surface-color);
-  }
-  margin-bottom: 1rem;
-  flex: 1;
-}
-
-.ctaHeading {
-  margin-bottom: 0;
-  display: flex;
-  align-items: center;
-}
diff --git a/docs-website/src/pages/_components/CardCTAs/index.js b/docs-website/src/pages/_components/CardCTAs/index.js
deleted file mode 100644
index dc1b148d24bcd2..00000000000000
--- a/docs-website/src/pages/_components/CardCTAs/index.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from "react";
-import clsx from "clsx";
-import styles from "./cardCTAs.module.scss";
-import useBaseUrl from "@docusaurus/useBaseUrl";
-import { ArrowRightOutlined } from "@ant-design/icons";
-
-const cardsContent = [
-  {
-    label: "Data Mesh",
-    title: "Data Products, Delivered",
-    url: "https://www.acryldata.io/blog/data-products-in-datahub-everything-you-need-to-know?utm_source=datahub&utm_medium=referral&utm_content=blog",
-  },
-  {
-    label: "Data Contracts",
-    title: "Data Contracts: End-to-end Reliability in Data",
-    url: "https://www.acryldata.io/blog/data-contracts-in-datahub-combining-verifiability-with-holistic-data-management?utm_source=datahub&utm_medium=referral&utm_content=blog",
-  },
-  {
-    label: "Shift Left",
-    title: "Data Governance and Lineage Impact Analysis",
-    url: "https://www.acryldata.io/blog/the-3-must-haves-of-metadata-management-part-2?utm_source=datahub&utm_medium=referral&utm_content=blog",
-  },
-];
-
-const Card = ({ label, title, url }) => {
-  return (
-    <div className={clsx("col col--4 flex", styles.flexCol)}>
-      <a href={url} target="_blank" className={clsx("card", styles.ctaCard)}>
-        <div>
-          <strong>{label}</strong>
-          <h3 className={styles.ctaHeading}>{title}&nbsp;</h3>
-        </div>
-        <ArrowRightOutlined />
-      </a>
-    </div>
-  );
-};
-
-const CardCTAs = () =>
-  cardsContent?.length > 0 ? (
-    <div style={{ padding: "2vh 0" }}>
-      <div className="container">
-        <div className="row">
-          {cardsContent.map((props, idx) => (
-            <Card key={idx} {...props} />
-          ))}
-        </div>
-      </div>
-    </div>
-  ) : null;
-
-export default CardCTAs;
diff --git a/docs-website/src/pages/_components/Hero/hero.module.scss b/docs-website/src/pages/_components/Hero/hero.module.scss
index 6e4a623f469d51..97bdceaef69366 100644
--- a/docs-website/src/pages/_components/Hero/hero.module.scss
+++ b/docs-website/src/pages/_components/Hero/hero.module.scss
@@ -42,58 +42,3 @@
     }
   }
 }
-
-.quickLinks {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 1rem;
-  font-weight: bold;
-  margin-bottom: -2.5vh;
-  @media (min-width: 768px) {
-    flex-direction: row;
-  }
-
-  > * {
-    padding: 0.5rem 1rem;
-    display: inline-block;
-
-    @media (min-width: 768px) {
-      padding: 0 1rem;
-    }
-  }
-}
-
-.quickLinksLabel {
-  display: flex;
-  align-items: center;
-  svg {
-    width: 24px;
-    height: 24px;
-    color: var(--ifm-text-color) !important;
-    margin-right: 0.5rem;
-  }
-}
-
-.quickstartContent {
-  text-align: center;
-  padding: 2rem 0;
-  height: 100%;
-  margin: 2rem 0;
-  background: #34394d;
-  border-radius: var(--ifm-card-border-radius);
-}
-
-.quickstartTitle {
-  color: #fafafa;
-}
-
-.quickstartSubtitle {
-  font-size: 1.1rem;
-  color: gray;
-}
-
-.quickstartCodeblock {
-  text-align: left;
-  padding: 0 20vh;
-}
diff --git a/docs-website/src/pages/_components/Hero/index.js b/docs-website/src/pages/_components/Hero/index.js
index 17e5d0e7f4966a..12e41e2ecd1766 100644
--- a/docs-website/src/pages/_components/Hero/index.js
+++ b/docs-website/src/pages/_components/Hero/index.js
@@ -7,8 +7,8 @@ import { useColorMode } from "@docusaurus/theme-common";
 import { QuestionCircleOutlined } from "@ant-design/icons";
 import styles from "./hero.module.scss";
 import CodeBlock from "@theme/CodeBlock";
-import CardCTAs from "../CardCTAs";
 import TownhallButton from "../TownhallButton";
+import { Section } from "../Section";
 
 const HeroAnnouncement = ({ message, linkUrl, linkText }) => (
   <div className={clsx("hero__alert alert alert--primary", styles.hero__alert)}>
@@ -50,33 +50,6 @@ const Hero = ({}) => {
             <TownhallButton />
           </div>
         </div>
-        <CardCTAs />
-        <div className={styles.quickstartContent}>
-          <h1 className={styles.quickstartTitle}>Get Started Now</h1>
-          <p className={styles.quickstartSubtitle}>Run the following command to get started with DataHub.</p>
-          <div className={styles.quickstartCodeblock}>
-            <CodeBlock className={"language-shell"}>
-              python3 -m pip install --upgrade pip wheel setuptools <br />
-              python3 -m pip install --upgrade acryl-datahub <br />
-              datahub docker quickstart
-            </CodeBlock>
-          </div>
-          <Link className="button button--primary button--md" to={useBaseUrl("docs/quickstart")}>
-            DataHub Quickstart Guide
-          </Link>
-          <Link className="button button--secondary button--md" to={useBaseUrl("docs/deploy/kubernetes")}>
-            Deploying With Kubernetes
-          </Link>
-        </div>
-        <div className={clsx("card", styles.quickLinks)}>
-          <div className={styles.quickLinksLabel}>
-            <QuestionCircleOutlined />
-            Learn
-          </div>
-          <Link to={useBaseUrl("docs/")}>What is DataHub?</Link>
-          <Link to={useBaseUrl("docs/architecture/architecture")}>How is DataHub architected?</Link>
-          <Link to="https://demo.datahubproject.io">See DataHub in action</Link>
-        </div>
       </div>
     </header>
   );
diff --git a/docs-website/src/pages/_components/Logos/index.js b/docs-website/src/pages/_components/Logos/index.js
index 3243617bcc40d6..a4ac46649ccf49 100644
--- a/docs-website/src/pages/_components/Logos/index.js
+++ b/docs-website/src/pages/_components/Logos/index.js
@@ -1,204 +1,15 @@
-import React from "react";
 import clsx from "clsx";
-import Tabs from "@theme/Tabs";
-import TabItem from "@theme/TabItem";
 import Link from "@docusaurus/Link";
 import useBaseUrl from "@docusaurus/useBaseUrl";
-
+import React from "react";
+import { Swiper, SwiperSlide } from "swiper/react";
+import "swiper/css";
+import "swiper/css/pagination";
+import { Pagination } from "swiper/modules";
 import styles from "./logos.module.scss";
+const companyIndexes = require("../../../../adoptionStoriesIndexes.json");
+const companies = companyIndexes.companies;
 
-const companiesByIndustry = [
-  {
-    name: "B2B & B2C",
-    companies: [
-      {
-        name: "LinkedIn",
-        imageUrl: "/img/logos/companies/linkedin.svg",
-        imageSize: "medium",
-      },
-      {
-        name: "Udemy",
-        imageUrl: "/img/logos/companies/udemy.png",
-        imageSize: "medium",
-      },
-      {
-        name: "Airtel",
-        imageUrl: "/img/logos/companies/airtel.png",
-        imageSize: "large",
-      },
-      {
-        name: "Coursera",
-        imageUrl: "/img/logos/companies/coursera.svg",
-        imageSize: "small",
-      },
-      {
-        name: "Geotab",
-        imageUrl: "/img/logos/companies/geotab.jpg",
-        imageSize: "small",
-      },
-      {
-        name: "ThoughtWorks",
-        imageUrl: "/img/logos/companies/thoughtworks.png",
-        imageSize: "medium",
-      },
-      {
-        name: "Expedia Group",
-        imageUrl: "/img/logos/companies/expedia.svg",
-        imageSize: "medium",
-      },
-      {
-        name: "Typeform",
-        imageUrl: "/img/logos/companies/typeform.svg",
-        imageSize: "medium",
-      },
-      {
-        name: "Peloton",
-        imageUrl: "/img/logos/companies/peloton.png",
-        imageSize: "default",
-      },
-      {
-        name: "Zynga",
-        imageUrl: "/img/logos/companies/zynga.png",
-        imageSize: "default",
-      },
-      {
-        name: "Hurb",
-        imageUrl: "/img/logos/companies/hurb.png",
-        imageSize: "medium",
-      },
-      {
-        name: "Razer",
-        imageUrl: "/img/logos/companies/razer.jpeg",
-        imageSize: "large",
-      },
-      {
-        name: "ClassDojo",
-        imageUrl: "/img/logos/companies/classdojo.png",
-        imageSize: "medium",
-      },
-    ],
-  },
-  {
-    name: "Financial & Fintech",
-    companies: [
-      {
-        name: "Saxo Bank",
-        imageUrl: "/img/logos/companies/saxobank.svg",
-        imageSize: "default",
-      },
-      {
-        name: "Klarna",
-        imageUrl: "/img/logos/companies/klarna.svg",
-        imageSize: "medium",
-      },
-      {
-        name: "N26",
-        imageUrl: "/img/logos/companies/n26.svg",
-        imageSize: "medium",
-      },
-      {
-        name: "BankSalad",
-        imageUrl: "/img/logos/companies/banksalad.png",
-        imageSize: "default",
-      },
-      {
-        name: "Uphold",
-        imageUrl: "/img/logos/companies/uphold.png",
-        imageSize: "default",
-      },
-      {
-        name: "Stash",
-        imageUrl: "/img/logos/companies/stash.svg",
-        imageSize: "medium",
-      },
-      {
-        name: "SumUp",
-        imageUrl: "/img/logos/companies/sumup.png",
-        imageSize: "medium",
-      },
-    ],
-  },
-  {
-    name: "E-Commerce",
-    companies: [
-      {
-        name: "Adevinta",
-        imageUrl: "/img/logos/companies/adevinta.png",
-        imageSize: "medium",
-      },
-      {
-        name: "VanMoof",
-        imageUrl: "/img/logos/companies/vanmoof.png",
-        imageSize: "small",
-      },
-      {
-        name: "Grofers",
-        imageUrl: "/img/logos/companies/grofers.png",
-        imageSize: "medium",
-      },
-      {
-        name: "SpotHero",
-        imageUrl: "/img/logos/companies/spothero.png",
-        imageSize: "default",
-      },
-      {
-        name: "hipages",
-        imageUrl: "/img/logos/companies/hipages.png",
-        imageSize: "medium",
-      },
-      {
-        name: "Wolt",
-        imageUrl: "/img/logos/companies/wolt.png",
-        imageSize: "default",
-      },
-      {
-        name: "Showroomprive.com",
-        imageUrl: "/img/logos/companies/showroomprive.png",
-        imageSize: "small",
-      },
-    ],
-  },
-  {
-    name: "And More",
-    companies: [
-      {
-        name: "Wikimedia Foundation",
-        imageUrl: "/img/logos/companies/wikimedia-foundation.png",
-        imageSize: "medium",
-      },
-      {
-        name: "Cabify",
-        imageUrl: "/img/logos/companies/cabify.png",
-        imageSize: "medium",
-      },
-      {
-        name: "Digital Turbine",
-        imageUrl: "/img/logos/companies/digitalturbine.svg",
-        imageSize: "medium",
-      },
-      {
-        name: "Viasat",
-        imageUrl: "/img/logos/companies/viasat.png",
-        imageSize: "medium",
-      },
-      {
-        name: "DFDS",
-        imageUrl: "/img/logos/companies/dfds.png",
-        imageSize: "medium",
-      },
-      {
-        name: "Moloco",
-        imageUrl: "/img/logos/companies/moloco.png",
-        imageSize: "medium",
-      },
-      {
-        name: "Optum",
-        imageUrl: "/img/logos/companies/optum.jpg",
-        imageSize: "medium",
-      },
-    ],
-  },
-];
 
 const platformLogos = [
   {
@@ -229,6 +40,7 @@ const platformLogos = [
     name: "CouchBase",
     imageUrl: "/img/logos/platforms/couchbase.svg",
   },
+  { name: "Dagster", imageUrl: "/img/logos/platforms/dagster.png" },
   { name: "Databricks", imageUrl: "/img/logos/platforms/databricks.png" },
   { name: "DBT", imageUrl: "/img/logos/platforms/dbt.svg" },
   { name: "Deltalake", imageUrl: "/img/logos/platforms/deltalake.svg" },
@@ -276,6 +88,7 @@ const platformLogos = [
   { name: "Pinot", imageUrl: "/img/logos/platforms/pinot.svg" },
   { name: "PostgreSQL", imageUrl: "/img/logos/platforms/postgres.svg" },
   { name: "PowerBI", imageUrl: "/img/logos/platforms/powerbi.png" },
+  { name: "Prefect", imageUrl: "/img/logos/platforms/prefect.svg" },
   { name: "Presto", imageUrl: "/img/logos/platforms/presto.svg" },
   { name: "Protobuf", imageUrl: "/img/logos/platforms/protobuf.png" },
   { name: "Pulsar", imageUrl: "/img/logos/platforms/pulsar.png" },
@@ -315,10 +128,19 @@ const platformLogos = [
 ];
 
 export const PlatformLogos = () => (
-  <Link to={useBaseUrl("docs/metadata-ingestion#installing-plugins/")} className={styles.marquee}>
+  <Link
+    to={useBaseUrl("docs/metadata-ingestion#installing-plugins/")}
+    className={styles.marquee}
+  >
     <div>
       {[...platformLogos, ...platformLogos].map((logo, idx) => (
-        <img src={useBaseUrl(logo.imageUrl)} alt={logo.name} title={logo.name} key={idx} className={styles.platformLogo} />
+        <img
+          src={useBaseUrl(logo.imageUrl)}
+          alt={logo.name}
+          title={logo.name}
+          key={idx}
+          className={styles.platformLogo}
+        />
       ))}
     </div>
   </Link>
@@ -326,22 +148,58 @@ export const PlatformLogos = () => (
 
 export const CompanyLogos = () => (
   <div className={clsx("container", styles.companyLogoContainer)}>
-    <Tabs className="pillTabs">
-      {companiesByIndustry.map((industry, idx) => (
-        <TabItem value={`industry-${idx}`} label={industry.name} key={idx} default={idx === 0}>
-          <div className={styles.companyWrapper}>
-            {industry.companies.map((company, idx) => (
+    <Swiper
+      slidesPerView={8}
+      spaceBetween={30}
+      slidesPerGroup={6}
+      breakpoints={{
+        320: {
+          slidesPerView: 2,
+          spaceBetween: 10,
+        },
+        480: {
+          slidesPerView: 4,
+          spaceBetween: 20,
+        },
+        960: {
+          slidesPerView: 8,
+          spaceBetween: 30,
+        },
+      }}
+      pagination={{ clickable: true }}
+      modules={[Pagination]}
+      className={clsx("mySwiper", styles.companyWrapper)}
+    >
+      {companies
+        .filter((company) => company.imageUrl) // Filter companies with imageUrl
+        .map((company, idx) => (
+          <SwiperSlide key={idx}>
+            {company.link ? (
+              <a href={`/adoption-stories#${company.slug}`}>
+                <img
+                  src={useBaseUrl(company.imageUrl)}
+                  alt={company.name}
+                  title={company.name}
+                  className={clsx(
+                    styles.companyLogo,
+                    styles.companyLogoWithLink,
+                    styles[company.imageSize]
+                  )}
+                />
+              </a>
+            ) : (
               <img
                 src={useBaseUrl(company.imageUrl)}
                 alt={company.name}
                 title={company.name}
-                key={idx}
-                className={clsx(styles.companyLogo, styles[company.imageSize])}
+                className={clsx(
+                  styles.companyLogo,
+                  styles[company.imageSize]
+                )}
               />
-            ))}
-          </div>
-        </TabItem>
-      ))}
-    </Tabs>
+            )}
+          </SwiperSlide>
+        ))}
+    </Swiper>
   </div>
 );
diff --git a/docs-website/src/pages/_components/Logos/logos.module.scss b/docs-website/src/pages/_components/Logos/logos.module.scss
index b20cc9a48b247c..fd331bccb45563 100644
--- a/docs-website/src/pages/_components/Logos/logos.module.scss
+++ b/docs-website/src/pages/_components/Logos/logos.module.scss
@@ -1,3 +1,7 @@
+.pillTabs {
+  justify-content: center;
+}
+
 .marquee {
   width: 100%;
   overflow: hidden;
@@ -35,7 +39,6 @@
 }
 
 .companyWrapper {
-  background: #fff;
   display: flex;
   flex-wrap: wrap;
   align-items: center;
@@ -45,16 +48,25 @@
     filter: invert(1);
     mix-blend-mode: exclusion;
   }
+
+  :global {
+    .swiper-wrapper {
+      display: flex;
+      align-items: center;
+      margin-bottom: 1rem;
+      .swiper-slide {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        height: 100%;
+      }
+    }
+  }
 }
 
 .companyLogoContainer {
-  display: flex;
-  align-items: center;
   justify-content: center;
   > div {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
     ul[role="tablist"] {
       padding: 0 1rem;
       overflow-x: auto;
@@ -79,23 +91,35 @@
   }
 }
 
+.companyLogoWithLink {
+  &:hover {
+    opacity: 1;
+    filter: grayscale(0%);
+  }
+}
+
 .companyLogo {
-  width: auto;
+  flex-shrink: 0;
+  width: 100%;
+  height: auto;
   mix-blend-mode: luminosity;
   opacity: 0.66;
-  margin: 2.5rem;
-  height: 60px;
+  filter: grayscale(100%);
 
   &.default {
-    height: 60px;
+    padding: 30px;
   }
   &.large {
-    height: 100px;
+    padding: 5px;
   }
   &.medium {
-    height: 30px;
+    padding: 15px;
   }
   &.small {
-    height: 20px;
+    padding: 10px;
   }
 }
+
+.swiper-pagination {
+  margin-top: 1rem;
+}
\ No newline at end of file
diff --git a/docs-website/src/pages/_components/QuickstartContent/index.js b/docs-website/src/pages/_components/QuickstartContent/index.js
new file mode 100644
index 00000000000000..8c942a6a2e440b
--- /dev/null
+++ b/docs-website/src/pages/_components/QuickstartContent/index.js
@@ -0,0 +1,50 @@
+import React from "react";
+import clsx from "clsx";
+import Link from "@docusaurus/Link";
+import useBaseUrl from "@docusaurus/useBaseUrl";
+import Image from "@theme/IdealImage";
+import { useColorMode } from "@docusaurus/theme-common";
+import { QuestionCircleOutlined } from "@ant-design/icons";
+import styles from "./quickstartcontent.module.scss";
+import CodeBlock from "@theme/CodeBlock";
+import TownhallButton from "../TownhallButton";
+import { Section } from "../Section";
+
+
+const QuickstartContent = ({}) => {
+  const { colorMode } = useColorMode();
+  return (
+      <div className={clsx("container", styles.container)}>
+        <div className="hero__content">
+           <div className={styles.quickstartContent}>
+              <h1 className={styles.quickstartTitle}>Get Started Now</h1>
+              <p className={styles.quickstartSubtitle}>Run the following command to get started with DataHub.</p>
+              <div className={styles.quickstartCodeblock}>
+                <CodeBlock className={"language-shell"}>
+                  python3 -m pip install --upgrade pip wheel setuptools <br />
+                  python3 -m pip install --upgrade acryl-datahub <br />
+                  datahub docker quickstart
+                </CodeBlock>
+              </div>
+              <Link className={clsx("button button--primary button--md", styles.button)} to={useBaseUrl("docs/quickstart")}>
+                DataHub Quickstart Guide
+              </Link>
+              <Link className={clsx("button button--secondary button--md", styles.button)} to={useBaseUrl("docs/quickstart")}>
+                Deploying With Kubernetes
+              </Link>
+          </div>
+          <div className={clsx("card", styles.quickLinks)}>
+          <div className={styles.quickLinksLabel}>
+            <QuestionCircleOutlined />
+            Learn
+          </div>
+          <Link to={useBaseUrl("docs/")}>What is DataHub?</Link>
+          <Link to={useBaseUrl("docs/architecture/architecture")}>How is DataHub architected?</Link>
+          <Link to="https://demo.datahubproject.io">See DataHub in action</Link>
+          </div>
+        </div>
+      </div>
+  );
+};
+
+export default QuickstartContent;
diff --git a/docs-website/src/pages/_components/QuickstartContent/quickstartcontent.module.scss b/docs-website/src/pages/_components/QuickstartContent/quickstartcontent.module.scss
new file mode 100644
index 00000000000000..e1badca6d2e348
--- /dev/null
+++ b/docs-website/src/pages/_components/QuickstartContent/quickstartcontent.module.scss
@@ -0,0 +1,67 @@
+.container {
+    margin-bottom: 2rem;
+}
+
+.button {
+    text-decoration: none;
+    margin: 0.5rem 0 0 0;
+    white-space: nowrap;
+    @media (min-width: 690px) {
+      margin: 0 0 0 0.5rem;
+    }
+}
+
+.quickstartContent {
+  text-align: center;
+  padding: 2rem 0;
+  height: 100%;
+  margin: 2rem 0;
+  background: #34394d;
+  border-radius: var(--ifm-card-border-radius);
+}
+
+.quickstartTitle {
+  color: #fafafa;
+}
+
+.quickstartSubtitle {
+  font-size: 1.1rem;
+  color: gray;
+}
+
+.quickstartCodeblock {
+  text-align: left;
+  padding: 0 20vh;
+}
+
+.quickLinks {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 1rem;
+  font-weight: bold;
+  margin-bottom: -2.5vh;
+  @media (min-width: 768px) {
+    flex-direction: row;
+  }
+
+  > * {
+    padding: 0.5rem 1rem;
+    display: inline-block;
+
+    @media (min-width: 768px) {
+      padding: 0 1rem;
+    }
+  }
+}
+
+.quickLinksLabel {
+  display: flex;
+  align-items: center;
+  svg {
+    width: 24px;
+    height: 24px;
+    color: var(--ifm-text-color) !important;
+    margin-right: 0.5rem;
+  }
+}
diff --git a/docs-website/src/pages/_components/Quotes/index.js b/docs-website/src/pages/_components/Quotes/index.js
index b66a04c2c6538e..664eba0b120519 100644
--- a/docs-website/src/pages/_components/Quotes/index.js
+++ b/docs-website/src/pages/_components/Quotes/index.js
@@ -32,7 +32,7 @@ const quotesContent = [
 
 const Quote = ({ quote, company }) => {
   return (
-    <div className="col col--4">
+    <div className="col col--4" style={{ paddingLeft: "0", paddingRight: "2rem" }}>
       <div className={clsx("card", styles.quote)}>
         {quote}
         <div className={styles.companyLogoWrapper}>
diff --git a/docs-website/src/pages/_components/Quotes/quotes.module.scss b/docs-website/src/pages/_components/Quotes/quotes.module.scss
index 59573fa7a597a2..3bd895c4e3b243 100644
--- a/docs-website/src/pages/_components/Quotes/quotes.module.scss
+++ b/docs-website/src/pages/_components/Quotes/quotes.module.scss
@@ -8,6 +8,7 @@
 
 .companyLogoWrapper {
   background: #fff;
+  height: 100px;
   html[data-theme="dark"] & {
     filter: invert(1);
     mix-blend-mode: exclusion;
diff --git a/docs-website/src/pages/_components/Section/index.js b/docs-website/src/pages/_components/Section/index.js
index 281b8e6928f3ae..6780273d313616 100644
--- a/docs-website/src/pages/_components/Section/index.js
+++ b/docs-website/src/pages/_components/Section/index.js
@@ -16,8 +16,8 @@ const PromoSection = () => (
   <section className={clsx(styles.section, styles.promoSection)}>
     <div className="container">
       <img src={useBaseUrl("/img/acryl-logo-white-mark.svg")} />
-      <h2>Managed DataHub</h2>
-      <p>Acryl Data provides a live demo of Managed DataHub every Tuesday and Thursday</p>
+      <h2>DataHub Cloud</h2>
+      <p>Acryl Data provides a live demo of DataHub Cloud every Tuesday and Thursday</p>
       <a href="https://www.acryldata.io/weekly-demo-landing-page?utm_source=datahub&utm_medium=referral&utm_campaign=acryl_signup" target="_blank" className="button button--primary button--lg">
         Sign up for a live demo →
       </a>
diff --git a/docs-website/src/pages/adoption-stories/_components/LearnItemCard/index.jsx b/docs-website/src/pages/adoption-stories/_components/LearnItemCard/index.jsx
new file mode 100644
index 00000000000000..67b94788d97800
--- /dev/null
+++ b/docs-website/src/pages/adoption-stories/_components/LearnItemCard/index.jsx
@@ -0,0 +1,25 @@
+import React from "react";
+import clsx from "clsx";
+import Link from "@docusaurus/Link";
+import styles from "./styles.module.scss";
+
+const LearnItemCard = React.forwardRef(({ company, isSelected }, ref) => {
+  return (
+    <div className={clsx("col col--4", styles.featureCol)} id={company.slug} ref={ref}>
+      <div className={clsx("card", styles.card, { [styles.selected]: isSelected })}>
+        <div className={styles.card_image}>
+          <img src={`/img/adoption-stories/adoption-stories-${company.slug}.png`} alt={company.name} />
+        </div>
+        <div className={clsx("card__body", styles.featureBody)}>
+          <div dangerouslySetInnerHTML={{ __html: company.description }} /></div>
+        <div className={styles.card_button}>
+          <Link className="button button--secondary button--md" href={company.link} target="_blank">
+            Discover {company.name}'s Story
+          </Link>
+        </div>
+      </div>
+    </div>
+  );
+});
+
+export default LearnItemCard;
diff --git a/docs-website/src/pages/adoption-stories/_components/LearnItemCard/styles.module.scss b/docs-website/src/pages/adoption-stories/_components/LearnItemCard/styles.module.scss
new file mode 100644
index 00000000000000..881e90a7d09763
--- /dev/null
+++ b/docs-website/src/pages/adoption-stories/_components/LearnItemCard/styles.module.scss
@@ -0,0 +1,66 @@
+.featureCol {
+  display: flex;
+}
+
+.card_date {
+  padding: 1rem 2rem;
+  font-size: 0.8rem;
+  font-style: italic;
+  color: gray;
+  margin-top: auto;
+}
+
+.card_feature {
+  font-size: 2rem;
+  font-weight: 700;
+}
+
+.card_button {
+ padding: 1rem;
+ text-align: center;
+}
+
+.card {
+  color: var(--ifm-text-color);
+  text-decoration: none !important;
+  padding: 0rem;
+  margin-bottom: 2rem;
+  align-self: stretch;
+  flex-grow: 1;
+  &:hover {
+    opacity: 0.9;
+  }
+
+  &.selected {
+    border-color: var(--ifm-color-primary);
+    box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px;  
+    scroll-margin-top: 100px; 
+  }
+    
+
+  hr {
+    margin: 0;
+  }
+}
+
+.featureHeader {
+  h2 {
+    margin-bottom: 1rem !important;
+    font-size: 1.25rem;
+  }
+  padding: 1rem 2rem;
+}
+
+.featureBody {
+  padding: 0 2rem;
+}
+
+.card_image {
+  margin: 0;
+  margin-bottom: 0.5rem;
+
+  img {
+    width: 100%;
+    height: auto;
+  }
+}
\ No newline at end of file
diff --git a/docs-website/src/pages/adoption-stories/index.jsx b/docs-website/src/pages/adoption-stories/index.jsx
new file mode 100644
index 00000000000000..27f4b876af20a6
--- /dev/null
+++ b/docs-website/src/pages/adoption-stories/index.jsx
@@ -0,0 +1,83 @@
+import React, { useState, useEffect, useRef } from "react";
+import Layout from "@theme/Layout";
+import BrowserOnly from "@docusaurus/BrowserOnly";
+import LearnItemCard from "./_components/LearnItemCard";
+import styles from "./styles.module.scss";
+
+import customerStoriesIndexes from "../../../adoptionStoriesIndexes.json";
+
+function AdoptionStoriesListPageContent() {
+  const companies = (customerStoriesIndexes?.companies || []).filter((company) => company.link);
+  const [activeFilters, setActiveFilters] = useState([]);
+  const categories = ["B2B & B2C", "E-Commerce", "Financial & Fintech", "And More"];
+  const selectedCardRef = useRef(null);
+
+  const filteredItems = activeFilters.length
+    ? companies.filter((company) => activeFilters.includes(company.category))
+    : companies;
+
+  const handleFilterToggle = (category) => {
+    if (activeFilters.includes(category)) {
+      setActiveFilters(activeFilters.filter((filter) => filter !== category));
+    } else {
+      setActiveFilters([...new Set([...activeFilters, category])]);
+    }
+  };
+
+  useEffect(() => {
+    const selectedSlug = window.location.hash.substring(1);
+    if (selectedCardRef.current) {
+      selectedCardRef.current.scrollIntoView({ behavior: "smooth", block: "start", inline: "nearest" });
+    }
+  }, [selectedCardRef]);
+
+  return (
+    <Layout>
+      <header className={"hero"}>
+        <div className="container">
+          <div className="hero__content">
+            <div>
+              <h1 className="hero__title">DataHub Adoption Stories</h1>
+              <p className="hero__subtitle">Learn how the best data and AI teams are using DataHub
+              <br />
+              Check out more stories on the <a href="https://www.youtube.com/playlist?list=PLdCtLs64vZvGCKMQC2dJEZ6cUqWsREbFi" style={{ color: "black" }}>DataHub Youtube</a>.
+              </p>
+            </div>
+          </div>
+          <div className={styles.filterBar}>
+            <strong>For: </strong>
+            {categories.map((category) => (
+              <button
+                key={category}
+                className={`button button--secondary ${activeFilters.includes(category) ? "button--active" : ""}`}
+                onClick={() => handleFilterToggle(category)}
+              >
+                {category}
+              </button>
+            ))}
+          </div>
+        </div>
+      </header>
+      <div className="container">
+        <div className="row">
+          {filteredItems.map((company) => (
+            <LearnItemCard
+              key={company.name}
+              company={company}
+              isSelected={company.slug === window.location.hash.substring(1)}
+              ref={company.slug === window.location.hash.substring(1) ? selectedCardRef : null}
+            />
+          ))}
+        </div>
+      </div>
+    </Layout>
+  );
+}
+
+export default function AdoptionStoriesListPage() {
+  return (
+    <BrowserOnly>
+      {() => <AdoptionStoriesListPageContent />}
+    </BrowserOnly>
+  );
+}
diff --git a/docs-website/src/pages/adoption-stories/styles.module.scss b/docs-website/src/pages/adoption-stories/styles.module.scss
new file mode 100644
index 00000000000000..d08b48a011de07
--- /dev/null
+++ b/docs-website/src/pages/adoption-stories/styles.module.scss
@@ -0,0 +1,7 @@
+.filterBar {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 10px;
+  flex-wrap: wrap;
+}
\ No newline at end of file
diff --git a/docs-website/src/pages/cloud/CompanyLogos/customersData.json b/docs-website/src/pages/cloud/CompanyLogos/customersData.json
new file mode 100644
index 00000000000000..e8a7470eab4702
--- /dev/null
+++ b/docs-website/src/pages/cloud/CompanyLogos/customersData.json
@@ -0,0 +1,124 @@
+{
+  "customers": [
+    {
+      "link": {
+        "href": "https://www.depop.com/",
+        "blank": true
+      },
+      "logo": {
+        "asset": {
+          "_ref": "https://cdn.sanity.io/images/cqo9wkgf/production/345d124a249d43bf0f20b608f8bfa2f7683311fa-360x180.png"
+        },
+        "alt": "depop"
+      }
+    },
+    {
+      "link": {
+        "href": "https://riskified.com",
+        "blank": true
+      },
+      "logo": {
+        "asset": {
+          "_ref": "https://cdn.sanity.io/images/cqo9wkgf/production/c982e0459bed565273a9b696d9d40aed76f84b1e-360x180.png"
+        },
+        "alt": "Riskified"
+      }
+    },
+    {
+      "link": {
+        "href": "https://get.betterup.com/",
+        "blank": true
+      },
+      "logo": {
+        "asset": {
+          "_ref": "https://cdn.sanity.io/images/cqo9wkgf/production/5988a55b3c090a12ddc3f3cae07b290ac3134771-360x180.png"
+        },
+        "alt": "Betterup"
+      }
+    },
+    {
+      "link": {
+        "href": "https://www.ovoenergy.com/",
+        "blank": true
+      },
+      "logo": {
+        "asset": {
+          "_ref": "https://cdn.sanity.io/images/cqo9wkgf/production/5e7bd32dfbc769849dca136947ebd2fc2f5e91f3-540x270.png"
+        },
+        "alt": "OVO Energy"
+      }
+    },
+    {
+      "link": {
+        "href": "https://myob.com",
+        "blank": true
+      },
+      "logo": {
+        "asset": {
+          "_ref": "https://cdn.sanity.io/images/cqo9wkgf/production/3d7c10e1bd7c7a062250e092d6d9d0553fb57790-360x180.png"
+        },
+        "alt": "Myob"
+      }
+    },
+    {
+      "link": {
+        "href": "https://www.dpgmediagroup.com/",
+        "blank": true
+      },
+      "logo": {
+        "asset": {
+          "_ref": "https://cdn.sanity.io/images/cqo9wkgf/production/b446f595b4b13a72ee82a285924715f950e012ca-540x270.png"
+        },
+        "alt": "DPG Megia"
+      }
+    },
+    {
+      "link": {
+        "href": "https://www.notion.so/",
+        "blank": true
+      },
+      "logo": {
+        "asset": {
+          "_ref": "https://cdn.sanity.io/images/cqo9wkgf/production/c2e84f93572cd1baf30ea7ab8da234ff44182eb6-540x270.png"
+        },
+        "alt": "Notion"
+      }
+    },
+    {
+      "link": {
+        "href": "https://www.sae.org/",
+        "blank": true
+      },
+      "logo": {
+        "asset": {
+          "_ref": "https://cdn.sanity.io/images/cqo9wkgf/production/a9e8586635cb4039cbfc5836a6a5cacdeba9e6b3-540x270.png"
+        },
+        "alt": "SAE International"
+      }
+    },
+    {
+      "link": {
+        "href": "https://viator.com",
+        "blank": true
+      },
+      "logo": {
+        "asset": {
+          "_ref": "https://cdn.sanity.io/images/cqo9wkgf/production/0c17141cad5baa053da18dffb17d9c182d242e69-1200x475.png"
+        },
+        "alt": "Viator"
+      }
+    },
+    {
+      "link": {
+        "href": "https://www.tripadvisor.co.uk/",
+        "blank": true
+      },
+      "logo": {
+        "asset": {
+          "_ref": "https://cdn.sanity.io/images/cqo9wkgf/production/28255a28d261a074a83d1ee8632f0338bf5cf57e-1112x256.png"
+        },
+        "alt": "Trip Advisor"
+      }
+    }
+  ]
+}
diff --git a/docs-website/src/pages/cloud/CompanyLogos/index.js b/docs-website/src/pages/cloud/CompanyLogos/index.js
new file mode 100644
index 00000000000000..d395d5b50e48ac
--- /dev/null
+++ b/docs-website/src/pages/cloud/CompanyLogos/index.js
@@ -0,0 +1,49 @@
+import React, { useEffect, useRef } from 'react';
+import Link from '@docusaurus/Link';
+import styles from './logos.module.scss';
+import customersData from './customersData.json';
+import clsx from 'clsx';
+
+const ScrollingCustomers = ({ noOverlay = true, spacing, ...rest }) => {
+  const customers = customersData.customers;
+  const duplicatedLogos = [...customers, ...customers, ...customers];
+  const scrollingRef = useRef(null);
+
+  useEffect(() => {
+    if (scrollingRef.current) {
+      scrollingRef.current.style.setProperty('--customers-length', customers.length);
+    }
+  }, [customers.length]);
+
+  return (
+    <div
+      className={clsx(styles.scrollingCustomers, {
+        [styles.noOverlay]: noOverlay,
+      })}
+      {...rest}
+    >
+      <div
+        className={clsx(styles.animateScrollingCustomers, styles.scrollingCustomers__inner)}
+        ref={scrollingRef}
+      >
+        {duplicatedLogos.map((customer, index) => (
+          <Link
+            key={`item-${index}`}
+            to={customer.link.href}
+            target={customer.link.blank ? '_blank' : '_self'}
+            rel={customer.link.blank ? 'noopener noreferrer' : ''}
+            style={{ minWidth: 'max-content', padding: '0 1.8rem' }}
+          >
+            <img
+              src={customer.logo.asset._ref}
+              alt={customer.logo.alt}
+              className={styles.logoItem}
+            />
+          </Link>
+        ))}
+      </div>
+    </div>
+  );
+};
+
+export default ScrollingCustomers;
diff --git a/docs-website/src/pages/cloud/CompanyLogos/logos.module.scss b/docs-website/src/pages/cloud/CompanyLogos/logos.module.scss
new file mode 100644
index 00000000000000..de404627cf0394
--- /dev/null
+++ b/docs-website/src/pages/cloud/CompanyLogos/logos.module.scss
@@ -0,0 +1,57 @@
+@keyframes scrollingCustomerAnimate {
+  0% {
+    transform: translateX(0);
+  }
+  100% {
+    transform: translateX(calc(var(--customers-length) * -220px));
+  }
+}
+
+@media (max-width: 767px) {
+  @keyframes scrollingCustomerAnimate {
+    0% {
+      transform: translateX(0);
+    }
+    100% {
+      transform: translateX(calc(var(--customers-length) * -166px));
+    }
+  }
+}
+
+.scrollingCustomers {
+  position: relative;
+  overflow: hidden;
+  opacity: 0.5;
+}
+
+
+.scrollingCustomers__inner {
+  display: flex;
+  padding: 1.25rem 0;
+  position: relative;
+  align-items: center;
+  animation: scrollingCustomerAnimate 60s linear infinite;
+}
+
+.scrollingCustomers__inner img {
+  max-width: 160px !important;
+  min-width: unset;
+  filter: invert(1) brightness(0) contrast(100); // make image black
+}
+
+@media (max-width: 767px) {
+  .scrollingCustomers__inner img {
+    width: 126px !important;
+  }
+}
+
+.animateScrollingCustomers {
+  display: flex;
+  animation: scrollingCustomerAnimate 60s linear infinite;
+}
+
+@media (max-width: 767px) {
+  .animateScrollingCustomers {
+    width: calc(var(--customers-length) * 126px);
+  }
+}
diff --git a/docs-website/src/pages/cloud/Enterprise/index.js b/docs-website/src/pages/cloud/Enterprise/index.js
new file mode 100644
index 00000000000000..03cef99058ea2c
--- /dev/null
+++ b/docs-website/src/pages/cloud/Enterprise/index.js
@@ -0,0 +1,48 @@
+import React from "react";
+import clsx from "clsx";
+import Link from "@docusaurus/Link";
+import styles from "./styles.module.scss";
+
+
+const featuresContent = [
+  {
+    title: "99.5% Uptime SLA",
+    description: "We’ll focus on keeping DataHub running, so you can focus on the things that really matter."
+  },
+  {
+    title: "In-VPC Ingestion and<br/>Data Quality evaluation",
+    description: "So your actual data never leaves your network."
+  },
+  {
+    title: "SOC-2 Compliant",
+    description: "An incredibly high level of security you can trust."
+  },
+];
+
+const Feature = ({ title, description }) => {
+  return (
+    <div className={clsx(styles.feature, "col col--4")}>
+      <h2 dangerouslySetInnerHTML={{ __html: title }}></h2>
+      <p>{description}</p>
+    </div>
+  );
+};
+
+const Features = () =>
+  featuresContent?.length > 0 ? (
+    <div className={clsx(styles.container)}>
+      <div className={clsx(styles.wrapper)}>
+        <div className={clsx(styles.title)}>Enterprise Ready</div>
+        <div className="row">
+          {featuresContent.map((props, idx) => (
+            <Feature key={idx} {...props} />
+          ))}
+        </div>
+        <a href="/docs/managed-datahub/managed-datahub-overview#enterprise-grade" target="_blank" className={clsx(styles.moreBenefits)}>
+          +4 benefits
+        </a>
+      </div>
+    </div>
+  ) : null;
+
+export default Features;
diff --git a/docs-website/src/pages/cloud/Enterprise/styles.module.scss b/docs-website/src/pages/cloud/Enterprise/styles.module.scss
new file mode 100644
index 00000000000000..9d95dcc3990b65
--- /dev/null
+++ b/docs-website/src/pages/cloud/Enterprise/styles.module.scss
@@ -0,0 +1,40 @@
+
+.container {
+  padding: 2vh 6vh;
+  padding-bottom: 8vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.wrapper {
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  width: 90%;
+  max-width: 1200px;
+
+}
+
+.title {
+  font-size: 2.8rem;
+  font-weight: 600;
+  margin-bottom: 2rem;
+}
+
+.moreBenefits {
+  font-weight: 400;
+  color: var(--ifm-color-primary);
+
+  &:hover {
+    text-decoration: none;
+    opacity: 0.8;
+  }
+
+}
+
+@media (max-width: 767px) {
+  
+  .container {
+    padding: 0px 36px;
+  }
+}
\ No newline at end of file
diff --git a/docs-website/src/pages/cloud/FeatureCards/index.js b/docs-website/src/pages/cloud/FeatureCards/index.js
new file mode 100644
index 00000000000000..4a45cbcbe17174
--- /dev/null
+++ b/docs-website/src/pages/cloud/FeatureCards/index.js
@@ -0,0 +1,130 @@
+import React from "react";
+import clsx from "clsx";
+import styles from "./styles.module.scss";
+import Link from "@docusaurus/Link";
+import { CheckCircleOutlined } from "@ant-design/icons";
+
+const data = {
+  sections: [
+    {
+      title: "Data Discovery",
+      icon: "/img/assets/data-discovery.svg",
+      cloudPageLink: "https://www.acryldata.io/acryl-datahub",
+      cloudBenefits: [
+        { text: "Enhanced search ranking", link: "" }, //  →
+        { text: "Personalization for every persona", link: "" }, //  →
+        { text: "A browser extension for BI Tools", link: "" }, //  →
+        { text: "AI-Powered Documentation", link: "" }, //  →
+        { text: "No-Code Automations", link: "" }, //  →
+      ],
+      coreBenefits: [
+        { text: "Integrations for 50+ data sources"},
+        { text: "Lineage for tables, columns, and jobs"},
+      ],
+      hiddenCoreBenefits: "+4 benefits",
+      hiddenCoreBenefitsLink: '/docs/managed-datahub/managed-datahub-overview#search-and-discovery',
+    },
+    {
+      title: "Data Observability",
+      icon: "/img/assets/data-ob.svg",
+      cloudPageLink: "https://www.acryldata.io/observe",
+      cloudBenefits: [
+        { text: "Continuous data quality monitors", link: "" }, //  →
+        { text: "End-to-end data incident tracking & management", link: "" }, //  →
+        { text: "AI-Driven anomaly detection", link: "" }, //  →
+        { text: "Executive Data Health Dashboard", link: "" }, //  →
+        { text: "On-demand data quality evaluation via APIs & UI", link: "" }, //  →
+      ],
+      coreBenefits: [
+        { text: "Surface data quality results"},
+        { text: "Create and manage data contracts" },
+      ],
+      hiddenCoreBenefits: "+1 benefit",
+      hiddenCoreBenefitsLink: '/docs/managed-datahub/managed-datahub-overview#data-observability',
+    },
+    {
+      title: "Data Governance",
+      icon: "/img/assets/data-governance.svg",
+      cloudPageLink: "https://www.acryldata.io/acryl-datahub#governance",
+      cloudBenefits: [
+        { text: "Human-assisted asset certification workflows", link: "" }, //  →
+        { text: "Automations to enforce governance standards", link: "" }, //  →
+        { text: "End-to-end glossary management workflows", link: "" }, //  →
+        { text: "Ownership management workflows", link: "" }, //  →
+      ],
+      coreBenefits: [
+        { text: "Shift-left governance"},
+        { text: "Business glossaries"},
+      ],
+      hiddenCoreBenefits: "+1 benefit",
+      hiddenCoreBenefitsLink: '/docs/managed-datahub/managed-datahub-overview#data-governance',
+    },
+  ],
+};
+
+const Features = () => (
+  <div className={clsx(styles.container)}>
+    {data.sections.map((section, sectionIndex) => (
+      <div
+        key={sectionIndex}
+        className={clsx("row row--padded row--centered", {
+          [styles.rowItem]: true,
+          [styles.reversedRow]: sectionIndex % 2 === 1,
+        })}
+      >
+        <div className={clsx(styles.cardGroup, {
+          [styles.cardGroupInverse]: sectionIndex % 2 === 1
+        })}>
+          <div className={clsx("col", styles.cloudCard)}>
+            <div className={clsx(styles.titleContainer)}>
+              <div className={clsx(styles.title)}>
+                <img
+                  className={clsx(styles.icon)}
+                  src={section.icon}
+                  alt={section.title}
+                />
+                <div className={clsx(styles.titleText)}>{section.title}</div>
+              </div>
+            </div>
+            <div className={clsx(styles.card, styles.cloudBenefitCard)}>
+              <div className={clsx(styles.sectionTitle)}>DataHub Cloud includes:</div>
+              <div className={clsx(styles.cloudBenefitList, styles.featureList)}>
+                {section.cloudBenefits.map((benefit, index) => ( 
+                  <div key={index} className={clsx(styles.cloudBenefit)} >
+                    <Link to={benefit.link} className={clsx(styles.cloudBenefitLink)}>
+                      <CheckCircleOutlined className={clsx(styles.benefitIcon)} />
+                      <div className={clsx(styles.cloudBenefitLinkText)}>{benefit.text}</div>
+                    </Link>
+                  </div>
+                ))}
+              </div>
+              <Link
+                className={clsx("button button--primary button--md", styles.exploreButton)}
+                to={section.cloudPageLink}
+                target="_blank"
+              >
+                Explore in DataHub Cloud
+              </Link> 
+            </div>
+          </div>
+          <div className={clsx("col col--6", styles.coreCard)}>
+            <div className={clsx(styles.card, styles.coreBenefitCard)}>
+              <h3>{`In addition to DataHub Core:`}</h3>
+              <div className={clsx(styles.featureList)}>
+                {section.coreBenefits.map((benefit, index) => (
+                  <div key={index} className={clsx(styles.coreBenefit)}>
+                    <CheckCircleOutlined className={clsx(styles.benefitIcon)} />
+                    <div>{benefit.text}</div>
+                  </div>
+                ))}
+              </div>
+              <a href={section.hiddenCoreBenefitsLink} target="_blank" className={clsx(styles.moreBenefits)}>{section.hiddenCoreBenefits}</a>
+            </div>
+          </div>
+        </div>
+      </div>
+    ))}
+  </div>
+);
+
+export default Features;
diff --git a/docs-website/src/pages/cloud/FeatureCards/styles.module.scss b/docs-website/src/pages/cloud/FeatureCards/styles.module.scss
new file mode 100644
index 00000000000000..cfba5e217374d8
--- /dev/null
+++ b/docs-website/src/pages/cloud/FeatureCards/styles.module.scss
@@ -0,0 +1,164 @@
+.container {
+  padding: 48px 20px;
+}
+
+.rowItem {
+  justify-content: center;
+}
+
+.cardGroup {
+  display: flex;
+  justify-content: space-between;
+  position: relative;
+  align-items: flex-start;
+  margin: 0rem 1.2rem 2rem 1.2rem;
+}
+
+.cardGroupInverse {
+  flex-direction: row-reverse;
+  .coreBenefitCard {
+    margin-left: 15rem;
+  }
+}
+
+.title {
+  display: flex;
+  align-items: center;
+  margin: 2rem;
+
+  .icon {
+    width: 4rem;
+    height: 4rem;
+    margin-right: 1rem;
+  }
+
+  .titleText {
+    font-size: 32px;
+    font-weight: 700;
+  }
+}
+
+.card {
+  background: white;
+  padding: 40px;
+  margin: 0;
+}
+
+.sectionTitle {
+  font-size: 24px;
+  font-weight: 600;
+  line-height: 33px;
+}
+
+.benefitIcon {
+  width: 32px;
+  height: 32px;
+  align-items: center;
+}
+
+.moreBenefits {
+  font-family: Manrope;
+  font-size: 20px;
+  font-weight: 400;
+  line-height: 30px;
+  text-align: left;
+  color: rgba(24, 144, 255, 1);
+
+  &:hover {
+    text-decoration: none;
+    opacity: 0.8;
+  }
+}
+
+.featureList {
+  display: grid;
+  margin-top: 1rem;
+  font-weight: 400;
+  font-size: 20px;
+  text-align: left;
+  line-height: 27px;
+}
+
+.exploreButton {
+  margin-top: 24px;
+}
+
+.cloudBenefitCard {
+  border-radius: 16px;
+  border: 2px solid rgba(24, 144, 255, 1);
+  box-shadow: 0px 4px 25px 0px rgba(24, 144, 255, 0.25);
+  background: linear-gradient(180deg, #ffffff 27%, #e4f7ff 87%);
+  min-width: 543px;
+  z-index: 2;
+  position: relative;
+}
+
+.coreBenefitCard {
+  border-radius: 16px;
+  border: 1px solid rgba(227, 227, 227, 1);
+  min-width: 451px;
+  z-index: 1;
+  position: relative;
+  margin-top: 14rem;
+  margin-left: -48px;
+  padding-left: 72px;
+}
+
+.reversedRow .coreBenefitCard {
+  margin-left: auto!important;
+  padding-left: auto!important;
+  margin-right: -48px;
+  padding-right: 72px;
+}
+
+.coreBenefitCard h3 {
+  margin-bottom: 2rem;
+}
+.coreBenefit {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 1rem;
+}
+
+.cloudBenefit {
+  color: rgba(24, 144, 255, 1);
+  margin-bottom: 1rem;
+}
+.cloudBenefitLink {
+  display: flex;
+  flex-direction: row;
+}
+.cloudBenefitLinkText {
+  display: block;
+}
+
+.reversedRow {
+  flex-direction: row-reverse;
+}
+
+.reversedRow .title {
+  justify-content: flex-end;
+}
+
+@media (max-width: 768px) {
+  .cardGroup {
+    flex-direction: column;
+    align-items: center;
+  }
+
+  .cardGroupInverse {
+    flex-direction: column;
+  }
+
+  .cloudBenefitCard, .coreBenefitCard {
+    min-width: 100%;
+    margin-top: 20px;
+  }
+
+  .coreBenefitCard {
+    margin-top: -40px;
+    margin-left: 0 !important;
+    margin-right: 0 !important;
+    padding-top: 80px;
+  }
+}
diff --git a/docs-website/src/pages/cloud/Hero/hubspotFormStyles.css b/docs-website/src/pages/cloud/Hero/hubspotFormStyles.css
new file mode 100644
index 00000000000000..4baa4fd042d7cc
--- /dev/null
+++ b/docs-website/src/pages/cloud/Hero/hubspotFormStyles.css
@@ -0,0 +1,78 @@
+#hubspotForm {
+  text-align: left;
+}
+
+#hubspotForm .input {
+  margin: 0;
+}
+
+#hubspotForm .hs-form input,
+#hubspotForm .hs-form select,
+#hubspotForm .hs-form textarea {
+  border: .5px solid #DDD;
+  background-color: #FFF;
+  padding: .75rem 1rem; 
+  margin: 0.4rem auto;
+  border-radius: 8px; 
+  font-size: 16px;
+  width: 100%;
+}
+
+#hubspotForm .hs-form ::placeholder {
+  font-style: Manrope;
+}
+
+#hubspotForm .hs-form input[type="submit"] {
+  background-color: #1990FF;
+  color: #fff; 
+  border: none; 
+  padding: 10px 20px; /* Custom padding */
+  cursor: pointer;
+  border-radius: 8px; /* Rounded corners */
+  font-size: 16px;
+  font-weight: 600;
+  width: 100px;
+}
+
+#hubspotForm .hs-form input[type="submit"]:hover {
+  background-color: #0056b3; /* Button hover color */
+}
+
+/* hide the label */
+
+#hubspotForm .hs-form label span {
+  display: none;
+}
+
+/* error labels */
+
+#hubspotForm .hs-form .hs-error-msgs {
+  font-size: 15px;
+  color: red;
+  list-style-type: none;
+  padding: 0;
+}
+
+#hubspotForm .hs-form .error {
+  border: red 1.5px solid !important;
+}
+
+/* customize placeholder style */
+
+#hubspotForm .hs-form input::placeholder, 
+#hubspotForm .hs-form textarea::placeholder,
+#hubspotForm .hs-form textarea {
+  font-size: 16px;
+  font-weight: 400;
+  font-family: sans-serif;
+  color: gray;
+}
+
+#hubspotForm .hs-form .hs_firstname {
+  padding-right: 0.5rem;
+}
+
+#hubspotForm .hs-form .hs_lastname {
+  padding-left: 0.5rem;
+}
+
diff --git a/docs-website/src/pages/cloud/Hero/index.js b/docs-website/src/pages/cloud/Hero/index.js
new file mode 100644
index 00000000000000..20f13578bbd76c
--- /dev/null
+++ b/docs-website/src/pages/cloud/Hero/index.js
@@ -0,0 +1,109 @@
+import React, { useEffect } from 'react';
+import clsx from "clsx";
+import Link from "@docusaurus/Link";
+import styles from "./styles.module.scss";
+import ScrollingCustomers from '../CompanyLogos';
+import './hubspotFormStyles.css';
+
+const Hero = () => {
+  useEffect(() => {
+    const script = document.createElement('script');
+    script.src = "//js.hsforms.net/forms/embed/v2.js";
+    script.async = true;
+    script.type = 'text/javascript';
+    document.body.appendChild(script);
+
+    script.onload = () => {
+      if (window.hbspt) {
+        window.hbspt.forms.create({
+          region: "na1",
+          portalId: "14552909",
+          formId: "ed2447d6-e6f9-4771-8f77-825b114a9421",
+          target: '#hubspotForm',
+        });
+
+        // Modify placeholders after the form has loaded
+        setTimeout(() => {
+          const emailInput = document.querySelector('#hubspotForm .hs_email .input > input');
+          const firstNameInput = document.querySelector('#hubspotForm .hs_firstname .input > input');
+          const lastNameInput = document.querySelector('#hubspotForm .hs_lastname .input > input');
+          const phoneInput = document.querySelector('#hubspotForm .hs_phone .input > input');
+          const additionalInfoInput = document.querySelector('#hubspotForm .hs_additional_info .input > textarea');
+
+          if (emailInput) emailInput.placeholder = 'Company Email';
+          if (firstNameInput) firstNameInput.placeholder = 'First Name';
+          if (lastNameInput) lastNameInput.placeholder = 'Last Name';
+          if (phoneInput) phoneInput.placeholder = 'Phone Number';
+          if (additionalInfoInput) additionalInfoInput.placeholder = 'How can we help?';
+
+          const selectNoEElement = document.getElementById("number_of_employees-ed2447d6-e6f9-4771-8f77-825b114a9421");
+          if (selectNoEElement) {
+            const disabledOption = selectNoEElement.querySelector('option[disabled]');
+            if (disabledOption) {
+              disabledOption.text = "Select Number of Employees";
+              disabledOption.value = "";
+            }
+          }
+          const selectfamiliarityElement = document.getElementById("familiarity_with_acryl_datahub-ed2447d6-e6f9-4771-8f77-825b114a9421");
+          if (selectfamiliarityElement) {
+            const disabledOption = selectfamiliarityElement.querySelector('option[disabled]');
+            if (disabledOption) {
+              disabledOption.text = "How familiar are you with DataHub?";
+              disabledOption.value = "";
+            }
+          }
+
+        }, 1000); // Delay to ensure the form is fully loaded
+
+        window.hero = new RevenueHero({ routerId: '982' });
+        window.hero.schedule('hsForm_ed2447d6-e6f9-4771-8f77-825b114a9421');
+      }
+    };
+
+    return () => {
+      document.body.removeChild(script);
+    };
+  }, []);
+
+  return (
+    <header className={clsx("hero", styles.hero)}>
+      <div className="container">
+        <div className="hero__content">
+          <div className="row row__padded">
+            <div className={clsx(styles.hero__cta, styles.col, "col col--7")}>
+                <h1 className={clsx("hero__title", styles.hero__title)}>DataHub Cloud</h1>
+                <div className={clsx("hero__subtitle", styles.hero__subtitle)}>
+                Experience the premium version of DataHub
+                  <div style={{ fontWeight: "500" }}>
+                    with Data Observability and Data Governance built-in.
+                  </div>
+                </div>
+                <Link className={clsx(styles.button, styles.bookButton, "button button--primary button--lg")} to="https://www.acryldata.io/datahub-sign-up?utm_source=datahub&utm_medium=referral&utm_campaign=acryl_signup">
+                  Book Demo
+                </Link>
+                <Link className={clsx(styles.button, styles.productTourButton, "button button--secondary button--lg")} to="https://www.acryldata.io/tour">
+                  Live Product Tour →
+                </Link>
+                <ScrollingCustomers />
+            </div>
+            <div className={clsx(styles.col, "col col--5")}>
+              <div className={clsx(styles.formContainer)}>
+                <div className={clsx(styles.formContent)}>
+                  <div className={clsx(styles.formHeader)}>
+                    <div className={clsx(styles.formTitle)}>Book a free Demo</div>
+                    <div className={clsx(styles.formSubtitle)}>
+                      Schedule a personalized demo and get a free a trial.
+                    </div>
+                  </div>
+                  <div id="hubspotForm" className={styles.hubspotForm}></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </header>
+  );
+};
+
+export default Hero;
diff --git a/docs-website/src/pages/cloud/Hero/styles.module.scss b/docs-website/src/pages/cloud/Hero/styles.module.scss
new file mode 100644
index 00000000000000..d2a2d333a15478
--- /dev/null
+++ b/docs-website/src/pages/cloud/Hero/styles.module.scss
@@ -0,0 +1,112 @@
+.col {
+  padding: 0 2rem;
+}
+
+.hero {
+  .button {
+    margin: 0rem 1rem 2rem 1rem;
+  }
+
+  .hero__title {
+    font-size: 3rem;
+    text-align: left;
+  }
+
+  .hero__secondtitle {
+    font-size: 2rem;
+    font-weight: 300;
+    margin-bottom: 2rem;
+    text-align: left;
+  }
+
+  .hero__subtitle {
+    margin-bottom: 2rem;
+    font-size: 1.75rem;
+    line-height: 2.5rem;
+    margin-left: 0;
+    text-align: left;
+  }
+
+  .buttonLightBlue {
+    color: #1990FF !important;
+    background: #EAF3FF;
+    border-color: #EAF3FF;
+
+    &:hover {
+      background: #D6E7FF;
+    }
+  }
+  .productTourButton {
+    background-color: transparent;
+    border: 0;
+    color: #1990FF !important;
+    text-align: left;
+  }
+
+}
+
+.hero__cta {
+  margin: auto;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+}
+
+.formContainer {
+  padding: 2rem;
+  margin: 0 auto;
+  background-color:#F3F3F3;
+  border: 1px solid #DDD;
+  align-items: center;
+  max-width: 540px;
+  border-radius: 16px;
+
+  .formContent {
+    width: 90%;
+    margin: 0 auto;
+  }
+
+  .formHeader {
+    justify-content: space-between;
+    text-align: left;
+
+    .formTitle {
+      font-size: 24px;
+      font-weight: 600;
+      color: #000;
+      line-height: 28px;
+      margin-bottom: 12px;
+    }
+  
+    .formSubtitle {
+      font-size: 14px;
+      color: #666;
+      line-height: 14px;
+      margin-bottom: 8px;
+    }
+  }
+
+}
+
+.bookButton {
+  display: none;
+}
+
+@media screen and (max-width: 999px) {
+  .bookButton {
+    display: block;
+  }
+  .formContainer {
+    display: none;
+  }
+  .productTourButton {
+    text-align: center!important;
+  }
+}
+
+@media screen  and (min-width: 1000px){
+  .productTourButton {
+    padding-left: 0!important;
+    margin-left: 0!important;
+  }
+}
\ No newline at end of file
diff --git a/docs-website/src/pages/cloud/UnifiedTabs/index.js b/docs-website/src/pages/cloud/UnifiedTabs/index.js
new file mode 100644
index 00000000000000..0c7ff50ce54471
--- /dev/null
+++ b/docs-website/src/pages/cloud/UnifiedTabs/index.js
@@ -0,0 +1,76 @@
+import React, { useState } from 'react';
+import { CaretUpFilled } from '@ant-design/icons';
+import styles from './styles.module.scss';
+import clsx from 'clsx';
+
+const TabbedComponent = () => {
+  const [activeTab, setActiveTab] = useState(0);
+
+  const tabs = [
+    {
+      title: 'Data Discovery',
+      description: 'All the search and discovery features of DataHub Core you already love, enhanced.',
+      icon: "/img/assets/data-discovery.svg",
+      link: "https://www.acryldata.io/acryl-datahub",
+      image: 'https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/saas/demo/discovery.webm',
+    },
+    {
+      title: 'Data Observability',
+      description: 'Detect, resolve, and prevent data quality issues before they impact your business. Unify data health signals from all your data quality tools, including dbt tests and more.',
+      icon: "/img/assets/data-ob.svg",
+      link: "https://www.acryldata.io/observe",
+      image: 'https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/saas/demo/observe.webm',
+    },
+    {
+      title: 'Data Governance',
+      description: 'Powerful Automation, Reporting and Organizational tools to help you govern effectively.',
+      icon: "/img/assets/data-governance.svg",
+      link: "https://www.acryldata.io/acryl-datahub#governance",
+      image: 'https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/saas/demo/governance.webm',
+    },
+  ];
+
+  return (
+    <div className={clsx(styles.tabbedComponent)}>
+      <div className={clsx(styles.title)}><span>One platform to rule them all</span></div>
+      <div className={clsx(styles.container, 'shadow--lw')}>
+        <div className={clsx(styles.tabs)}>
+          {tabs.map((tab, index) => (
+            <React.Fragment key={index}>
+              <div className={clsx(styles.tab, { [styles.activeTab]: activeTab === index })}>
+                <button 
+                  className={clsx(styles.tabButton, { [styles.active]: activeTab === index })}
+                  onClick={() => setActiveTab(index)}
+                >
+                  <img className={clsx(styles.icon)} src={tab.icon} alt={`${tab.title} icon`} />
+                  <div className={clsx(styles.tabTitle)}>{tab.title}</div>
+                  <div className={clsx(styles.arrow, { [styles.upsideDown]: activeTab === index })}><CaretUpFilled/></div>
+                </button>
+                {activeTab === index && (
+                  <div className={clsx(styles.dropdown)}>
+                    <p>{tab.description}</p>
+                    <a className={clsx(styles.learnMore)} href={tab.link} target='_blank'>Learn More →</a>
+                  </div>
+                )}
+              </div>
+              {activeTab === index && (
+                <div className={clsx(styles.imageContainer, styles.mobileImageContainer)}>
+                  <div className={clsx(styles.tabImage)}>
+                    <video src={tabs[activeTab].image} controls={false} autoPlay muted loop />
+                  </div>
+                </div>
+              )}
+            </React.Fragment>
+          ))}
+        </div>
+        <div className={clsx(styles.imageContainer, styles.webImageContainer)}>
+          <div className={clsx(styles.tabImage)}>
+            <video src={tabs[activeTab].image} controls={false} autoPlay muted loop />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default TabbedComponent;
diff --git a/docs-website/src/pages/cloud/UnifiedTabs/styles.module.scss b/docs-website/src/pages/cloud/UnifiedTabs/styles.module.scss
new file mode 100644
index 00000000000000..7549f743053552
--- /dev/null
+++ b/docs-website/src/pages/cloud/UnifiedTabs/styles.module.scss
@@ -0,0 +1,179 @@
+.tabbedComponent {
+  text-align: center;
+  padding: 20px;
+  padding-top: 48px;
+  padding-bottom: 48px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.title {
+  font-size: 2.5rem;
+  font-weight: 500;
+  margin-bottom: 2rem;
+  text-align: center;
+  position: relative;
+  padding: 0 2rem;
+  display: block;
+  width: 100%;
+
+  &:before, &:after {
+    content: " ";
+    height: 2px;
+    width: calc((100vw - 468px - 120px)/2);
+    background: #EEE;
+    display: block;
+    position: absolute;
+    top: 50%;
+  }
+
+  &:before {
+    left: 0;
+  }
+
+  &:after {
+    right: 0;
+  }
+}
+
+.container {
+  display: flex;
+  flex-direction: column; // Changed to column for mobile view
+  background: white;
+  border-radius: 1rem;
+  overflow: hidden;
+  box-shadow: 0 4px 4px rgba(0, 0, 0, 0.1);
+  margin: 0rem 5rem;
+  max-width: 1200px;
+  width: 100%;
+}
+
+.tabs {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+}
+
+.tab {
+  align-items: center;
+  margin: 0;
+  border-bottom: 1px solid #e0e0e0;
+  position: relative;
+
+  &.activeTab {
+    border-bottom: none;
+  }
+}
+
+.activeTab .tabButton {
+  border-bottom: 1px solid #f1f1f1;
+}
+
+.tabButton {
+  padding: 1.5rem;
+  background: none;
+  border: none;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  justify-content: space-between;
+
+  .tabButton:focus {
+    outline: none;
+  }
+  
+  .tabTitle {
+    font-size: 1.5rem;
+    font-weight: 700;
+    margin-left: 1rem;
+    flex-grow: 1;
+    text-align: left;
+  }
+  
+  .icon {
+    width: 2.3rem;
+    height: 2.3rem;
+  }
+}
+
+.arrow {
+  margin-left: auto;
+  transition: transform 0.2s;
+  color: black;
+}
+
+.upsideDown {
+  transform: rotate(180deg);
+}
+
+.dropdown {
+  background-color: #ffffff;
+  margin-top: 5px;
+  text-align: left;
+  padding: 1rem 1.5rem;
+
+  .learnMore {
+    font-weight: 600;
+    font-size: 15px;
+    line-height: 23px;
+
+    &:hover {
+      text-decoration: none;
+      opacity: 0.8;
+    }
+  }
+}
+
+.imageContainer {
+  display: none;
+  justify-content: center;
+  align-items: center;
+  background-color: transparent;
+  margin: 1rem 0; // Added margin for spacing
+  height: 380px;
+  border-radius: 24px;
+}
+
+.tabImage {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  padding: 4px;
+  align-items: center;
+  justify-content: center;
+}
+.tabImage video {
+  max-height: 100%;
+  max-width: 100%;
+  border-radius: 22px;
+  box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.1);
+}
+
+.mobileImageContainer {
+  @media (max-width: 767px) {
+    display: flex;
+  }
+}
+
+.webImageContainer {
+  @media (min-width: 768px) {
+    display: flex;
+    flex-grow: 1;
+  }
+}
+
+@media (min-width: 768px) {
+  .container {
+    flex-direction: row; // Change back to row for larger screens
+    padding: 40px 32px;
+  }
+  .tabs {
+    width: 440px;
+  }
+
+  .imageContainer {
+    margin: 1rem; // Reset margin for larger screens
+  }
+}
diff --git a/docs-website/src/pages/cloud/index.js b/docs-website/src/pages/cloud/index.js
new file mode 100644
index 00000000000000..a403e5dc416169
--- /dev/null
+++ b/docs-website/src/pages/cloud/index.js
@@ -0,0 +1,66 @@
+import React from "react";
+import Layout from "@theme/Layout";
+import Link from "@docusaurus/Link";
+import useDocusaurusContext from "@docusaurus/useDocusaurusContext";
+import Enterprise from "./Enterprise";
+import { Section } from "../_components/Section";
+import clsx from "clsx";
+import styles from "./styles.module.scss";
+import UnifiedTabs from "./UnifiedTabs";
+import FeatureCards from "./FeatureCards";
+import Hero from "./Hero";
+
+function Home() {
+  const context = useDocusaurusContext();
+  const { siteConfig = {} } = context;
+  // const { colorMode } = useColorMode();
+
+
+  if (siteConfig.customFields.isSaas) {
+    window.location.replace("/docs");
+  }
+
+  return !siteConfig.customFields.isSaas ? (
+    <Layout
+      title={'DataHub Cloud - Unify Data Observability, Governance and Discovery'}
+      description="DataHub cloud is Managed DataHub with Data Observability and Data Governance built-in."
+    >
+      <Hero />
+      <div className={clsx(styles.bgSection)}>
+        <UnifiedTabs />
+      </div>
+      <FeatureCards/>
+      <div className={clsx(styles.bgSection)}>
+        <Section>
+          <Enterprise />
+        </Section>
+      </div>
+      <div className={clsx("hero", styles.hero)}>
+        <div className="container" style={{ paddingTop: '12vh', paddingBottom: '12vh' }}>
+          <div className="hero__content">
+            <div>
+              <h1 className="hero__title">Get your free trial.</h1>
+              <div className={clsx(styles.hero__secondtitle)}>Data Discovery, Data Quality and Data Governance unified.</div>
+
+              <Link className="button button--primary button--lg" to="https://www.acryldata.io/datahub-sign-up?utm_source=datahub&utm_medium=referral&utm_campaign=acryl_signup">
+                Book Demo
+              </Link>
+              <Link className={clsx(styles.buttonLightBlue, "button button--secondary button--lg")} to="https://www.acryldata.io/tour">
+                Product Tour
+              </Link>
+              <div className="hero__subtitle" />
+              {/* <hr style={{margin: "3rem"}}/>
+              <div className="hero__subtitle">
+                An extension of the DataHub Core project.<br/>
+                <a className={clsx(styles.link)} href="/docs/managed-datahub/managed-datahub-overview">View Cloud Docs.
+                </a>
+              </div> */}
+            </div>
+          </div>
+        </div>
+      </div>
+    </Layout>
+  ) : null;
+}
+
+export default Home;
diff --git a/docs-website/src/pages/cloud/styles.module.scss b/docs-website/src/pages/cloud/styles.module.scss
new file mode 100644
index 00000000000000..7fc18253b13a0d
--- /dev/null
+++ b/docs-website/src/pages/cloud/styles.module.scss
@@ -0,0 +1,11 @@
+.link {
+  &:hover {
+    text-decoration: none;
+    opacity: 0.8;
+  }
+}
+
+.bgSection {
+  background-color: #FAFAFA !important;
+  }
+
diff --git a/docs-website/src/pages/docs/_components/CustomerCard/customercard.module.scss b/docs-website/src/pages/docs/_components/CustomerCard/customercard.module.scss
deleted file mode 100644
index 349f705d25b10d..00000000000000
--- a/docs-website/src/pages/docs/_components/CustomerCard/customercard.module.scss
+++ /dev/null
@@ -1,56 +0,0 @@
-.card {
-  color: var(--ifm-hero-text-color);
-  padding: 0;
-  margin: 0rem 3rem 2rem 0rem;
-  text-decoration: none !important;
-
-  .card_button {
-     padding: 0rem 0rem 0rem 1rem;
-     text-align: right;
-  }
-
-  .card_img {
-    justify-content: center;
-    display: flex;
-    height: 250px;
-    margin: 0;
-    position: relative;
-    text-align: center;
-  }
-
-  .card_body {
-    padding: 2rem 3rem 2rem 3rem;
-
-    .card_description {
-     min-height: 20rem;
-    }
-  }
-
-  .card_overlay_text {
-      position: absolute;
-      text-align: left;
-      width: 80%;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-      color: white;
-
-    .card_customer {
-       font-size: 3.2rem;
-       font-weight: 800;
-       line-height: 1.2;
-
-    }
-    .card_title {
-      font-size: 1.2rem;
-      font-weight: 600;
-    }
-
-  }
-
-  img {
-    object-fit: cover;
-    filter: brightness(50%);
-  }
-
-}
diff --git a/docs-website/src/pages/docs/_components/CustomerCard/index.jsx b/docs-website/src/pages/docs/_components/CustomerCard/index.jsx
deleted file mode 100644
index 36c83226e1f732..00000000000000
--- a/docs-website/src/pages/docs/_components/CustomerCard/index.jsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from "react";
-import clsx from "clsx";
-import styles from "./customercard.module.scss";
-import Link from "@docusaurus/Link";
-
-const CustomerCard = ({ customer, title, imgUrl, description, to,}) => {
-  return (
-        <div className="col col--6">
-            <div className={clsx("card", styles.card)}>
-              <div className={styles.card_img}>
-                  <img src={imgUrl} alt={customer} />
-                  <div className={styles.card_overlay_text}>
-                    <div class={styles.card_customer}> {customer}</div>
-                    <div class={styles.card_title}> {title}</div>
-                  </div>
-              </div>
-              <div className={styles.card_body}>
-                <p class={styles.card_description}>{description}</p>
-                <div className={styles.card_button}>
-                    <Link className="button button--secondary button--md" href={to} target="_blank">
-                      Discover {customer}'s Story
-                    </Link>
-                </div>
-              </div>
-          </div>
-      </div>
-  );
-};
-
-export default CustomerCard;
diff --git a/docs-website/src/pages/docs/_components/CustomerCardSection/index.jsx b/docs-website/src/pages/docs/_components/CustomerCardSection/index.jsx
index ca34d89df8701d..505a2810c9433c 100644
--- a/docs-website/src/pages/docs/_components/CustomerCardSection/index.jsx
+++ b/docs-website/src/pages/docs/_components/CustomerCardSection/index.jsx
@@ -57,7 +57,7 @@ const customerCardContent = [
         3. Community-driven project which continually evolves with industry trends and best practices
       </>
     ),
-    to: "https://www.acryldata.io/blog/data-contracts-in-datahub-combining-verifiability-with-holistic-data-management?utm_source=datahub&utm_medium=referral&utm_content=blog",
+    to: "https://youtu.be/wsCFnElN_Wo?si=i-bNAQAsbHJq5O9-",
   },
   {
     customer: "Airtel",
@@ -75,7 +75,7 @@ const customerCardContent = [
         DataHub to take their data mesh implementation to the next level.
       </>
     ),
-    to: "https://youtu.be/wsCFnElN_Wo?si=i-bNAQAsbHJq5O9-",
+    to: "https://www.youtube.com/watch?v=yr24mM91BN4",
   },
 ];
 
@@ -93,4 +93,4 @@ const CustomerCardSection = () => {
   );
 };
 
-export default CustomerCardSection;
+export default CustomerCardSection;
\ No newline at end of file
diff --git a/docs-website/src/pages/docs/_components/QuickstartCards/index.jsx b/docs-website/src/pages/docs/_components/QuickstartCards/index.jsx
index bcb77c043f1d0b..9f582967175edd 100644
--- a/docs-website/src/pages/docs/_components/QuickstartCards/index.jsx
+++ b/docs-website/src/pages/docs/_components/QuickstartCards/index.jsx
@@ -10,7 +10,7 @@ const quickstartContent =  [
     fontColor: '#091013',
   },
 {
-    title: "Learn about Managed DataHub",
+    title: "Learn about DataHub Cloud",
     icon: "acryl-logo-transparent-mark",
     to: "managed-datahub/managed-datahub-overview",
     color: '#091013',
diff --git a/docs-website/src/pages/index.js b/docs-website/src/pages/index.js
index 68b177d10f7aff..2eed41b4ad1bd3 100644
--- a/docs-website/src/pages/index.js
+++ b/docs-website/src/pages/index.js
@@ -3,13 +3,14 @@ import Layout from "@theme/Layout";
 import Link from "@docusaurus/Link";
 import useDocusaurusContext from "@docusaurus/useDocusaurusContext";
 import CodeBlock from "@theme/CodeBlock";
-
+import useBaseUrl from "@docusaurus/useBaseUrl";
 import Hero from "./_components/Hero";
 import Features from "./_components/Features";
-import Quotes from "./_components/Quotes";
 import { Section, PromoSection } from "./_components/Section";
-import { PlatformLogos, CompanyLogos } from "./_components/Logos";
+import { PlatformLogos } from "./_components/Logos";
 import RoundedImage from "./_components/RoundedImage";
+import { CompanyLogos } from "./_components/Logos";
+import QuickstartContent from "./_components/QuickstartContent";
 
 const example_recipe = `
 source:
@@ -38,6 +39,18 @@ function Home() {
       description="DataHub is a data discovery application built on an extensible data catalog that helps you tame the complexity of diverse data ecosystems."
     >
       <Hero />
+      <div style={{ backgroundColor: "var(--ifm-background-surface-color)" }}>
+        <CompanyLogos />
+        <div style={{ textAlign: "center", margin: "1rem" }}>
+          <Link
+            className="button button--secondary button--md"
+            to={useBaseUrl("adoption-stories")}
+          >
+            Check Out Adoption Stories →
+          </Link>
+        </div>
+      </div>
+      <QuickstartContent />
       <Features />
       <Section>
         <div className="container">
@@ -157,10 +170,6 @@ function Home() {
           </div>
         </div>
       </Section>
-      <Section title="Trusted Across the Industry">
-        <CompanyLogos />
-        <Quotes />
-      </Section>
     </Layout>
   ) : null;
 }
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-adevinta.png b/docs-website/static/img/adoption-stories/adoption-stories-adevinta.png
new file mode 100644
index 00000000000000..6c790995843c54
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-adevinta.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-airtel.png b/docs-website/static/img/adoption-stories/adoption-stories-airtel.png
new file mode 100644
index 00000000000000..ae5ebdedd47aa1
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-airtel.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-checkout-com.png b/docs-website/static/img/adoption-stories/adoption-stories-checkout-com.png
new file mode 100644
index 00000000000000..f6b574e1c37910
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-checkout-com.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-chime.png b/docs-website/static/img/adoption-stories/adoption-stories-chime.png
new file mode 100644
index 00000000000000..4c17b1628a36f6
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-chime.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-coursera.png b/docs-website/static/img/adoption-stories/adoption-stories-coursera.png
new file mode 100644
index 00000000000000..4f473874d0dc26
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-coursera.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-geotab.png b/docs-website/static/img/adoption-stories/adoption-stories-geotab.png
new file mode 100644
index 00000000000000..2b3c8a158273a9
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-geotab.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-grofers.png b/docs-website/static/img/adoption-stories/adoption-stories-grofers.png
new file mode 100644
index 00000000000000..51af8a3ad69d7b
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-grofers.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-hurb.png b/docs-website/static/img/adoption-stories/adoption-stories-hurb.png
new file mode 100644
index 00000000000000..b7b8bae5d8c321
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-hurb.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-mediamarkt-saturn.png b/docs-website/static/img/adoption-stories/adoption-stories-mediamarkt-saturn.png
new file mode 100644
index 00000000000000..ac2f524a7a0e77
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-mediamarkt-saturn.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-netflix.png b/docs-website/static/img/adoption-stories/adoption-stories-netflix.png
new file mode 100644
index 00000000000000..de65a4c59419b5
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-netflix.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-optum.png b/docs-website/static/img/adoption-stories/adoption-stories-optum.png
new file mode 100644
index 00000000000000..051abaa96a0e01
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-optum.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-pinterest.png b/docs-website/static/img/adoption-stories/adoption-stories-pinterest.png
new file mode 100644
index 00000000000000..e005ea6d5750aa
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-pinterest.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-saxo-bank.png b/docs-website/static/img/adoption-stories/adoption-stories-saxo-bank.png
new file mode 100644
index 00000000000000..333003d146cf5e
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-saxo-bank.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-viasat.png b/docs-website/static/img/adoption-stories/adoption-stories-viasat.png
new file mode 100644
index 00000000000000..b6f633450296c6
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-viasat.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-visa.png b/docs-website/static/img/adoption-stories/adoption-stories-visa.png
new file mode 100644
index 00000000000000..11d732faf85fec
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-visa.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-wolt.png b/docs-website/static/img/adoption-stories/adoption-stories-wolt.png
new file mode 100644
index 00000000000000..43501a1f2f6d57
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-wolt.png differ
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-zynga.png b/docs-website/static/img/adoption-stories/adoption-stories-zynga.png
new file mode 100644
index 00000000000000..94ee9e9b2fb8ee
Binary files /dev/null and b/docs-website/static/img/adoption-stories/adoption-stories-zynga.png differ
diff --git a/docs-website/static/img/adoption-stories/img.png b/docs-website/static/img/adoption-stories/img.png
new file mode 100644
index 00000000000000..4d4971018c3982
Binary files /dev/null and b/docs-website/static/img/adoption-stories/img.png differ
diff --git a/docs-website/static/img/assets/business.jpg b/docs-website/static/img/assets/business.jpg
deleted file mode 100644
index f5a91928ee2ad8..00000000000000
Binary files a/docs-website/static/img/assets/business.jpg and /dev/null differ
diff --git a/docs-website/static/img/assets/data-discovery.svg b/docs-website/static/img/assets/data-discovery.svg
new file mode 100644
index 00000000000000..1a6c6f36a231ae
--- /dev/null
+++ b/docs-website/static/img/assets/data-discovery.svg
@@ -0,0 +1,4 @@
+<svg width="80" height="84" viewBox="0 0 80 84" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.4011 19.255C20.4011 20.2678 21.2222 21.0888 22.235 21.0888H38.7393C39.752 21.0888 40.5731 20.2678 40.5731 19.255V11.2321H48.596L48.596 49.2837H40.5731V41.2607C40.5731 40.248 39.752 39.4269 38.7393 39.4269H22.235C21.2222 39.4269 20.4011 40.248 20.4011 41.2607V47.0221L20.4082 47.0232V47.0464C20.4082 48.1735 21.3219 49.0872 22.449 49.0872C23.5761 49.0872 24.4898 48.1735 24.4898 47.0464V43.553H36.447V56.4341H35.5102C34.3831 56.4341 33.4694 57.3478 33.4694 58.4749C33.4694 59.6021 34.3831 60.5158 35.5102 60.5158H38.7393C39.752 60.5158 40.5731 59.6947 40.5731 58.6819V53.4097H48.8252C50.9774 53.4097 52.7221 51.6651 52.7221 49.5129L52.7221 11.2321H60.745V19.255C60.745 20.2678 61.566 21.0888 62.5788 21.0888H78.1662C79.179 21.0888 80 20.2678 80 19.255V1.83381C80 0.821024 79.179 0 78.1662 0H62.5788C61.566 0 60.745 0.821026 60.745 1.83381V7.10602H40.5731V1.83381C40.5731 0.821024 39.752 0 38.7393 0H22.235C21.2222 0 20.4011 0.821026 20.4011 1.83381V19.255ZM24.5272 4.12607V16.9628H36.447V4.12607H24.5272ZM64.8711 4.12607V16.9628H75.8739V4.12607H64.8711Z" fill="#19B5FF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.9424 52.142C11.8741 52.142 6.25163 58.0328 6.25163 65.1649C6.25163 67.9796 7.12378 70.5938 8.61121 72.7298L0.650482 80.2086C-0.179932 80.9887 -0.220688 82.2943 0.559448 83.1247C1.33958 83.9551 2.64519 83.9959 3.4756 83.2158L11.4779 75.6979C13.5675 77.2593 16.1471 78.1878 18.9424 78.1878C26.0108 78.1878 31.6332 72.2969 31.6332 65.1649C31.6332 58.0328 26.0108 52.142 18.9424 52.142ZM10.3777 65.1649C10.3777 60.191 14.2717 56.268 18.9424 56.268C23.6132 56.268 27.5072 60.191 27.5072 65.1649C27.5072 70.1388 23.6132 74.0617 18.9424 74.0617C16.598 74.0617 14.4662 73.0849 12.9085 71.4785C11.3498 69.871 10.3777 67.6428 10.3777 65.1649Z" fill="#19B5FF"/>
+</svg>
diff --git a/docs-website/static/img/assets/data-governance.svg b/docs-website/static/img/assets/data-governance.svg
new file mode 100644
index 00000000000000..b1db48e3e76bfe
--- /dev/null
+++ b/docs-website/static/img/assets/data-governance.svg
@@ -0,0 +1,6 @@
+<svg width="80" height="84" viewBox="0 0 80 84" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M38.7611 0.611499C37.863 -0.203824 36.4894 -0.203834 35.5913 0.611475C27.7893 7.69424 17.5001 11.9917 6.22222 11.9917C5.4609 11.9917 4.7043 11.9721 3.95286 11.9335C2.8327 11.8759 1.82744 12.6139 1.55109 13.6968C0.53819 17.6659 0 21.826 0 26.11C0 49.1203 15.5191 68.4907 36.58 73.989C37.837 74.3171 39.1231 73.5681 39.4526 72.3159C39.782 71.0637 39.03 69.7826 37.773 69.4544C18.7816 64.4965 4.70588 46.9889 4.70588 26.11C4.70588 22.8716 5.04433 19.7159 5.68651 16.6765C5.86486 16.6784 6.04343 16.6794 6.22222 16.6794C17.9765 16.6794 28.7593 12.4642 37.1762 5.4545C45.5932 12.4644 56.3762 16.6799 68.1307 16.6799C68.3095 16.6799 68.4881 16.6789 68.6665 16.677C69.3086 19.7162 69.6471 22.8718 69.6471 26.11C69.6471 30.6585 68.9794 35.0443 67.7399 39.174C67.3677 40.4142 68.0752 41.7202 69.3203 42.091C70.5653 42.4618 71.8764 41.757 72.2486 40.5168C73.6176 35.9555 74.3529 31.1176 74.3529 26.11C74.3529 21.8262 73.8148 17.6663 72.802 13.6972C72.5256 12.6144 71.5204 11.8763 70.4002 11.934C69.6487 11.9726 68.8921 11.9922 68.1307 11.9922C56.8526 11.9922 46.5632 7.69454 38.7611 0.611499Z" fill="#F44A64"/>
+<path d="M50.4631 31.677C51.3736 30.7534 51.3601 29.2694 50.433 28.3624C49.5059 27.4554 48.0161 27.4688 47.1056 28.3923L33.3072 42.3881L27.2474 36.2416C26.3368 35.318 24.8471 35.3046 23.9199 36.2116C22.9928 37.1186 22.9793 38.6026 23.8899 39.5262L31.6284 47.3754C32.0709 47.8242 32.6758 48.077 33.3072 48.077C33.9386 48.077 34.5435 47.8242 34.9859 47.3754L50.4631 31.677Z" fill="#F44A64"/>
+<path d="M64.9412 69.8466C64.9412 68.5521 63.8877 67.5028 62.5882 67.5028C61.2887 67.5028 60.2353 68.5521 60.2353 69.8466V73.5968C60.2353 74.8912 61.2887 75.9406 62.5882 75.9406C63.8877 75.9406 64.9412 74.8912 64.9412 73.5968V69.8466Z" fill="#F44A64"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.5882 45.0018C57.1304 45.0018 52.7059 49.4092 52.7059 54.846V60.0025H51.2941C47.9154 60.0025 45.1765 62.7308 45.1765 66.0965V77.3469C45.1765 80.7125 47.9154 83.4409 51.2941 83.4409H73.8824C77.261 83.4409 80 80.7125 80 77.3469V66.0965C80 62.7308 77.261 60.0025 73.8824 60.0025H72.4706V54.846C72.4706 49.4092 68.0461 45.0018 62.5882 45.0018ZM67.7647 54.846V60.0025H57.4118V54.846C57.4118 51.9982 59.7293 49.6895 62.5882 49.6895C65.4471 49.6895 67.7647 51.9982 67.7647 54.846ZM49.8824 66.0965C49.8824 65.3198 50.5144 64.6902 51.2941 64.6902H73.8824C74.6621 64.6902 75.2941 65.3198 75.2941 66.0965V77.3469C75.2941 78.1236 74.6621 78.7532 73.8824 78.7532H51.2941C50.5144 78.7532 49.8824 78.1236 49.8824 77.3469V66.0965Z" fill="#F44A64"/>
+</svg>
diff --git a/docs-website/static/img/assets/data-ob.svg b/docs-website/static/img/assets/data-ob.svg
new file mode 100644
index 00000000000000..d630b0a2333a2d
--- /dev/null
+++ b/docs-website/static/img/assets/data-ob.svg
@@ -0,0 +1,8 @@
+<svg width="80" height="87" viewBox="0 0 80 87" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.9885 10.5674C22.9885 7.28562 25.6134 4.63936 28.8342 4.63936H51.5809C52.0485 4.63936 52.4987 4.82742 52.832 5.16486L74.88 27.4924C75.2135 27.8301 75.4023 28.2899 75.4023 28.7711V68.3017C75.4023 71.5835 72.7774 74.2298 69.5567 74.2298H47.3563C46.0867 74.2298 45.0575 75.2683 45.0575 76.5495C45.0575 77.8306 46.0867 78.8692 47.3563 78.8692H69.5567C75.3321 78.8692 80 74.1301 80 68.3017V28.7711C80 27.0649 79.3308 25.4268 78.1369 24.2178L56.0888 1.89021C54.8947 0.680896 53.2733 0 51.5809 0H28.8342C23.0587 0 18.3908 4.73903 18.3908 10.5674V48.7133C18.3908 49.9944 19.42 51.033 20.6897 51.033C21.9593 51.033 22.9885 49.9944 22.9885 48.7133V10.5674Z" fill="#EFB402"/>
+<path d="M63.711 29.7435C63.711 28.4623 62.6818 27.4238 61.4122 27.4238C60.1425 27.4238 59.1133 28.4623 59.1133 29.7435V54.4867C59.1133 55.7679 60.1425 56.8064 61.4122 56.8064C62.6818 56.8064 63.711 55.7679 63.711 54.4867V29.7435Z" fill="#EFB402"/>
+<path d="M51.4943 37.9912C51.4943 36.7101 50.465 35.6715 49.1954 35.6715C47.9258 35.6715 46.8966 36.7101 46.8966 37.9912V54.4867C46.8966 55.7679 47.9258 56.8064 49.1954 56.8064C50.465 56.8064 51.4943 55.7679 51.4943 54.4867V37.9912Z" fill="#EFB402"/>
+<path d="M39.2775 46.239C39.2775 44.9579 38.2483 43.9193 36.9787 43.9193C35.709 43.9193 34.6798 44.9579 34.6798 46.239V54.4867C34.6798 55.7679 35.709 56.8064 36.9787 56.8064C38.2483 56.8064 39.2775 55.7679 39.2775 54.4867V46.239Z" fill="#EFB402"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.8469 63.0953C15.5302 63.0953 12.0308 66.6264 12.0308 70.9822C12.0308 75.3381 15.5302 78.8692 19.8469 78.8692C24.1636 78.8692 27.663 75.3381 27.663 70.9822C27.663 66.6264 24.1636 63.0953 19.8469 63.0953ZM16.6285 70.9822C16.6285 69.1887 18.0694 67.7347 19.8469 67.7347C21.6244 67.7347 23.0653 69.1887 23.0653 70.9822C23.0653 72.7758 21.6244 74.2298 19.8469 74.2298C18.0694 74.2298 16.6285 72.7758 16.6285 70.9822Z" fill="#EFB402"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.8477 55.6723C10.5802 55.6723 2.74141 61.8191 0.105636 70.2871C-0.0352103 70.7396 -0.0352121 71.2248 0.105631 71.6773C2.74136 80.1453 10.5802 86.2921 19.8477 86.2921C29.1153 86.2921 36.954 80.1453 39.5898 71.6774C39.7306 71.2249 39.7306 70.7397 39.5898 70.2872C36.9541 61.8192 29.1153 55.6723 19.8477 55.6723ZM19.8477 81.6528C12.9016 81.6528 6.97807 77.2102 4.7258 70.9822C6.9781 64.7542 12.9016 60.3117 19.8477 60.3117C26.7939 60.3117 32.7174 64.7542 34.9696 70.9823C32.7173 77.2103 26.7939 81.6528 19.8477 81.6528Z" fill="#EFB402"/>
+</svg>
diff --git a/docs-website/static/img/assets/netflix.jpg b/docs-website/static/img/assets/netflix.jpg
deleted file mode 100644
index 8b555f5b63187f..00000000000000
Binary files a/docs-website/static/img/assets/netflix.jpg and /dev/null differ
diff --git a/docs-website/static/img/assets/phonecall.jpg b/docs-website/static/img/assets/phonecall.jpg
deleted file mode 100644
index 87e48f28213827..00000000000000
Binary files a/docs-website/static/img/assets/phonecall.jpg and /dev/null differ
diff --git a/docs-website/static/img/assets/travel.jpg b/docs-website/static/img/assets/travel.jpg
deleted file mode 100644
index de2697f5631217..00000000000000
Binary files a/docs-website/static/img/assets/travel.jpg and /dev/null differ
diff --git a/docs-website/static/img/cloud-bg.png b/docs-website/static/img/cloud-bg.png
new file mode 100644
index 00000000000000..392aec2ff936c5
Binary files /dev/null and b/docs-website/static/img/cloud-bg.png differ
diff --git a/docs-website/static/img/logos/companies/checkout-com.svg b/docs-website/static/img/logos/companies/checkout-com.svg
new file mode 100644
index 00000000000000..1eae8d3dbd4067
--- /dev/null
+++ b/docs-website/static/img/logos/companies/checkout-com.svg
@@ -0,0 +1,22 @@
+<svg width="155" height="20" viewBox="0 0 155 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_82_38001)">
+<path d="M7.14228 18.7782L11.4422 11.2287L15.7421 18.7782H7.14228ZM6.07987 1.82767L10.7347 10.001L6.07987 18.1743L1.29734 10.001L6.07987 1.82767ZM11.4422 8.77407L7.14064 1.22291H15.7421L11.4422 8.77407ZM12.1406 10.0018L17.3151 0.914737C17.4815 0.6223 17.381 0.248678 17.0895 0.0813344C16.9981 0.0283148 16.8935 0.000976562 16.788 0.000976562H6.09469C5.87974 0.000976562 5.68043 0.116129 5.57172 0.302526L0.0833874 9.69197C-0.0277958 9.88251 -0.0277958 10.1194 0.0833874 10.31L5.57172 19.6994C5.68043 19.8867 5.87974 20.001 6.09469 20.001H16.788C17.1232 20.001 17.395 19.7276 17.3958 19.3904C17.3958 19.2836 17.3687 19.1792 17.316 19.0864L12.1406 10.0001V10.0018Z" fill="black"/>
+<path d="M26.3339 15.3404C25.6692 15.0587 25.0705 14.6404 24.5747 14.1127C24.083 13.5783 23.7025 12.9512 23.4546 12.2669C23.1878 11.5346 23.0544 10.7608 23.0601 9.98127C23.0535 9.20337 23.1837 8.43044 23.4439 7.69811C23.6844 7.01548 24.0583 6.38836 24.5426 5.85237C25.0227 5.32383 25.6066 4.90133 26.2573 4.61055C26.9705 4.30071 27.7414 4.14745 28.518 4.15988C29.1703 4.15077 29.8192 4.25184 30.4386 4.45977C30.978 4.64368 31.4796 4.92369 31.921 5.28655C32.341 5.6378 32.6894 6.06776 32.9456 6.55322C33.2149 7.06685 33.3985 7.62107 33.4891 8.19434H30.6544C30.5662 7.72794 30.3315 7.30212 29.9831 6.98152C29.6175 6.65346 29.1398 6.48032 28.6498 6.49937C27.7677 6.49937 27.1064 6.81003 26.6658 7.43218C26.2252 8.05434 26.0044 8.90182 26.0036 9.97464C26.0036 11.0193 26.2136 11.8602 26.6336 12.4964C27.0537 13.1326 27.7117 13.4516 28.6061 13.4516C29.1349 13.4739 29.6554 13.3107 30.0787 12.991C30.4649 12.6828 30.7071 12.2139 30.8034 11.5843H33.5987C33.5221 12.7259 33.0057 13.7929 32.1582 14.5567C31.7143 14.9502 31.2004 15.2559 30.6437 15.4572C30.0111 15.6859 29.3424 15.7985 28.6695 15.7894C27.8682 15.8027 27.0734 15.6494 26.333 15.3387L26.3339 15.3404Z" fill="black"/>
+<path d="M38.1085 5.90044C38.447 5.37025 38.8983 4.92206 39.4304 4.58821C39.9138 4.2966 40.5323 4.15079 41.2867 4.15079C41.8188 4.14334 42.3458 4.24938 42.8334 4.46311C43.2839 4.66194 43.6875 4.95354 44.0177 5.32054C44.3529 5.70079 44.614 6.14152 44.7861 6.61952C44.9764 7.15303 45.0702 7.71636 45.0628 8.28301V15.473H42.1647V8.71131C42.1885 8.18112 42.0139 7.66086 41.6746 7.25327C41.3468 6.88131 40.8774 6.69491 40.2663 6.69491C39.6585 6.67834 39.0746 6.93433 38.6719 7.39328C38.2518 7.85886 38.041 8.47024 38.041 9.22742V15.4721H35.1428V0.12793H38.041V5.90044H38.1094H38.1085Z" fill="black"/>
+<path d="M50.2942 7.04759C49.8964 7.47009 49.6329 8.04585 49.5044 8.77487H54.3709C54.3561 8.14029 54.109 7.53305 53.6783 7.06913C53.2517 6.63089 52.6612 6.39396 52.0526 6.41467C51.2792 6.41467 50.6945 6.62592 50.2975 7.04759H50.2942ZM49.8594 15.341C48.4972 14.7835 47.4463 13.6552 46.9801 12.2518C46.7273 11.5137 46.6005 10.7366 46.6062 9.95621C46.6005 9.17666 46.7339 8.40208 47.0007 7.67057C47.247 6.99126 47.6242 6.36745 48.1109 5.8356C49.1149 4.74952 50.5289 4.14145 52.0031 4.16216C52.802 4.14642 53.5943 4.31128 54.3215 4.64431C54.9812 4.95994 55.5585 5.42635 56.0066 6.00708C56.4801 6.63172 56.8318 7.34168 57.041 8.09887C57.2839 8.97535 57.4017 9.88248 57.3918 10.7929H49.4649C49.5777 11.6504 49.8676 12.3222 50.3346 12.8093C50.8015 13.2965 51.4448 13.5392 52.265 13.5384C52.8333 13.5384 53.2879 13.4157 53.6305 13.1738C53.9723 12.9286 54.2326 12.584 54.3767 12.1872H57.2362C57.1349 12.6768 56.9504 13.1448 56.691 13.5707C56.4225 14.013 56.0757 14.4016 55.6681 14.718C55.2209 15.0618 54.7201 15.3261 54.1856 15.5026C53.5729 15.703 52.9313 15.8008 52.2873 15.7942C51.4563 15.8099 50.6302 15.6558 49.8602 15.3427L49.8594 15.341Z" fill="black"/>
+<path d="M61.7363 15.3427C61.0709 15.061 60.4713 14.6427 59.9755 14.115C59.4846 13.5798 59.1041 12.9527 58.8554 12.2692C58.5886 11.5369 58.4552 10.7631 58.4609 9.98358C58.4543 9.20568 58.5845 8.43275 58.8447 7.70042C59.0852 7.01779 59.4591 6.39067 59.9434 5.85468C60.4252 5.32862 61.0099 4.90861 61.6605 4.62031C62.3738 4.31048 63.1446 4.15722 63.9213 4.16964C64.5735 4.16053 65.2225 4.2616 65.8418 4.46954C66.3813 4.65345 66.8828 4.93346 67.3243 5.29631C67.7451 5.64757 68.0927 6.07752 68.3488 6.56298C68.6181 7.07661 68.8018 7.63083 68.8924 8.20411H66.0552C65.967 7.7377 65.7323 7.31189 65.3839 6.99128C65.0183 6.66322 64.5406 6.49008 64.0506 6.50914C63.1685 6.50914 62.5072 6.8198 62.0666 7.44195C61.6259 8.0641 61.4052 8.91159 61.4044 9.98441C61.4044 11.0291 61.6144 11.8699 62.0344 12.5062C62.4545 13.1424 63.1125 13.4613 64.0069 13.4613C64.5357 13.4837 65.0562 13.3205 65.4795 13.0007C65.8657 12.6926 66.1079 12.2237 66.2042 11.594H68.9994C68.9616 12.164 68.8141 12.7215 68.5646 13.2352C68.3192 13.7397 67.9782 14.192 67.5615 14.5665C67.1176 14.96 66.6037 15.2657 66.0469 15.467C65.4144 15.6956 64.7457 15.8083 64.0728 15.7992C63.2706 15.8099 62.4751 15.6542 61.7355 15.341L61.7363 15.3427Z" fill="black"/>
+<path d="M73.4237 11.7575V15.4705H70.5444V0.12793H73.4237V8.62515L77.306 4.46146H80.784L76.7509 8.64669L81.274 15.4705H77.754L74.6821 10.4485L73.4237 11.7575Z" fill="black"/>
+<path d="M88.8454 12.5703C89.3214 11.9126 89.5595 11.0469 89.5595 9.97403C89.5595 8.90121 89.3214 8.03219 88.8454 7.36779C88.3694 6.70338 87.6825 6.37035 86.7856 6.36952C85.8888 6.3687 85.2036 6.70173 84.7275 7.36779C84.2507 8.03219 84.0118 8.90121 84.0135 9.97403C84.0143 11.0469 84.2523 11.9126 84.7275 12.5703C85.2036 13.2289 85.8896 13.5587 86.7856 13.5587C87.6817 13.5587 88.3677 13.2298 88.8454 12.572V12.5703ZM84.4615 15.3398C83.0927 14.7665 82.0171 13.6539 81.4859 12.2613C80.9316 10.7892 80.9316 9.16383 81.4859 7.6917C82.0179 6.29911 83.0927 5.18652 84.4615 4.61159C85.9538 4.01098 87.6191 4.01098 89.1123 4.61159C90.4819 5.18818 91.5575 6.30408 92.0878 7.69916C92.6446 9.17128 92.6446 10.7975 92.0878 12.2688C91.5566 13.6614 90.481 14.774 89.1123 15.3472C87.6199 15.9479 85.9547 15.9479 84.4615 15.3472V15.3398Z" fill="black"/>
+<path d="M101.003 14.1827H100.94C100.6 14.6541 100.168 15.0509 99.6709 15.3492C99.1957 15.6283 98.5731 15.7675 97.8047 15.7675C96.5817 15.7675 95.6428 15.4096 94.9889 14.6947C94.335 13.9798 94.008 13.0138 94.008 11.7985V4.46191H96.8872V11.313C96.8872 11.9576 97.0322 12.4513 97.3221 12.7943C97.612 13.1373 98.0707 13.3087 98.6991 13.3087C99.3819 13.3087 99.9188 13.0768 100.309 12.612C100.7 12.1473 100.893 11.55 100.889 10.8193V4.46191H103.787V15.4709H101.005V14.1819L101.003 14.1827Z" fill="black"/>
+<path d="M106.62 4.46051V1.02832H109.457V4.46051H111.334V6.38579H109.457V12.2171C109.457 12.6322 109.556 12.918 109.755 13.0754C109.983 13.2419 110.261 13.3256 110.543 13.3115H111.098C111.198 13.3115 111.298 13.304 111.396 13.2899V15.4356C111.24 15.4505 111.083 15.4579 110.927 15.4571C110.77 15.472 110.579 15.4778 110.347 15.4778H109.584C109.229 15.4778 108.875 15.4381 108.528 15.3594C108.187 15.284 107.864 15.1423 107.578 14.941C107.284 14.7306 107.047 14.4506 106.886 14.1258C106.695 13.7249 106.603 13.2833 106.619 12.8384V6.38662H105.103V4.46134H106.618L106.62 4.46051Z" fill="black"/>
+<path d="M114.795 12.6475C115.654 12.6475 116.349 13.3475 116.349 14.2099C116.349 15.0723 115.654 15.7723 114.795 15.7723C113.937 15.7723 113.242 15.0723 113.242 14.2099C113.242 13.3475 113.937 12.6475 114.795 12.6475Z" fill="black"/>
+<path d="M120.532 15.3082C119.925 15.024 119.389 14.6065 118.964 14.0854C118.524 13.5395 118.194 12.9123 117.993 12.2397C117.766 11.4924 117.655 10.7145 117.662 9.93331C117.656 9.15127 117.771 8.37337 118.004 7.62695C118.212 6.95509 118.545 6.3288 118.985 5.78121C119.412 5.25764 119.952 4.83928 120.563 4.55844C121.233 4.25606 121.961 4.10695 122.696 4.12103C123.919 4.12103 124.918 4.43583 125.693 5.06378C126.468 5.69256 126.948 6.57981 127.134 7.72554H125.817C125.66 6.89628 125.315 6.27412 124.781 5.85825C124.248 5.44238 123.555 5.23444 122.702 5.2361C122.128 5.22036 121.56 5.35042 121.048 5.61221C120.595 5.85411 120.205 6.19956 119.907 6.62124C119.596 7.0719 119.371 7.57807 119.247 8.11241C119.1 8.70888 119.029 9.32192 119.033 9.93579C119.029 10.5472 119.104 11.1569 119.258 11.7492C119.391 12.2811 119.617 12.7848 119.924 13.2379C120.215 13.6604 120.603 14.0059 121.055 14.2469C121.557 14.5004 122.113 14.6255 122.675 14.6115C123.614 14.6115 124.364 14.343 124.925 13.8071C125.487 13.2702 125.825 12.5511 125.94 11.6498H127.198C127.07 12.9132 126.615 13.9114 125.832 14.6438C125.05 15.3769 123.997 15.7448 122.675 15.7489C121.937 15.7646 121.205 15.6139 120.532 15.309V15.3082Z" fill="black"/>
+<path d="M135.109 14.2678C135.574 14.03 135.975 13.6846 136.282 13.2604C136.606 12.8073 136.845 12.2978 136.986 11.7577C137.299 10.5631 137.299 9.30799 136.986 8.11339C136.844 7.57325 136.606 7.06377 136.282 6.61062C135.975 6.18646 135.574 5.841 135.109 5.60324C134.079 5.1153 132.886 5.1153 131.856 5.60324C131.394 5.84514 130.993 6.18977 130.682 6.61062C130.353 7.06211 130.11 7.5716 129.967 8.11339C129.654 9.30799 129.654 10.5631 129.967 11.7577C130.11 12.2995 130.352 12.8089 130.682 13.2604C131.334 14.1576 132.385 14.6721 133.488 14.634C134.049 14.6447 134.604 14.5188 135.107 14.2678H135.11H135.109ZM131.341 15.3083C130.721 15.025 130.171 14.6066 129.729 14.0856C129.276 13.5421 128.931 12.915 128.715 12.2398C128.245 10.7387 128.245 9.12905 128.715 7.62793C128.931 6.95276 129.276 6.32646 129.729 5.78218C130.17 5.25944 130.72 4.84191 131.341 4.55942C132.016 4.25787 132.747 4.10875 133.485 4.12201C134.22 4.10792 134.948 4.25704 135.618 4.55942C136.232 4.84523 136.776 5.26276 137.212 5.78218C137.665 6.32481 138.006 6.95193 138.216 7.62793C138.669 9.13153 138.669 10.737 138.216 12.2398C138.006 12.9158 137.665 13.5429 137.212 14.0856C136.776 14.605 136.232 15.0225 135.618 15.3083C134.948 15.6107 134.22 15.7598 133.485 15.7457C132.747 15.759 132.016 15.6099 131.341 15.3083Z" fill="black"/>
+<path d="M141.758 4.37644V6.05153H141.801C142.147 5.50311 142.605 5.03505 143.144 4.67799C143.686 4.31928 144.354 4.14034 145.151 4.14117C145.79 4.12957 146.42 4.30354 146.963 4.64403C147.504 5.00025 147.904 5.53542 148.094 6.15757H148.136C148.483 5.53873 148.989 5.02428 149.598 4.6664C150.233 4.30851 150.95 4.12791 151.678 4.142C152.122 4.13868 152.563 4.2149 152.982 4.3665C153.377 4.50982 153.737 4.73681 154.039 5.0309C154.346 5.33908 154.586 5.70856 154.743 6.11532C154.92 6.58753 155.006 7.08956 154.998 7.5949V15.4667H153.694V7.70011C153.694 6.87085 153.476 6.25947 153.043 5.86514C152.579 5.46417 151.981 5.25541 151.37 5.28192C150.975 5.27861 150.584 5.35151 150.217 5.49648C149.865 5.63732 149.542 5.84442 149.268 6.10704C148.982 6.38539 148.76 6.72256 148.617 7.09536C148.457 7.51371 148.377 7.95858 148.382 8.40759V15.4675H147.059V7.70011C147.059 6.87085 146.849 6.25947 146.43 5.86514C145.995 5.46832 145.423 5.25872 144.835 5.28192C144.437 5.28026 144.042 5.36062 143.676 5.51802C143.308 5.67377 142.972 5.89496 142.683 6.17248C142.389 6.45581 142.154 6.79464 141.991 7.16992C141.819 7.56176 141.731 7.98592 141.735 8.41505V15.4749H140.413V4.37644H141.758Z" fill="black"/>
+</g>
+<defs>
+<clipPath id="clip0_82_38001">
+<rect width="154.999" height="20" fill="white" transform="translate(0 0.000976562)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/docs-website/static/img/logos/companies/chime.png b/docs-website/static/img/logos/companies/chime.png
new file mode 100644
index 00000000000000..c94f9742eb6d55
Binary files /dev/null and b/docs-website/static/img/logos/companies/chime.png differ
diff --git a/docs-website/static/img/logos/companies/mediamarkt-saturn.png b/docs-website/static/img/logos/companies/mediamarkt-saturn.png
new file mode 100644
index 00000000000000..6e3a39e0ae34b1
Binary files /dev/null and b/docs-website/static/img/logos/companies/mediamarkt-saturn.png differ
diff --git a/docs-website/static/img/logos/companies/netflix.png b/docs-website/static/img/logos/companies/netflix.png
new file mode 100755
index 00000000000000..151775b3b17bc4
Binary files /dev/null and b/docs-website/static/img/logos/companies/netflix.png differ
diff --git a/docs-website/static/img/logos/companies/pinterest.png b/docs-website/static/img/logos/companies/pinterest.png
new file mode 100644
index 00000000000000..715c8c33fd85b4
Binary files /dev/null and b/docs-website/static/img/logos/companies/pinterest.png differ
diff --git a/docs-website/static/img/logos/companies/visa.png b/docs-website/static/img/logos/companies/visa.png
new file mode 100644
index 00000000000000..0a0198bfb76a28
Binary files /dev/null and b/docs-website/static/img/logos/companies/visa.png differ
diff --git a/docs-website/static/img/logos/platforms/prefect.svg b/docs-website/static/img/logos/platforms/prefect.svg
new file mode 100644
index 00000000000000..54c4e7f553327b
--- /dev/null
+++ b/docs-website/static/img/logos/platforms/prefect.svg
@@ -0,0 +1 @@
+<svg viewBox="-0.06000000000002065 -0.26 372.94 603.6800000000001" xmlns="http://www.w3.org/2000/svg" width="1544" height="2500"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="321.038" x2="190.456" y1="372.543" y2="236.209"><stop offset="0" stop-color="#b4c0c9"/><stop offset="1" stop-color="#94a5b2"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="18.929" x2="216.256" y1="266.734" y2="622.904"><stop offset="0" stop-color="#647989"/><stop offset="1" stop-color="#2f383e"/></linearGradient><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="125.8" x2="336.043" y1="36.466" y2="236.983"><stop offset="0" stop-color="#2edaff"/><stop offset="1" stop-color="#004bff"/></linearGradient><path d="M372.88 279.56l-186.55-93.5v190.06z" fill="url(#a)"/><path d="M210.09 363.81l-23.76-141.29v153.6zM348.97 267.48l-162.64-81.42v20.73z" fill="#0d3958" opacity=".2"/><path d="M11.23 597.97c.39-.23 171.36-83.14 171.51-83.23 2.34-1.44 3.66-1.79 3.74-5.91l-.08-322.77c-72.43 36.23-174.39 87.12-183.19 91.8-2.81 1.56-3.2 2.89-3.2 4.91v306.87c-.07 6.93.39 13.78 11.22 8.33z" fill="url(#b)"/><path d="M372.88 96.68v182.81S24.85 105.32 12.81 99.09c-8.03-4.2-8.03-8.19 0-12.69C20.2 82.26 161.42 11.82 183.07.98c2.8-1.24 3.67-1.24 6.15-.23l180.17 90.31c2.57 1.26 3.35 2.5 3.49 5.62z" fill="url(#c)"/></svg>
\ No newline at end of file
diff --git a/docs-website/static/img/logos/scrollingCompanies/acertus.webp b/docs-website/static/img/logos/scrollingCompanies/acertus.webp
new file mode 100644
index 00000000000000..20ff1c6d7d554f
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/acertus.webp differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/autoscout24.webp b/docs-website/static/img/logos/scrollingCompanies/autoscout24.webp
new file mode 100644
index 00000000000000..27b34c6f724dee
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/autoscout24.webp differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/betterup.webp b/docs-website/static/img/logos/scrollingCompanies/betterup.webp
new file mode 100644
index 00000000000000..268e019de8fd4a
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/betterup.webp differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/depop.webp b/docs-website/static/img/logos/scrollingCompanies/depop.webp
new file mode 100644
index 00000000000000..7c006bb8620607
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/depop.webp differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/dpg-media.png b/docs-website/static/img/logos/scrollingCompanies/dpg-media.png
new file mode 100644
index 00000000000000..40022ef0294d73
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/dpg-media.png differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/dpg_media.webp b/docs-website/static/img/logos/scrollingCompanies/dpg_media.webp
new file mode 100644
index 00000000000000..0d5c42847068a1
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/dpg_media.webp differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/event-callout-img.png b/docs-website/static/img/logos/scrollingCompanies/event-callout-img.png
new file mode 100644
index 00000000000000..032c34fb6a10ec
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/event-callout-img.png differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/graham-stirling.png b/docs-website/static/img/logos/scrollingCompanies/graham-stirling.png
new file mode 100644
index 00000000000000..14bb23dcef0d94
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/graham-stirling.png differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/icon-check.svg b/docs-website/static/img/logos/scrollingCompanies/icon-check.svg
new file mode 100644
index 00000000000000..83a4d0983ebe0e
--- /dev/null
+++ b/docs-website/static/img/logos/scrollingCompanies/icon-check.svg
@@ -0,0 +1,14 @@
+<svg viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.8584 10.6597C9.34368 10.6597 11.3584 8.64495 11.3584 6.15967C11.3584 3.67439 9.34368 1.65967 6.8584 1.65967C4.37312 1.65967 2.3584 3.67439 2.3584 6.15967C2.3584 8.64495 4.37312 10.6597 6.8584 10.6597Z" stroke="url(#paint0_linear_144_6564)" stroke-width="0.857327" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.86391 4.85107L6.68516 7.75657C6.58714 7.88694 6.43742 7.96842 6.27472 7.97992C6.11201 7.99143 5.95231 7.93185 5.83691 7.81657L4.71191 6.69157" stroke="url(#paint1_linear_144_6564)" stroke-width="0.857327" stroke-linecap="round" stroke-linejoin="round"/>
+<defs>
+<linearGradient id="paint0_linear_144_6564" x1="7.01118" y1="-2.91672" x2="-2.1416" y2="6.08328" gradientUnits="userSpaceOnUse">
+<stop stop-color="#20D3BD"/>
+<stop offset="0.999781" stop-color="#12839F"/>
+</linearGradient>
+<linearGradient id="paint1_linear_144_6564" x1="6.85839" y1="3.25938" x2="3.78368" y2="7.26964" gradientUnits="userSpaceOnUse">
+<stop stop-color="#20D3BD"/>
+<stop offset="0.999781" stop-color="#12839F"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/docs-website/static/img/logos/scrollingCompanies/log-saxo.svg b/docs-website/static/img/logos/scrollingCompanies/log-saxo.svg
new file mode 100644
index 00000000000000..f6ab4ae071b10c
--- /dev/null
+++ b/docs-website/static/img/logos/scrollingCompanies/log-saxo.svg
@@ -0,0 +1,16 @@
+<svg width="160" height="80" viewBox="0 0 160 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M66.6601 22.3097H70.2267L76.9315 38.0599L74.2273 42.0496L72.5313 37.9266H64.2547L62.5479 42.0694H58.2502L66.6601 22.3097ZM68.3867 27.8712L65.6716 34.4914H71.1107L68.3867 27.8712Z" fill="white"/>
+<path d="M97.768 22.3097L91.4142 31.6953L98.4557 42.0676H93.717L89.0899 35.0982L84.3403 42.0676H79.724L86.7259 31.7674L80.2803 22.3097H85.0515L89.0503 28.4059L93.1624 22.3097H97.768Z" fill="white"/>
+<path d="M47.4224 25.5379C45.5104 25.5379 44.0916 26.4021 44.0916 27.9342C44.0916 29.4057 46.0238 29.8715 48.284 30.4164C51.4691 31.1843 55.3058 32.1093 55.3047 36.227C55.3047 39.7847 51.9109 42.3755 47.3162 42.3755C43.1122 42.3755 39.9146 40.206 39 36.8338L42.9267 35.5807C43.5641 37.5341 45.0855 38.8088 47.4404 38.8088C49.5992 38.8088 51.1115 37.8834 51.1115 36.4233C51.1115 34.7443 49.044 34.2526 46.6909 33.693C43.5833 32.9539 39.9776 32.0963 39.9776 28.2295C39.9776 24.8069 43.0312 22 47.6781 22C51.1547 22 53.9904 23.6456 55.0293 26.3084L51.1547 27.747C50.5894 26.5353 49.5001 25.5379 47.4224 25.5379Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M101.09 32.1905C101.09 26.5875 105.603 22.0018 111.412 22.0018C117.22 22.0018 121.753 26.5875 121.753 32.1905C121.753 37.7934 117.22 42.3791 111.412 42.3791C105.603 42.3791 101.09 37.7934 101.09 32.1905ZM105.357 32.1887C105.357 35.9408 108.009 38.645 111.412 38.645C114.865 38.645 117.486 35.9426 117.488 32.1887C117.488 28.4365 114.867 25.7323 111.412 25.7323C108.009 25.7323 105.357 28.4365 105.357 32.1887Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M109.548 51.5471C110.176 51.5471 110.718 51.6731 111.17 51.9251C111.622 52.1772 111.972 52.5409 112.213 53.0144C112.458 53.4879 112.578 54.0515 112.578 54.7104C112.578 55.3712 112.458 55.9383 112.213 56.4118C111.968 56.8853 111.617 57.2508 111.158 57.5029C110.699 57.7549 110.149 57.8828 109.505 57.8828H107.359V51.5471H109.548ZM110.553 56.6459C110.848 56.4838 111.069 56.2408 111.217 55.9185C111.367 55.5962 111.44 55.1929 111.44 54.7068C111.44 54.2225 111.367 53.8192 111.217 53.4987C111.069 53.1782 110.85 52.9388 110.56 52.7785C110.272 52.6201 109.912 52.5391 109.483 52.5391H108.506V56.8889H109.449C109.89 56.8889 110.257 56.8079 110.553 56.6459Z" fill="white"/>
+<path d="M105.101 55.1911H102.339V56.9213H105.337V57.8828H101.192V51.5471H105.313V52.5085H102.341V54.2279H105.101V55.1911Z" fill="white"/>
+<path d="M96.2555 52.5085H94.2966V51.5471H99.3523V52.5085H97.3934V57.8828H96.2555V52.5085Z" fill="white"/>
+<path d="M91.5114 54.5034C91.7328 54.5988 91.9327 54.7176 92.1091 54.8616C92.2856 55.0075 92.4242 55.1803 92.5286 55.382C92.6312 55.5872 92.6835 55.8267 92.6835 56.1003C92.6835 56.4712 92.588 56.7971 92.399 57.0798C92.2099 57.3607 91.9345 57.5803 91.578 57.7387C91.2197 57.8954 90.7876 57.9746 90.2799 57.9746C89.7884 57.9746 89.3599 57.899 88.998 57.7459C88.6361 57.5929 88.3534 57.3697 88.15 57.078C87.9465 56.7863 87.8367 56.428 87.8205 56.0085H88.9494C88.9656 56.2282 89.034 56.4136 89.1528 56.5595C89.2716 56.7053 89.4283 56.8151 89.6209 56.8871C89.8136 56.9592 90.0296 56.9952 90.2691 56.9952C90.5175 56.9952 90.7372 56.9574 90.9262 56.8817C91.1153 56.8061 91.2629 56.7017 91.3709 56.5667C91.4772 56.4316 91.533 56.2732 91.5348 56.0913C91.5312 55.9257 91.4826 55.7889 91.3889 55.6808C91.2935 55.5728 91.1603 55.481 90.9911 55.409C90.82 55.3352 90.622 55.2704 90.3951 55.2127L89.6749 55.0273C89.1528 54.8941 88.7423 54.6906 88.4398 54.4169C88.1374 54.1433 87.9861 53.7796 87.9861 53.3259C87.9861 52.9514 88.087 52.6255 88.2904 52.3446C88.4939 52.0656 88.7693 51.8459 89.1204 51.6911C89.4715 51.5362 89.8694 51.457 90.3123 51.457C90.7606 51.457 91.1549 51.5362 91.4952 51.6911C91.8337 51.8459 92.1019 52.062 92.2946 52.3374C92.489 52.6111 92.5898 52.928 92.5952 53.2845H91.4916C91.4628 53.0144 91.3421 52.8056 91.1279 52.6543C90.9154 52.5049 90.6382 52.4293 90.2979 52.4293C90.0584 52.4293 89.8532 52.4653 89.6821 52.5373C89.5111 52.6093 89.3797 52.7083 89.2896 52.8326C89.1978 52.955 89.151 53.0972 89.1492 53.2557C89.1492 53.3871 89.1816 53.5023 89.241 53.5995C89.3004 53.6968 89.3833 53.7778 89.4895 53.8462C89.5939 53.9128 89.7109 53.9686 89.8388 54.0136C89.9666 54.0587 90.0962 54.0983 90.2259 54.1289L90.82 54.2783C91.0595 54.3323 91.2899 54.4079 91.5114 54.5034Z" fill="white"/>
+<path d="M85.7932 55.1911H83.0331L83.0313 56.9213H86.0291V57.8828H81.8845V51.5471H86.0056V52.5085H83.0331V54.2279H85.7932V55.1911Z" fill="white"/>
+<path d="M77.2069 56.5325H77.2717L78.9173 51.5471H80.1794L77.9469 57.8828H76.53L74.2992 51.5471H75.5577L77.2069 56.5325Z" fill="white"/>
+<path d="M71.3951 55.8645H71.4509L71.4491 51.5452H72.5906V57.881H71.5698L68.5847 53.5653H68.5324V57.881H67.3856V51.5452H68.4136L71.3951 55.8645Z" fill="white"/>
+<path d="M65.2683 57.881H64.1214V51.5452H65.2683V57.881Z" fill="white"/>
+<path d="M58.8317 55.1911H56.0716L56.0698 56.9213H59.0676V57.8828H54.923V51.5471H59.0442V52.5085H56.0716V54.2279H58.8317V55.1911Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M51.6984 54.6006C51.9234 54.6132 52.1395 54.6816 52.3465 54.8058C52.5536 54.9301 52.7246 55.1047 52.8543 55.3334C52.9857 55.5602 53.0523 55.8357 53.0523 56.1562C53.0523 56.4856 52.9731 56.7791 52.8147 57.0402C52.6544 57.3012 52.415 57.5065 52.0963 57.6577C51.7758 57.8072 51.3743 57.8828 50.89 57.8828H48.3262V51.5471H50.7514C51.2105 51.5471 51.5904 51.6191 51.8946 51.7613C52.1989 51.9053 52.4258 52.0998 52.5788 52.3482C52.73 52.5949 52.8057 52.8758 52.8057 53.189C52.8057 53.4483 52.757 53.668 52.658 53.8498C52.5572 54.0335 52.424 54.1811 52.2583 54.2945C52.0909 54.4097 51.9054 54.4908 51.6984 54.5394V54.6006ZM50.7081 56.9231C51.1258 56.9231 51.4247 56.8439 51.6102 56.6837C51.7938 56.5235 51.8874 56.3182 51.8874 56.0661C51.8874 55.8789 51.8406 55.7097 51.747 55.5584C51.6534 55.4072 51.5219 55.2884 51.3509 55.2001C51.1799 55.1119 50.9746 55.0687 50.7388 55.0687H49.473V56.9231H50.7081ZM50.6343 52.4941H49.4748V54.2423H50.6109C50.809 54.2423 50.9872 54.2045 51.1457 54.1325C51.3041 54.0587 51.4301 53.9542 51.5219 53.8192C51.612 53.6842 51.6588 53.5239 51.6588 53.3385C51.6588 53.0936 51.5724 52.8902 51.3995 52.7317C51.2285 52.5733 50.9728 52.4941 50.6343 52.4941Z" fill="white"/>
+</svg>
diff --git a/docs-website/static/img/logos/scrollingCompanies/myob.png b/docs-website/static/img/logos/scrollingCompanies/myob.png
new file mode 100644
index 00000000000000..c161532e650ba4
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/myob.png differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/myob.webp b/docs-website/static/img/logos/scrollingCompanies/myob.webp
new file mode 100644
index 00000000000000..509e3fba0804c5
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/myob.webp differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/notion-logo.png b/docs-website/static/img/logos/scrollingCompanies/notion-logo.png
new file mode 100644
index 00000000000000..f65884f53ead89
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/notion-logo.png differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/notion.webp b/docs-website/static/img/logos/scrollingCompanies/notion.webp
new file mode 100644
index 00000000000000..393756855d938c
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/notion.webp differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/ovo_energy.webp b/docs-website/static/img/logos/scrollingCompanies/ovo_energy.webp
new file mode 100644
index 00000000000000..3e08a80f5c5f42
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/ovo_energy.webp differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/regeneron.png b/docs-website/static/img/logos/scrollingCompanies/regeneron.png
new file mode 100644
index 00000000000000..0a660b95c6d503
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/regeneron.png differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/regeneron.webp b/docs-website/static/img/logos/scrollingCompanies/regeneron.webp
new file mode 100644
index 00000000000000..45bed965f3a01c
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/regeneron.webp differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/riskified.png b/docs-website/static/img/logos/scrollingCompanies/riskified.png
new file mode 100644
index 00000000000000..69b94b43fd56e8
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/riskified.png differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/riskified.webp b/docs-website/static/img/logos/scrollingCompanies/riskified.webp
new file mode 100644
index 00000000000000..a2a2f96d5ea7be
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/riskified.webp differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/robinhood.png b/docs-website/static/img/logos/scrollingCompanies/robinhood.png
new file mode 100644
index 00000000000000..e75535a383f324
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/robinhood.png differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/robinhood.webp b/docs-website/static/img/logos/scrollingCompanies/robinhood.webp
new file mode 100644
index 00000000000000..661c25c0dd8302
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/robinhood.webp differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/screenshot.png b/docs-website/static/img/logos/scrollingCompanies/screenshot.png
new file mode 100644
index 00000000000000..59d982c5aec6d5
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/screenshot.png differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/twilio-bg.png b/docs-website/static/img/logos/scrollingCompanies/twilio-bg.png
new file mode 100644
index 00000000000000..74dcbf88a35951
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/twilio-bg.png differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/twilio.png b/docs-website/static/img/logos/scrollingCompanies/twilio.png
new file mode 100644
index 00000000000000..f226674d0ffbce
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/twilio.png differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/twilio.webp b/docs-website/static/img/logos/scrollingCompanies/twilio.webp
new file mode 100644
index 00000000000000..5ad47d5d5c87e2
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/twilio.webp differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/xero.png b/docs-website/static/img/logos/scrollingCompanies/xero.png
new file mode 100644
index 00000000000000..653ddfb2c76869
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/xero.png differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/xero.webp b/docs-website/static/img/logos/scrollingCompanies/xero.webp
new file mode 100644
index 00000000000000..9f2b4cc0cf0f9f
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/xero.webp differ
diff --git a/docs-website/static/img/logos/scrollingCompanies/zendesk.webp b/docs-website/static/img/logos/scrollingCompanies/zendesk.webp
new file mode 100644
index 00000000000000..e790fdc2af6eda
Binary files /dev/null and b/docs-website/static/img/logos/scrollingCompanies/zendesk.webp differ
diff --git a/docs-website/versions.json b/docs-website/versions.json
index afd30a317c618b..5288c42437c779 100644
--- a/docs-website/versions.json
+++ b/docs-website/versions.json
@@ -1,3 +1,4 @@
 [
+  "0.14.0",
   "0.13.1"
 ]
diff --git a/docs-website/yarn.lock b/docs-website/yarn.lock
index a93b0e74c327db..bdbf348841de0d 100644
--- a/docs-website/yarn.lock
+++ b/docs-website/yarn.lock
@@ -3197,22 +3197,6 @@
   dependencies:
     "@types/ms" "*"
 
-"@types/eslint-scope@^3.7.3":
-  version "3.7.7"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
-  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "8.56.9"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.9.tgz#403e9ced04a34e63f1c383c5b8ee1a94442c8cc4"
-  integrity sha512-W4W3KcqzjJ0sHg2vAq9vfml6OhsJ53TcUjUqfzzZf/EChUtwspszj/S0pzMxnfRcO55/iGq47dscXw71Fxc4Zg==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
 "@types/estree-jsx@^1.0.0":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree-jsx/-/estree-jsx-1.0.5.tgz#858a88ea20f34fe65111f005a689fa1ebf70dc18"
@@ -3300,7 +3284,7 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -3674,10 +3658,10 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-import-assertions@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
-  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
+acorn-import-attributes@^1.9.5:
+  version "1.9.5"
+  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
+  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
 
 acorn-walk@^8.0.0, acorn-walk@^8.1.1:
   version "8.3.2"
@@ -4173,7 +4157,7 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.3, braces@~3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
   integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
@@ -5330,10 +5314,10 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.16.0:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787"
-  integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==
+enhanced-resolve@^5.17.1:
+  version "5.17.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
+  integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -8146,11 +8130,11 @@ micromark@^4.0.0:
     micromark-util-types "^2.0.0"
 
 micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
@@ -10866,6 +10850,11 @@ swc-loader@^0.2.6:
   dependencies:
     "@swc/counter" "^0.1.3"
 
+swiper@^11.1.4:
+  version "11.1.4"
+  resolved "https://registry.yarnpkg.com/swiper/-/swiper-11.1.4.tgz#2f8e303e8bf9e5bc40a3885fc637ae60ff27996c"
+  integrity sha512-1n7kbYJB2dFEpUHRFszq7gys/ofIBrMNibwTiMvPHwneKND/t9kImnHt6CfGPScMHgI+dWMbGTycCKGMoOO1KA==
+
 symbol-observable@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
@@ -11723,20 +11712,19 @@ webpack-sources@^3.2.2, webpack-sources@^3.2.3:
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
 webpack@^5.73.0:
-  version "5.91.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.91.0.tgz#ffa92c1c618d18c878f06892bbdc3373c71a01d9"
-  integrity sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==
+  version "5.94.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
+  integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
   dependencies:
-    "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^1.0.5"
     "@webassemblyjs/ast" "^1.12.1"
     "@webassemblyjs/wasm-edit" "^1.12.1"
     "@webassemblyjs/wasm-parser" "^1.12.1"
     acorn "^8.7.1"
-    acorn-import-assertions "^1.9.0"
+    acorn-import-attributes "^1.9.5"
     browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.16.0"
+    enhanced-resolve "^5.17.1"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
diff --git a/docs/SECURITY_STANCE.md b/docs/SECURITY_STANCE.md
new file mode 100644
index 00000000000000..a48244d741b70b
--- /dev/null
+++ b/docs/SECURITY_STANCE.md
@@ -0,0 +1,81 @@
+# DataHub's Commitment to Security
+
+## Introduction
+
+The open-source DataHub project takes security seriously. As part of our commitment to maintaining a secure environment
+for our users and contributors, we have established a comprehensive security policy. This document outlines the key
+aspects of our approach to handling security vulnerabilities and keeping our community informed.
+
+## Our Track Record
+
+We have a proactive approach to security. To date we've successfully resolved many security related issues reported by
+community members or flagged by automated scanners (which includes upstream dependencies and what known risks the
+dependencies contain), demonstrating our commitment to maintaining a secure platform. This is a testament to the
+collaborative efforts of our community in identifying and helping us address potential vulnerabilities. It truly takes
+a village.
+
+## Reporting Security Issues
+
+If you believe you've discovered a security vulnerability in DataHub, we encourage you to report it immediately. We have
+a dedicated process for handling security-related issues to ensure they're addressed promptly and discreetly.
+
+For detailed instructions on how to report a security vulnerability, including our PGP key for encrypted communications,
+please visit our official security policy page:
+
+[DataHub Security Policy](https://github.com/datahub-project/datahub/security/policy)
+
+We kindly ask that you do not disclose the vulnerability publicly until the committers have had the chance to address it
+and make an announcement.
+
+## Our Response Process
+
+Once a security issue is reported, the project follows a structured process to ensure that each report is handled with
+the attention and urgency it deserves. This includes:
+
+1. Verifying the reported vulnerability
+2. Assessing its potential impact
+3. Developing and testing a fix
+4. Releasing security patches
+5. Coordinating the public disclosure of the vulnerability
+
+All reported vulnerabilities are carefully assessed and triaged internally to ensure appropriate action is taken.
+
+## How we prioritize (and the dangers of blindly following automated scanners)
+
+While we appreciate the value of automated vulnerability detection systems like Dependabot, we want to emphasize the
+importance of critical thinking when addressing flagged issues. These systems are excellent at providing signals of
+potential vulnerabilities, but they shouldn't be followed blindly.
+
+Here's why:
+
+1. Context matters: An issue flagged might only affect a non-serving component of the stack (such as our docs-website
+   code or our CI smoke tests), which may not pose a significant risk to the overall system.
+
+2. False positives: Sometimes, these systems may flag vulnerabilities in libraries that are linked but not actively
+   used. For example, a vulnerability in an email library might be flagged even if the software never sends emails.
+
+3. Exploit feasibility: Some vulnerabilities may be technically present but extremely difficult or impractical to
+   exploit in real-world scenarios. Automated scanners often don't consider the actual implementation details or
+   security controls that might mitigate the risk. For example, a reported SQL injection vulnerability might exist in
+   theory, but if the application uses parameterized queries or has proper input validation in place, the actual risk
+   could be significantly lower than the scanner suggests.
+
+We carefully review all automated alerts in the context of our specific implementation to determine the actual risk and
+appropriate action.
+
+## Keeping the Community Informed
+
+Transparency is key in maintaining trust within our open-source community. To keep everyone informed about
+security-related matters:
+
+- We maintain Security Advisories on the DataHub project GitHub repository
+- These advisories include summaries of security issues, details on the fixes implemented, and any necessary mitigation
+  steps for users
+
+## Conclusion
+
+Security is an ongoing process, and we're committed to continuously improving our practices. By working together with
+our community of users and contributors, we aim to maintain DataHub as a secure and reliable metadata platform.
+
+We encourage all users to stay updated with our security announcements and to promptly apply any security patches
+released. Together, we can ensure a safer environment for everyone in the DataHub community.
diff --git a/docs/_feature-guide-template.md b/docs/_feature-guide-template.md
index 9c1aead5e13ab3..f03dffb957a796 100644
--- a/docs/_feature-guide-template.md
+++ b/docs/_feature-guide-template.md
@@ -5,9 +5,9 @@ import FeatureAvailability from '@site/src/components/FeatureAvailability';
 <!-- All Feature Guides should begin with `About DataHub ` to improve SEO -->
 
 <!-- 
-Update feature availability; by default, feature availabilty is Self-Hosted and Managed DataHub
+Update feature availability; by default, feature availabilty is Self-Hosted and DataHub Cloud
 
-Add in `saasOnly` for Managed DataHub-only features
+Add in `saasOnly` for DataHub Cloud-only features
  -->
 
 <FeatureAvailability/>
diff --git a/docs/actions/actions/slack.md b/docs/actions/actions/slack.md
index a89439825d2da1..73d990948812d5 100644
--- a/docs/actions/actions/slack.md
+++ b/docs/actions/actions/slack.md
@@ -136,9 +136,9 @@ In the next steps, we'll show you how to configure the Slack Action based on the
  
 ### Installation Instructions (Deployment specific)
 
-#### Managed DataHub
+#### DataHub Cloud
 
-Head over to the [Configuring Notifications](../../managed-datahub/slack/saas-slack-setup.md#configuring-notifications) section in the Managed DataHub guide to configure Slack notifications for your Managed DataHub instance.
+Head over to the [Configuring Notifications](../../managed-datahub/slack/saas-slack-setup.md#configuring-notifications) section in the DataHub Cloud guide to configure Slack notifications for your DataHub Cloud instance.
 
 
 #### Quickstart
diff --git a/docs/actions/guides/developing-a-transformer.md b/docs/actions/guides/developing-a-transformer.md
index a843dbc846cd51..6406cdfae6104b 100644
--- a/docs/actions/guides/developing-a-transformer.md
+++ b/docs/actions/guides/developing-a-transformer.md
@@ -23,7 +23,7 @@ print the configuration that is provided when it is created, and print any Event
 ```python
 # custom_transformer.py
 from datahub_actions.transform.transformer import Transformer
-from datahub_actions.event.event import EventEnvelope
+from datahub_actions.event.event_envelope import EventEnvelope
 from datahub_actions.pipeline.pipeline_context import PipelineContext
 from typing import Optional
 
@@ -75,7 +75,7 @@ Next, install the package
 pip install -e .
 ```
 
-inside the module. (alt.`python setup.py`). 
+inside the module. (alt.`python setup.py`).
 
 Once we have done this, our class will be referencable via `custom_transformer_example.custom_transformer:CustomTransformer`.
 
@@ -96,7 +96,7 @@ source:
     connection:
       bootstrap: ${KAFKA_BOOTSTRAP_SERVER:-localhost:9092}
       schema_registry_url: ${SCHEMA_REGISTRY_URL:-http://localhost:8081}
-transform: 
+transform:
   - type: "custom_transformer_example.custom_transformer:CustomTransformer"
     config:
       # Some sample configuration which should be printed on create.
@@ -130,4 +130,4 @@ it without defining the full module path.
 Prerequisites to consideration for inclusion in the core Transformer library include
 
 - **Testing** Define unit tests for your Transformer
-- **Deduplication** Confirm that no existing Transformer serves the same purpose, or can be easily extended to serve the same purpose
\ No newline at end of file
+- **Deduplication** Confirm that no existing Transformer serves the same purpose, or can be easily extended to serve the same purpose
diff --git a/docs/api/graphql/getting-started.md b/docs/api/graphql/getting-started.md
index 98aeca196600d7..dfa556051bd4d1 100644
--- a/docs/api/graphql/getting-started.md
+++ b/docs/api/graphql/getting-started.md
@@ -27,6 +27,7 @@ For more information on, please refer to the following links."
 - [Querying for Domain of a Dataset](/docs/api/tutorials/domains.md#read-domains)
 - [Querying for Glossary Terms of a Dataset](/docs/api/tutorials/terms.md#read-terms)
 - [Querying for Deprecation of a dataset](/docs/api/tutorials/deprecation.md#read-deprecation)
+- [Querying for all DataJobs that belong to a DataFlow](/docs/lineage/airflow.md#get-all-datajobs-associated-with-a-dataflow)
 
 ### Search
 
diff --git a/docs/api/tutorials/assertions.md b/docs/api/tutorials/assertions.md
index f89fe728f7e977..6837220a581c11 100644
--- a/docs/api/tutorials/assertions.md
+++ b/docs/api/tutorials/assertions.md
@@ -5,7 +5,7 @@ import TabItem from '@theme/TabItem';
 
 <FeatureAvailability saasOnly />
 
-This guide specifically covers how to use the Assertion APIs for **Acryl Cloud** native assertions, including:
+This guide specifically covers how to use the Assertion APIs for **DataHub Cloud** native assertions, including:
 
 - [Freshness Assertions](/docs/managed-datahub/observe/freshness-assertions.md)
 - [Volume Assertions](/docs/managed-datahub/observe/volume-assertions.md)
@@ -15,7 +15,7 @@ This guide specifically covers how to use the Assertion APIs for **Acryl Cloud**
 
 ## Why Would You Use Assertions APIs?
 
-The Assertions APIs allow you to create, schedule, run, and delete Assertions with Acryl Cloud.
+The Assertions APIs allow you to create, schedule, run, and delete Assertions with DataHub Cloud.
 
 ### Goal Of This Guide
 
diff --git a/docs/api/tutorials/data-contracts.md b/docs/api/tutorials/data-contracts.md
index ac19920a5c4b7b..e977345273e223 100644
--- a/docs/api/tutorials/data-contracts.md
+++ b/docs/api/tutorials/data-contracts.md
@@ -5,7 +5,7 @@ import TabItem from '@theme/TabItem';
 
 <FeatureAvailability saasOnly />
 
-This guide specifically covers how to use the Data Contract APIs with **Acryl Cloud**.
+This guide specifically covers how to use the Data Contract APIs with **DataHub Cloud**.
 
 ## Why Would You Use Data Contract APIs?
 
diff --git a/docs/api/tutorials/forms.md b/docs/api/tutorials/forms.md
index f60699ffebab58..eb555910f18eb7 100644
--- a/docs/api/tutorials/forms.md
+++ b/docs/api/tutorials/forms.md
@@ -9,34 +9,65 @@ Documentation Forms are a way for end-users to fill out all mandatory attributes
 
 Learn more about forms in the [Documentation Forms Feature Guide](../../../docs/features/feature-guides/documentation-forms.md).
 
-
 ### Goal Of This Guide
-This guide will show you how to create and read forms.
+This guide will show you how to 
+- Create, Update, Read, and Delete a form
+- Assign and Remove a form from entities
 
 ## Prerequisites
 
 For this tutorial, you need to deploy DataHub Quickstart and ingest sample data.
 For detailed information, please refer to [Datahub Quickstart Guide](/docs/quickstart.md).
 
-
 <Tabs>
 <TabItem value="CLI" label="CLI">
 
-Install the relevant CLI version. Forms are available as of CLI version `0.13.1`. The corresponding SaaS release version is `v0.2.16.5`
+Install the relevant CLI version. Forms are available as of CLI version `0.13.1`. The corresponding DataHub Cloud release version is `v0.2.16.5`
 Connect to your instance via [init](https://datahubproject.io/docs/cli/#init):
 
 1. Run `datahub init` to update the instance you want to load into
 2. Set the server to your sandbox instance, `https://{your-instance-address}/gms`
 3. Set the token to your access token
 
-
 </TabItem>
 </Tabs>
 
-
 ## Create a Form
 
 <Tabs>
+<TabItem value="graphQL" label="GraphQL">
+
+```graphql
+mutation createForm {
+  createForm(
+    input: {
+      id: "metadataInitiative2024",
+      name: "Metadata Initiative 2024",
+      description: "How we want to ensure the most important data assets in our organization have all of the most important and expected pieces of metadata filled out",
+      type: VERIFICATION,
+      prompts: [
+        {
+          id: "123",
+          title: "retentionTime",
+          description: "Apply Retention Time structured property to form",
+          type: STRUCTURED_PROPERTY,
+          structuredPropertyParams: {
+            urn: "urn:li:structuredProperty:retentionTime"
+          }
+        }
+      ],
+      actors: {
+        users: ["urn:li:corpuser:jane@email.com", "urn:li:corpuser:john@email.com"],
+        groups: ["urn:li:corpGroup:team@email.com"]
+      }
+    }
+  ) {
+    urn
+  }
+}
+```
+
+</TabItem>
 <TabItem value="CLI" label="CLI">
 
 Create a yaml file representing the forms you’d like to load. 
@@ -111,8 +142,42 @@ If successful, you should see `Created form urn:li:form:...`
 </TabItem>
 </Tabs>
 
-## Read Property Definition
+## Update Form
 
+<Tabs>
+<TabItem value="graphQL" label="GraphQL">
+
+```graphql
+mutation updateForm {
+  updateForm(
+    input: {
+      urn: "urn:li:form:metadataInitiative2024",
+      name: "Metadata Initiative 2024",
+      description: "How we want to ensure the most important data assets in our organization have all of the most important and expected pieces of metadata filled out",
+      type: VERIFICATION,
+      promptsToAdd: [
+        {
+          id: "456",
+          title: "deprecationDate",
+          description: "Deprecation date for dataset",
+          type: STRUCTURED_PROPERTY,
+          structuredPropertyParams: {
+            urn: "urn:li:structuredProperty:deprecationDate"
+          }
+        }
+      ]
+      promptsToRemove: ["123"]
+    }
+  ) {
+    urn
+  }
+}
+```
+
+</TabItem>
+</Tabs>
+
+## Read Property Definition
 
 <Tabs>
 <TabItem value="CLI" label="CLI">
@@ -146,3 +211,60 @@ If successful, you should see metadata about your form returned like below.
 
 </TabItem>
 </Tabs>
+
+## Delete Form
+
+<Tabs>
+<TabItem value="graphQL" label="GraphQL">
+
+```graphql
+mutation deleteForm {
+  deleteForm(
+    input: {
+      urn: "urn:li:form:metadataInitiative2024"
+    }
+  )
+}
+```
+</TabItem>
+</Tabs>
+
+## Assign Form to Entities
+
+For assigning a form to a given list of entities: 
+
+<Tabs>
+<TabItem value="graphQL" label="GraphQL">
+
+```graphql
+mutation batchAssignForm {
+  batchAssignForm(
+    input: {
+      formUrn: "urn:li:form:myform",
+      entityUrns: ["urn:li:dataset:mydataset1", "urn:li:dataset:mydataset2"]
+    }
+  )
+}
+```
+</TabItem>
+</Tabs>
+
+## Remove Form from Entities
+
+For removing a form from a given list of entities:
+
+<Tabs>
+<TabItem value="graphQL" label="GraphQL">
+
+```graphql
+mutation batchRemoveForm {
+  batchRemoveForm(
+    input: {
+      formUrn: "urn:li:form:myform",
+      entityUrns: ["urn:li:dataset:mydataset1", "urn:li:dataset:mydataset2"]
+    }
+  )
+}
+```
+</TabItem>
+</Tabs>
diff --git a/docs/api/tutorials/operations.md b/docs/api/tutorials/operations.md
index 70ede993ec95f6..e1d41f80e68366 100644
--- a/docs/api/tutorials/operations.md
+++ b/docs/api/tutorials/operations.md
@@ -7,7 +7,7 @@ import TabItem from '@theme/TabItem';
 
 The Operations APIs allow you to report operational changes that were made to a given Dataset or Table using the 'Operation' concept.
 These operations may be viewed on the Dataset Profile (e.g. as last modified time), accessed via the DataHub GraphQL API, or 
-used to as inputs to Acryl Cloud [Freshness Assertions](/docs/managed-datahub/observe/freshness-assertions.md). 
+used as inputs to DataHub Cloud [Freshness Assertions](/docs/managed-datahub/observe/freshness-assertions.md). 
 
 ### Goal Of This Guide
 
diff --git a/docs/api/tutorials/structured-properties.md b/docs/api/tutorials/structured-properties.md
index 940f4632f1d45f..00e992f2bd0bbf 100644
--- a/docs/api/tutorials/structured-properties.md
+++ b/docs/api/tutorials/structured-properties.md
@@ -32,7 +32,7 @@ Additionally, you need to have the following tools installed according to the me
 <Tabs>
 <TabItem value="CLI" label="CLI" default>
 
-Install the relevant CLI version. Forms are available as of CLI version `0.13.1`. The corresponding SaaS release version is `v0.2.16.5`
+Install the relevant CLI version. Forms are available as of CLI version `0.13.1`. The corresponding DataHub Cloud release version is `v0.2.16.5`
 Connect to your instance via [init](https://datahubproject.io/docs/cli/#init):
 
 - Run `datahub init` to update the instance you want to load into.
@@ -56,7 +56,33 @@ Requirements for OpenAPI are:
 The following code will create a structured property `io.acryl.privacy.retentionTime`. 
 
 <Tabs>
-<TabItem value="CLI" label="CLI" default>
+<TabItem value="graphql" label="graphQL" default>
+
+```graphql
+mutation createStructuredProperty {
+  createStructuredProperty(
+    input: {
+      id: "retentionTime",
+      qualifiedName:"retentionTime",
+      displayName: "Retention Time",
+      description: "Retention Time is used to figure out how long to retain records in a dataset",
+      valueType: "urn:li:dataType:number",
+      allowedValues: [
+        {numberValue: 30, description: "30 days, usually reserved for datasets that are ephemeral and contain pii"},
+        {numberValue: 90, description:"description: Use this for datasets that drive monthly reporting but contain pii"},
+        {numberValue: 365, description:"Use this for non-sensitive data that can be retained for longer"}
+      ],
+      cardinality: SINGLE,
+      entityTypes: ["urn:li:entityType:dataset", "urn:li:entityType:dataFlow"],
+    }
+  ) {
+    urn
+  }
+}
+```
+
+</TabItem>
+<TabItem value="CLI" label="CLI">
 
 Create a yaml file representing the properties you’d like to load. 
 For example, below file represents a property `io.acryl.privacy.retentionTime`. You can see the full example [here](https://github.com/datahub-project/datahub/blob/example-yaml-sp/metadata-ingestion/examples/structured_properties/struct_props.yaml).
@@ -132,29 +158,37 @@ curl -X 'POST' -v \
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{
+	"value": {
 		"qualifiedName": "io.acryl.privacy.retentionTime",
-	  "valueType": "urn:li:dataType:datahub.number",
-	  "description": "Retention Time is used to figure out how long to retain records in a dataset",
-	  "displayName": "Retention Time",
-	  "cardinality": "MULTIPLE",
-	  "entityTypes": [
-        "urn:li:entityType:datahub.dataset",
-        "urn:li:entityType:datahub.dataFlow"
-		  ],
-	  "allowedValues": [
-	    {
-	      "value": {"double": 30},
-	      "description": "30 days, usually reserved for datasets that are ephemeral and contain pii"
-	    },
-	    {
-	      "value": {"double": 60},
-	      "description": "Use this for datasets that drive monthly reporting but contain pii"
-	    },
-	    {
-	      "value": {"double": 365},
-	      "description": "Use this for non-sensitive data that can be retained for longer"
-	    }
-	  ]
+		"valueType": "urn:li:dataType:datahub.number",
+		"description": "Retention Time is used to figure out how long to retain records in a dataset",
+		"displayName": "Retention Time",
+		"cardinality": "MULTIPLE",
+		"entityTypes": [
+			"urn:li:entityType:datahub.dataset",
+			"urn:li:entityType:datahub.dataFlow"
+		],
+		"allowedValues": [
+			{
+				"value": {
+					"double": 30
+				},
+				"description": "30 days, usually reserved for datasets that are ephemeral and contain pii"
+			},
+			{
+				"value": {
+					"double": 60
+				},
+				"description": "Use this for datasets that drive monthly reporting but contain pii"
+			},
+			{
+				"value": {
+					"double": 365
+				},
+				"description": "Use this for non-sensitive data that can be retained for longer"
+			}
+		]
+	}
 }' | jq
 ```
 
@@ -355,7 +389,37 @@ Example Response:
 This action will set/replace all structured properties on the entity. See PATCH operations to add/remove a single property.
 
 <Tabs>
-<TabItem value="CLI" label="CLI" default>
+<TabItem value="graphQL" label="GraphQL" default>
+
+```graphql
+mutation upsertStructuredProperties {
+  upsertStructuredProperties(
+    input: {
+      assetUrn: "urn:li:mydataset1",
+      structuredPropertyInputParams: [
+        {
+          structuredPropertyUrn: "urn:li:structuredProperty:mystructuredproperty",
+          values: [
+            {
+              stringValue: "123"
+            }
+          ]
+        }
+      ]
+    }
+  ) {
+    properties {
+      structuredProperty {
+        urn
+      }
+    }
+  }
+}
+
+```
+
+</TabItem>
+<TabItem value="CLI" label="CLI">
 
 You can set structured properties to a dataset by creating a dataset yaml file with structured properties. For example, below is a dataset yaml file with structured properties in both the field and dataset level. 
 
@@ -418,14 +482,16 @@ curl -X 'POST' -v \
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{
-  "properties": [
-    {
-      "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.retentionTime",
-      "values": [
-        {"double": 60.0}
-      ]
-    }
-  ]
+	"value": {
+		"properties": [
+			{
+			  "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.retentionTime",
+			  "values": [
+				{"double": 60.0}
+			  ]
+			}
+		  ]
+	}
 }' | jq
 ```
 Example Response:
@@ -466,6 +532,31 @@ Or you can run the following command to view the properties associated with the
 datahub dataset get --urn {urn}
 ```
 
+## Remove Structured Properties From a Dataset
+
+For removing a structured property or list of structured properties from a dataset:
+
+<Tabs>
+<TabItem value="graphql" label="GraphQL" default>
+
+```graphql
+mutation removeStructuredProperties {
+  removeStructuredProperties(
+    input: {
+      assetUrn: "urn:li:mydataset1",
+      structuredPropertyUrns: ["urn:li:structuredProperty:mystructuredproperty"]
+    }
+  ) {
+    properties {
+			structuredProperty {urn}
+		}
+  }
+}
+```
+
+</TabItem>  
+</Tabs>
+
 ## Patch Structured Property Value
 
 This section will show you how to patch a structured property value - either by removing, adding, or upserting a single property.
@@ -546,23 +637,25 @@ curl -X 'POST' -v \
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{
-    "qualifiedName": "io.acryl.privacy.retentionTime02",
-    "displayName": "Retention Time 02",
-    "valueType": "urn:li:dataType:datahub.string",
-    "allowedValues": [
-        {
-            "value": {"string": "foo2"},
-            "description": "test foo2 value"
-        },
-        {
-            "value": {"string": "bar2"},
-            "description": "test bar2 value"
-        }
-    ],
-    "cardinality": "SINGLE",
-    "entityTypes": [
-        "urn:li:entityType:datahub.dataset"
-    ]
+	"value": {
+		"qualifiedName": "io.acryl.privacy.retentionTime02",
+		"displayName": "Retention Time 02",
+		"valueType": "urn:li:dataType:datahub.string",
+		"allowedValues": [
+			{
+				"value": {"string": "foo2"},
+				"description": "test foo2 value"
+			},
+			{
+				"value": {"string": "bar2"},
+				"description": "test bar2 value"
+			}
+		],
+		"cardinality": "SINGLE",
+		"entityTypes": [
+			"urn:li:entityType:datahub.dataset"
+		]
+	}
 }' | jq
 ```
 
@@ -605,24 +698,26 @@ Specically, this will set `io.acryl.privacy.retentionTime` as `60.0` and `io.acr
 
 ```shell
 curl -X 'POST' -v \
-  'http://localhost:8080/openapi/v3/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Ahive%2CSampleHiveDataset%2CPROD%29/structuredProperties' \
+  'http://localhost:8080/openapi/v3/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Ahive%2CSampleHiveDataset%2CPROD%29/structuredProperties?createIfNotExists=false' \
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{
-  "properties": [
-    {
-      "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.retentionTime",
-      "values": [
-        {"double": 60.0}
-      ]
-    },
-    {
-      "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.retentionTime02",
-      "values": [
-        {"string": "bar2"}
-      ]
-    }
-  ]
+	"value": {
+		"properties": [
+			{
+			  "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.retentionTime",
+			  "values": [
+				{"double": 60.0}
+			  ]
+			},
+			{
+			  "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.retentionTime02",
+			  "values": [
+				{"string": "bar2"}
+			  ]
+			}
+		  ]
+	}
 }' | jq
 ```
 
@@ -780,6 +875,38 @@ You can see that the first property has been removed and the second property is
 In this example, we'll add the property back with a different value, preserving the existing property.
 
 <Tabs>
+<TabItem value="graphql" label="GraphQL">
+
+```graphql
+mutation updateStructuredProperty {
+  updateStructuredProperty(
+    input: {
+      urn: "urn:li:structuredProperty:retentionTime",
+      displayName: "Retention Time",
+      description: "Retention Time is used to figure out how long to retain records in a dataset",
+      newAllowedValues: [
+        {
+          numberValue: 30,
+          description: "30 days, usually reserved for datasets that are ephemeral and contain pii"
+        },
+        {
+          numberValue: 90,
+          description: "Use this for datasets that drive monthly reporting but contain pii"
+        },
+        {
+          numberValue: 365,
+          description: "Use this for non-sensitive data that can be retained for longer"
+        }
+      ]
+    }
+  ) {
+    urn
+  }
+}
+
+```
+
+</TabItem>
 <TabItem value="OpenAPI v2" label="OpenAPI v2">
 
 ```shell
@@ -998,7 +1125,9 @@ curl -X 'POST' \
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{
-"removed": true
+	"value": {
+		"removed": true
+	}
 }' | jq
 ```
 
@@ -1019,11 +1148,13 @@ If you want to **remove the soft delete**, you can do so by either hard deleting
 
 ```shell
 curl -X 'POST' \
-  'http://localhost:8080/openapi/v3/entity/structuredProperty/urn%3Ali%3AstructuredProperty%3Aio.acryl.privacy.retentionTime/status?systemMetadata=false' \
+  'http://localhost:8080/openapi/v3/entity/structuredProperty/urn%3Ali%3AstructuredProperty%3Aio.acryl.privacy.retentionTime/status?systemMetadata=false&createIfNotExists=false' \
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{
-"removed": false
+	"value": {
+		"removed": true
+	}
 }' | jq
 ```
 
@@ -1158,34 +1289,42 @@ Change the cardinality to `SINGLE` and add a `version`.
 
 ```shell
 curl -X 'POST' -v \
-  'http://localhost:8080/openapi/v3/entity/structuredProperty/urn%3Ali%3AstructuredProperty%3Aio.acryl.privacy.retentionTime/propertyDefinition' \
+  'http://localhost:8080/openapi/v3/entity/structuredProperty/urn%3Ali%3AstructuredProperty%3Aio.acryl.privacy.retentionTime/propertyDefinition?createIfNotExists=false' \
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{
+	"value": {
 		"qualifiedName": "io.acryl.privacy.retentionTime",
-	  "valueType": "urn:li:dataType:datahub.number",
-	  "description": "Retention Time is used to figure out how long to retain records in a dataset",
-	  "displayName": "Retention Time",
-	  "cardinality": "SINGLE",
-	  "version": "20240614080000",
-	  "entityTypes": [
-        "urn:li:entityType:datahub.dataset",
-        "urn:li:entityType:datahub.dataFlow"
-		  ],
-	  "allowedValues": [
-	    {
-	      "value": {"double": 30},
-	      "description": "30 days, usually reserved for datasets that are ephemeral and contain pii"
-	    },
-	    {
-	      "value": {"double": 60},
-	      "description": "Use this for datasets that drive monthly reporting but contain pii"
-	    },
-	    {
-	      "value": {"double": 365},
-	      "description": "Use this for non-sensitive data that can be retained for longer"
-	    }
-	  ]
+		"valueType": "urn:li:dataType:datahub.number",
+		"description": "Retention Time is used to figure out how long to retain records in a dataset",
+		"displayName": "Retention Time",
+		"cardinality": "SINGLE",
+		"version": "20240614080000",
+		"entityTypes": [
+			"urn:li:entityType:datahub.dataset",
+			"urn:li:entityType:datahub.dataFlow"
+		],
+		"allowedValues": [
+			{
+				"value": {
+					"double": 30
+				},
+				"description": "30 days, usually reserved for datasets that are ephemeral and contain pii"
+			},
+			{
+				"value": {
+					"double": 60
+				},
+				"description": "Use this for datasets that drive monthly reporting but contain pii"
+			},
+			{
+				"value": {
+					"double": 365
+				},
+				"description": "Use this for non-sensitive data that can be retained for longer"
+			}
+		]
+	}
 }' | jq
 ```
 
diff --git a/docs/assertions/open-assertions-spec.md b/docs/assertions/open-assertions-spec.md
index 519e917c30587f..09dad4710a2e53 100644
--- a/docs/assertions/open-assertions-spec.md
+++ b/docs/assertions/open-assertions-spec.md
@@ -2,7 +2,7 @@
 
 DataHub is developing an open-source Data Quality Assertions Specification & Compiler that will allow you to declare data quality checks / expectations / assertions using a simple, universal
 YAML-based format, and then compile this into artifacts that can be registered or directly executed by 3rd party Data Quality tools like [Snowflake DMFs](https://docs.snowflake.com/en/user-guide/data-quality-intro), 
-dbt tests, Great Expectations or Acryl Cloud natively. 
+dbt tests, Great Expectations or DataHub Cloud natively. 
 
 Ultimately, our goal is to provide an framework-agnostic, highly-portable format for defining Data Quality checks, making it seamless to swap out the underlying
 assertion engine without service disruption for end consumers of the results of these data quality checks in catalogging tools like DataHub. 
diff --git a/docs/authentication/guides/add-users.md b/docs/authentication/guides/add-users.md
index 86dac3ea328e53..30da5c9f229f94 100644
--- a/docs/authentication/guides/add-users.md
+++ b/docs/authentication/guides/add-users.md
@@ -60,7 +60,7 @@ and many more.
 
 This option is strongly recommended for production deployments of DataHub.
 
-### Managed DataHub
+### DataHub Cloud
 
 Single Sign-On can be configured and enabled by navigating to **Settings** > **SSO** > **OIDC**. Note
 that a user must have the **Manage Platform Settings** [Platform Privilege](../../authorization/access-policies-guide.md)
diff --git a/docs/authentication/guides/sso/configure-oidc-react.md b/docs/authentication/guides/sso/configure-oidc-react.md
index 9b4af80bb0ccd3..4dd882cb9a8642 100644
--- a/docs/authentication/guides/sso/configure-oidc-react.md
+++ b/docs/authentication/guides/sso/configure-oidc-react.md
@@ -48,7 +48,7 @@ Select `Web` as the **Platform**, and `OpenID Connect` as the **Sign on method**
 Click **Create** and name your application under **General Settings** and save.
 
 - **Login Redirect URI** : `https://your-datahub-domain.com/callback/oidc`.
-- **Logout Redirect URI**. `https://your-datahub-domain.com`
+- **Logout Redirect URI**. `https://your-datahub-domain.com/login`
 
 <p align="center">
   <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/sso/okta-setup-2.png"/>
@@ -79,7 +79,12 @@ At this point, your app registration should look like the following. Finally, cl
 
 :::note Optional
 Once registration is done, you will land on the app registration **Overview** tab.  
-On the left-side navigation bar, click on **Authentication** under **Manage** and add extra redirect URIs if need be (if you want to support both local testing and Azure deployments). Finally, click **Save**.
+On the left-side navigation bar, click on **Authentication** under **Manage** and add extra redirect URIs if need be (if you want to support both local testing and Azure deployments).
+
+For logout URI:
+- **Front-channel logout URL**. `https://your-datahub-domain.com/login`
+
+Finally, click **Save**.
 
 <p align="center">
   <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/sso/azure-setup-authentication.png"/>
diff --git a/docs/authorization/access-policies-guide.md b/docs/authorization/access-policies-guide.md
index 2040d7ff79e99e..0f741a95282bd9 100644
--- a/docs/authorization/access-policies-guide.md
+++ b/docs/authorization/access-policies-guide.md
@@ -15,7 +15,9 @@ There are 2 types of Access Policy within DataHub:
   <img width="80%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/policies-select-policy-type.png"/>
 </p>
 
-**Platform** Policies determine who has platform-level Privileges on DataHub. These include:
+## Platform
+
+Policies determine who has platform-level Privileges on DataHub. These include:
 
 - Managing Users & Groups
 - Viewing the DataHub Analytics Page
@@ -31,7 +33,9 @@ A few Platform Policies in plain English include:
 - The Data Platform team should be allowed to manage users & groups, view platform analytics, & manage policies themselves
 - John from IT should be able to invite new users
 
-**Metadata** policies determine who can do what to which Metadata Entities. For example:
+## Metadata
+
+Metadata policies determine who can do what to which Metadata Entities. For example:
 
 - Who can edit Dataset Documentation & Links?
 - Who can add Owners to a Chart?
@@ -51,17 +55,14 @@ A few **Metadata** Policies in plain English include:
 
 Each of these can be implemented by constructing DataHub Access Policies.
 
-## Access Policies Setup, Prerequisites, and Permissions
-
-What you need to manage Access Policies on DataHub:
+## Using Access Policies
 
+:::note Required Access
 * **Manage Policies** Privilege
 
 This Platform Privilege allows users to create, edit, and remove all Access Policies on DataHub. Therefore, it should only be
 given to those users who will be serving as Admins of the platform. The default `Admin` role has this Privilege.
-
-
-## Using Access Policies
+:::
 
 Policies can be created by first navigating to **Settings > Permissions > Policies**.
 
@@ -270,10 +271,5 @@ Policies only affect REST APIs when the environment variable `REST_API_AUTHORIZA
 Policies are the lowest level primitive for granting Privileges to users on DataHub. 
 
 Roles are built for convenience on top of Policies. Roles grant Privileges to actors indirectly, driven by Policies
-behind the scenes. Both can be used in conjunction to grant Privileges to end users. 
-
-
-
-### Related Features
-
-- [Roles](./roles.md)
\ No newline at end of file
+behind the scenes. Both can be used in conjunction to grant Privileges to end users. For more information on roles
+please refer to [Authorization > Roles](./roles.md).
diff --git a/docs/authorization/policies.md b/docs/authorization/policies.md
index 9867ff6ab264dd..45d0b59e408337 100644
--- a/docs/authorization/policies.md
+++ b/docs/authorization/policies.md
@@ -49,14 +49,23 @@ and so on.
 
 A Metadata Policy can be broken down into 3 parts:
 
-1. **Actors**: The 'who'. Specific users, groups that the policy applies to.
+1. **Resources**: The 'which'. Resources that the policy applies to, e.g. "All Datasets".
 2. **Privileges**: The 'what'. What actions are being permitted by a policy, e.g. "Add Tags".
-3. **Resources**: The 'which'. Resources that the policy applies to, e.g. "All Datasets".
+3. **Actors**: The 'who'. Specific users, groups that the policy applies to.
 
-#### Actors
+#### Resources
+
+Resources can be associated with the policy in a number of ways.
 
-We currently support 3 ways to define the set of actors the policy applies to: a) list of users b) list of groups, and
-c) owners of the entity. You also have the option to apply the policy to all users or groups.
+1. List of resource types - The entity's type for example: dataset, chart, dashboard
+2. List of resource URNs 
+3. List of tags
+4. List of domains
+
+:::note Important Note
+The associations in the list above are an *intersection* or an _AND_ operation. For example, if the policy targets
+`1. resource type: dataset` and `3. resources tagged: 'myTag'`, it will apply to datasets that are tagged with tag 'myTag'.
+:::
 
 #### Privileges
 
@@ -64,55 +73,163 @@ Check out the list of
 privileges [here](https://github.com/datahub-project/datahub/blob/master/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java)
 . Note, the privileges are semantic by nature, and does not tie in 1-to-1 with the aspect model.
 
-All edits on the UI are covered by a privilege, to make sure we have the ability to restrict write access.
+All edits on the UI are covered by a privilege, to make sure we have the ability to restrict write access. See the
+[Reference](#Reference) section below.
+
+#### Actors
 
-We currently support the following:
+We currently support 3 ways to define the set of actors the policy applies to: 
+
+1. list of users (or all users)
+2. list of groups (or all groups)
+3. owners of the entity
+
+:::note Important Note
+Unlike resources, the definitions for actors are a union of the actors. For example, if user `1. Alice` is associated
+with the policy as well as `3. owners of the entity`. This means that Alice _OR_ any owner of
+the targeted resource(s) will be included in the policy.
+:::
+
+## Managing Policies
+
+Policies can be managed on the page **Settings > Permissions > Policies** page. The `Policies` tab will only 
+be visible to those users having the `Manage Policies` privilege.
+
+Out of the box, DataHub is deployed with a set of pre-baked Policies. The set of default policies are created at deploy 
+time and can be found inside the `policies.json` file within `metadata-service/war/src/main/resources/boot`. This set of policies serves the 
+following purposes:
+
+1. Assigns immutable super-user privileges for the root `datahub` user account (Immutable)
+2. Assigns all Platform privileges for all Users by default (Editable)
+
+The reason for #1 is to prevent people from accidentally deleting all policies and getting locked out (`datahub` super user account can be a backup)
+The reason for #2 is to permit administrators to log in via OIDC or another means outside of the `datahub` root account
+when they are bootstrapping with DataHub. This way, those setting up DataHub can start managing policies without friction. 
+Note that these privilege *can* and likely *should* be altered inside the **Policies** page of the UI.
+
+:::note Pro-Tip
+To login using the `datahub` account, simply navigate to `<your-datahub-domain>/login` and enter `datahub`, `datahub`. Note that the password can be customized for your
+deployment by changing the `user.props` file within the `datahub-frontend` module. Notice that JaaS authentication must be enabled. 
+:::note
+
+## Configuration 
+
+By default, the Policies feature is *enabled*. This means that the deployment will support creating, editing, removing, and 
+most importantly enforcing fine-grained access policies.
+
+In some cases, these capabilities are not desirable. For example, if your company's users are already used to having free reign, you
+may want to keep it that way. Or perhaps it is only your Data Platform team who actively uses DataHub, in which case Policies may be overkill.
+
+For these scenarios, we've provided a back door to disable Policies in your deployment of DataHub. This will completely hide
+the policies management UI and by default will allow all actions on the platform. It will be as though
+each user has *all* privileges, both of the **Platform** & **Metadata** flavor.
+
+To disable Policies, you can simply set the `AUTH_POLICIES_ENABLED` environment variable for the `datahub-gms` service container
+to `false`. For example in your `docker/datahub-gms/docker.env`, you'd place
+
+```
+AUTH_POLICIES_ENABLED=false
+```
+
+### REST API Authorization
+
+Policies only affect REST APIs when the environment variable `REST_API_AUTHORIZATION` is set to `true` for GMS. Some policies only apply when this setting is enabled, marked above, and other Metadata and Platform policies apply to the APIs where relevant, also specified in the table above.
+
+## Reference
+
+For a complete list of privileges see the
+privileges [here](https://github.com/datahub-project/datahub/blob/master/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java).
+
+### Platform-level privileges
 
-##### Platform-level privileges
 These privileges are for DataHub operators to access & manage the administrative functionality of the system.
 
-| Platform Privileges                           | Description                                                                                                                                                                               |
-|-----------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Generate Personal Access Tokens               | Allow actor to generate personal access tokens for use with DataHub APIs.                                                                                                                 |
-| Manage Domains                                | Allow actor to create and remove Asset Domains.                                                                                                                                           |
-| Manage Home Page Posts                        | Allow actor to create and delete home page posts                                                                                                                                          |
-| Manage Glossaries                             | Allow actor to create, edit, and remove Glossary Entities                                                                                                                                 |
-| Manage Tags                                   | Allow actor to create and remove Tags.                                                                                                                                                    |
-| Manage Business Attribute                     | Allow actor to create, update, delete Business Attribute                                                                                                                                  |
-| Manage Documentation Forms                    | Allow actor to manage forms assigned to assets to assist in documentation efforts.                                                                                                        |
-| Manage Policies                               | Allow actor to create and remove access control policies. Be careful - Actors with this privilege are effectively super users.                                                            |
-| Manage Metadata Ingestion                     | Allow actor to create, remove, and update Metadata Ingestion sources.                                                                                                                     |
-| Manage Secrets                                | Allow actor to create & remove Secrets stored inside DataHub.                                                                                                                             |
-| Manage Users & Groups                         | Allow actor to create, remove, and update users and groups on DataHub.                                                                                                                    |
-| View Analytics                                | Allow actor to view the DataHub analytics dashboard.                                                                                                                                      |
-| Manage All Access Tokens                      | Allow actor to create, list and revoke access tokens on behalf of users in DataHub. Be careful - Actors with this privilege are effectively super users that can impersonate other users. |
-| Manage User Credentials                       | Allow actor to manage credentials for native DataHub users, including inviting new users and resetting passwords                                                                          |
-| Manage Public Views                           | Allow actor to create, update, and delete any Public (shared) Views.                                                                                                                      |
-| Manage Ownership Types                        | Allow actor to create, update and delete Ownership Types.                                                                                                                                 |
-| Create Business Attribute                     | Allow actor to create new Business Attribute.                                                                                                                                             |
-| Manage Connections                            | Allow actor to manage connections to external DataHub platforms.                                                                                                                          |
-| Restore Indices API[^1]                       | Allow actor to use the Restore Indices API.                                                                                                                                               |
-| Get Timeseries index sizes API[^1]            | Allow actor to use the get Timeseries indices size API.                                                                                                                                   |
-| Truncate timeseries aspect index size API[^1] | Allow actor to use the API to truncate a timeseries index.                                                                                                                                |
-| Get ES task status API[^1]                    | Allow actor to use the get task status API for an ElasticSearch task.                                                                                                                     |
-| Enable/Disable Writeability API[^1]           | Allow actor to enable or disable GMS writeability for data migrations.                                                                                                                    |
-| Apply Retention API[^1]                       | Allow actor to apply retention using the API.                                                                                                                                             |
-| Analytics API access[^1]                      | Allow actor to use API read access to raw analytics data.                                                                                                                                 |
-| Manage Tests[^2]                              | Allow actor to create and remove Asset Tests.                                                                                                                                             |
-| View Metadata Proposals[^2]                   | Allow actor to view the requests tab for viewing metadata proposals.                                                                                                                      |
-| Create metadata constraints[^2]               | Allow actor to create metadata constraints.                                                                                                                                               |
-| Manage Platform Settings[^2]                  | Allow actor to view and change platform-level settings, like integrations & notifications.                                                                                                |
-| Manage Monitors[^2]                           | Allow actor to create, update, and delete any data asset monitors, including Custom SQL monitors. Grant with care.                                                                        |
+#### Access & Credentials
+
+| Platform Privileges                  | Description                                                                                                                                                                               |
+|--------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Generate Personal Access Tokens      | Allow actor to generate personal access tokens for use with DataHub APIs.                                                                                                                 |
+| Manage Policies                      | Allow actor to create and remove access control policies. Be careful - Actors with this privilege are effectively super users.                                                            |
+| Manage Secrets                       | Allow actor to create & remove Secrets stored inside DataHub.                                                                                                                             |
+| Manage Users & Groups                | Allow actor to create, remove, and update users and groups on DataHub.                                                                                                                    |
+| Manage All Access Tokens             | Allow actor to create, list and revoke access tokens on behalf of users in DataHub. Be careful - Actors with this privilege are effectively super users that can impersonate other users. |
+| Manage User Credentials              | Allow actor to manage credentials for native DataHub users, including inviting new users and resetting passwords                                                                          |                                                                                                                                  |
+| Manage Connections                   | Allow actor to manage connections to external DataHub platforms.                                                                                                                          |
+
+#### Product Features
+
+| Platform Privileges                 | Description                                                                                                        |
+|-------------------------------------|--------------------------------------------------------------------------------------------------------------------|
+| Manage Home Page Posts              | Allow actor to create and delete home page posts                                                                   |
+| Manage Business Attribute           | Allow actor to create, update, delete Business Attribute                                                           |
+| Manage Documentation Forms          | Allow actor to manage forms assigned to assets to assist in documentation efforts.                                 |
+| Manage Metadata Ingestion           | Allow actor to create, remove, and update Metadata Ingestion sources.                                              |
+| Manage Features                     | Umbrella privilege to manage all features.                                                                         |
+| View Analytics                      | Allow actor to view the DataHub analytics dashboard.                                                               |
+| Manage Public Views                 | Allow actor to create, update, and delete any Public (shared) Views.                                               |
+| Manage Ownership Types              | Allow actor to create, update and delete Ownership Types.                                                          |
+| Create Business Attribute           | Allow actor to create new Business Attribute.                                                                      |
+| Manage Structured Properties        | Manage structured properties in your instance.                                                                     |
+| View Tests                          | View Asset Tests.                                                                                                  |
+| Manage Tests[^2]                    | Allow actor to create and remove Asset Tests.                                                                      |
+| View Metadata Proposals[^2]         | Allow actor to view the requests tab for viewing metadata proposals.                                               |
+| Create metadata constraints[^3]     | Allow actor to create metadata constraints.                                                                        |
+| Manage Platform Settings[^2]        | Allow actor to view and change platform-level settings, like integrations & notifications.                         |
+| Manage Monitors[^2]                 | Allow actor to create, update, and delete any data asset monitors, including Custom SQL monitors. Grant with care. |
+
+[^1]: Only active if REST_API_AUTHORIZATION_ENABLED is true
+[^2]: DataHub Cloud only
+[^3]: Deprecated feature
+
+#### Entity Management
+
+| Platform Privileges                 | Description                                                                        |
+|-------------------------------------|------------------------------------------------------------------------------------|
+| Manage Domains                      | Allow actor to create and remove Asset Domains.                                    |
+| Manage Glossaries                   | Allow actor to create, edit, and remove Glossary Entities                          |
+| Manage Tags                         | Allow actor to create and remove Tags.                                             |
+
+#### System Management
+
+| Platform Privileges                           | Description                                                              |
+|-----------------------------------------------|--------------------------------------------------------------------------|
+| Restore Indices API[^1]                       | Allow actor to use the Restore Indices API.                              |                                                                                                                                                                                           |
+| Get Timeseries index sizes API[^1]            | Allow actor to use the get Timeseries indices size API.                  |
+| Truncate timeseries aspect index size API[^1] | Allow actor to use the API to truncate a timeseries index.               |
+| Get ES task status API[^1]                    | Allow actor to use the get task status API for an ElasticSearch task.    |
+| Enable/Disable Writeability API[^1]           | Allow actor to enable or disable GMS writeability for data migrations.   |
+| Apply Retention API[^1]                       | Allow actor to apply retention using the API.                            |
+| Analytics API access[^1]                      | Allow actor to use API read access to raw analytics data.                |
 
 [^1]: Only active if REST_API_AUTHORIZATION_ENABLED is true
-[^2]: Managed DataHub only
+[^2]: DataHub Cloud only
+
+### Common Metadata Privileges
 
-##### Common metadata privileges
 These privileges are to view & modify any entity within DataHub.
 
-| Common Privileges                   | Description                                                                                |
+#### Entity Privileges
+
+| Entity Privileges                   | Description                                                                                |
 |-------------------------------------|--------------------------------------------------------------------------------------------|
 | View Entity Page                    | Allow actor to view the entity page.                                                       |
+| Edit Entity                         | Allow actor to edit any information about an entity. Super user privileges for the entity. |
+| Delete                              | Allow actor to delete this entity.                                                         |
+| Create Entity                       | Allow actor to create an entity if it doesn't exist.                                       |
+| Entity Exists                       | Allow actor to determine whether the entity exists.                                        |
+| Get Timeline API[^1]                | Allow actor to use the GET Timeline API.                                                   |
+| Get Entity + Relationships API[^1]  | Allow actor to use the GET Entity and Relationships API.                                   |
+| Get Aspect/Entity Count APIs[^1]    | Allow actor to use the GET Aspect/Entity Count APIs.                                       |
+| View Entity[^2]                     | Allow actor to view the entity in search results.                                          |
+| Share Entity[^2]                    | Allow actor to share an entity with another DataHub Cloud instance.                        |
+
+[^1]: Only active if REST_API_AUTHORIZATION_ENABLED is true
+[^2]: DataHub Cloud only
+
+#### Aspect Privileges
+
+| Aspect Privileges                   | Description                                                                                |
+|-------------------------------------|--------------------------------------------------------------------------------------------|
 | Edit Tags                           | Allow actor to add and remove tags to an asset.                                            |
 | Edit Glossary Terms                 | Allow actor to add and remove glossary terms to an asset.                                  |
 | Edit Description                    | Allow actor to edit the description (documentation) of an entity.                          |
@@ -122,35 +239,57 @@ These privileges are to view & modify any entity within DataHub.
 | Edit Data Product                   | Allow actor to edit the Data Product of an entity.                                         |
 | Edit Deprecation                    | Allow actor to edit the Deprecation status of an entity.                                   |
 | Edit Incidents                      | Allow actor to create and remove incidents for an entity.                                  |
-| Edit Entity                         | Allow actor to edit any information about an entity. Super user privileges for the entity. |
 | Edit Lineage                        | Allow actor to add and remove lineage edges for this entity.                               |
 | Edit Properties                     | Allow actor to edit the properties for an entity.                                          |
 | Edit Owners                         | Allow actor to add and remove owners of an entity.                                         |
-| Delete                              | Allow actor to delete this entity.                                                         |
-| Search API[^1]                      | Allow actor to access search APIs.                                                         |
-| Get Aspect/Entity Count APIs[^1]    | Allow actor to use the GET Aspect/Entity Count APIs.                                       |
 | Get Timeseries Aspect API[^1]       | Allow actor to use the GET Timeseries Aspect API.                                          |
-| Get Entity + Relationships API[^1]  | Allow actor to use the GET Entity and Relationships API.                                   |
-| Get Timeline API[^1]                | Allow actor to use the GET Timeline API.                                                   |
+
+[^1]: Only active if REST_API_AUTHORIZATION_ENABLED is true
+[^2]: DataHub Cloud only
+
+#### Proposals
+
+| Proposals Privileges               | Description                                                                                |
+|------------------------------------|--------------------------------------------------------------------------------------------|
+| Propose Tags[^2]                   | Allow actor to propose adding a tag to an asset.                                           |
+| Propose Glossary Terms[^2]         | Allow actor to propose adding a glossary term to an asset.                                 |
+| Propose Documentation[^2]          | Allow actor to propose updates to an asset's documentation.                                |
+| Manage Tag Proposals[^2]           | Allow actor to manage a proposal to add a tag to an asset.                                 |
+| Manage Glossary Term Proposals[^2] | Allow actor to manage a proposal to add a glossary term to an asset.                       |
+| Manage Documentation Proposals[^2] | Allow actor to manage a proposal update an asset's documentation                           |
+
+[^1]: Only active if REST_API_AUTHORIZATION_ENABLED is true
+[^2]: DataHub Cloud only
+
+#### System Management
+
+| System Privileges                   | Description                                                                                |
+|-------------------------------------|--------------------------------------------------------------------------------------------|
 | Explain ElasticSearch Query API[^1] | Allow actor to use the Operations API explain endpoint.                                    |
 | Produce Platform Event API[^1]      | Allow actor to produce Platform Events using the API.                                      |
-| Create Entity                       | Allow actor to create an entity if it doesn't exist.                                       |
-| Entity Exists                       | Allow actor to determine whether the entity exists.                                        |
-| View Entity[^2]                     | Allow actor to view the entity in search results.                                          |
-| Propose Tags[^2]                    | Allow actor to propose adding a tag to an asset.                                           |
-| Propose Glossary Terms[^2]          | Allow actor to propose adding a glossary term to an asset.                                 |
-| Propose Documentation[^2]           | Allow actor to propose updates to an asset's documentation.                                |
-| Manage Tag Proposals[^2]            | Allow actor to manage a proposal to add a tag to an asset.                                 |
-| Manage Glossary Term Proposals[^2]  | Allow actor to manage a proposal to add a glossary term to an asset.                       |
-| Manage Documentation Proposals[^2]  | Allow actor to manage a proposal update an asset's documentation                           |
-| Share Entity[^2]                    | Allow actor to share an entity with another Acryl instance.                                |
 
 [^1]: Only active if REST_API_AUTHORIZATION_ENABLED is true
-[^2]: Managed DataHub only
+[^2]: DataHub Cloud only
 
-##### Specific entity-level privileges
+### Specific Entity-level Privileges
 These privileges are not generalizable.
 
+#### Users & Groups
+
+| Entity       | Privilege                                 | Description                                                                                                                                                                       |
+|--------------|-------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Group        | Edit Group Members                        | Allow actor to add and remove members to a group.                                                                                                                                 |
+| Group        | Manage Group Notification Settings[^2]    | Allow actor to manage notification settings for a group.                                                                                                                          |
+| Group        | Manage Group Subscriptions[^2]            | Allow actor to manage subscriptions for a group.                                                                                                                                  |
+| Group        | Edit Contact Information                  | Allow actor to change the contact information such as email & chat handles.                                                                                                       |
+| User         | Edit Contact Information                  | Allow actor to change the contact information such as email & chat handles.                                                                                                       |
+| User         | Edit User Profile                         | Allow actor to change the user's profile including display name, bio, title, profile image, etc.                                                                                  |
+
+[^1]: Only active if REST_API_AUTHORIZATION_ENABLED is true
+[^2]: DataHub Cloud only
+
+#### Dataset
+
 | Entity       | Privilege                                 | Description                                                                                                                                                                       |
 |--------------|-------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Dataset      | View Dataset Usage                        | Allow actor to access dataset usage information (includes usage statistics and queries).                                                                                          |
@@ -174,101 +313,22 @@ These privileges are not generalizable.
 | Domain       | Manage Data Products                      | Allow actor to create, edit, and delete Data Products within a Domain                                                                                                             |
 | GlossaryNode | Manage Direct Glossary Children           | Allow actor to create and delete the direct children of this entity.                                                                                                              |
 | GlossaryNode | Manage All Glossary Children              | Allow actor to create and delete everything underneath this entity.                                                                                                               |
-| Group        | Edit Group Members                        | Allow actor to add and remove members to a group.                                                                                                                                 |
-| Group        | Manage Group Notification Settings[^2]    | Allow actor to manage notification settings for a group.                                                                                                                          |
-| Group        | Manage Group Subscriptions[^2]            | Allow actor to manage subscriptions for a group.                                                                                                                                  |
-| Group        | Edit Contact Information                  | Allow actor to change the contact information such as email & chat handles.                                                                                                       |
-| User         | Edit Contact Information                  | Allow actor to change the contact information such as email & chat handles.                                                                                                       |
-| User         | Edit User Profile                         | Allow actor to change the user's profile including display name, bio, title, profile image, etc.                                                                                  |
-
-#### Resources
 
-Resource filter defines the set of resources that the policy applies to is defined using a list of criteria. Each
-criterion defines a field type (like type, urn, domain), a list of field values to compare, and a
-condition (like EQUALS). It essentially checks whether the field of a certain resource matches any of the input values.
-Note, that if there are no criteria or resource is not set, policy is applied to ALL resources.
-
-For example, the following resource filter will apply the policy to datasets, charts, and dashboards under domain 1.
-
-```json
-{
-    "resources": {
-      "filter": {
-        "criteria": [
-          {
-            "field": "TYPE",
-            "condition": "EQUALS",
-            "values": [
-              "dataset",
-              "chart",
-              "dashboard"
-            ]
-          },
-          {
-            "field": "DOMAIN",
-            "values": [
-              "urn:li:domain:domain1"
-            ],
-            "condition": "EQUALS"
-          }
-        ]
-      }
-    }
-}
-```
-Where `resources` is inside the `info` aspect of a Policy.
-
-Supported fields are as follows
-
-| Field Type    | Description            | Example                 |
-|---------------|------------------------|-------------------------|
-| type | Type of the resource   | dataset, chart, dataJob |
-| urn  | Urn of the resource    | urn:li:dataset:...      |
-| domain        | Domain of the resource | urn:li:domain:domainX   |
-
-## Managing Policies
 
-Policies can be managed on the page **Settings > Permissions > Policies** page. The `Policies` tab will only 
-be visible to those users having the `Manage Policies` privilege.
-
-Out of the box, DataHub is deployed with a set of pre-baked Policies. The set of default policies are created at deploy 
-time and can be found inside the `policies.json` file within `metadata-service/war/src/main/resources/boot`. This set of policies serves the 
-following purposes:
-
-1. Assigns immutable super-user privileges for the root `datahub` user account (Immutable)
-2. Assigns all Platform privileges for all Users by default (Editable)
-
-The reason for #1 is to prevent people from accidentally deleting all policies and getting locked out (`datahub` super user account can be a backup)
-The reason for #2 is to permit administrators to log in via OIDC or another means outside of the `datahub` root account
-when they are bootstrapping with DataHub. This way, those setting up DataHub can start managing policies without friction. 
-Note that these privilege *can* and likely *should* be altered inside the **Policies** page of the UI.
-
-> Pro-Tip: To login using the `datahub` account, simply navigate to `<your-datahub-domain>/login` and enter `datahub`, `datahub`. Note that the password can be customized for your
-deployment by changing the `user.props` file within the `datahub-frontend` module. Notice that JaaS authentication must be enabled. 
-
-## Configuration 
-
-By default, the Policies feature is *enabled*. This means that the deployment will support creating, editing, removing, and 
-most importantly enforcing fine-grained access policies.
-
-In some cases, these capabilities are not desirable. For example, if your company's users are already used to having free reign, you
-may want to keep it that way. Or perhaps it is only your Data Platform team who actively uses DataHub, in which case Policies may be overkill.
-
-For these scenarios, we've provided a back door to disable Policies in your deployment of DataHub. This will completely hide
-the policies management UI and by default will allow all actions on the platform. It will be as though
-each user has *all* privileges, both of the **Platform** & **Metadata** flavor.
-
-To disable Policies, you can simply set the `AUTH_POLICIES_ENABLED` environment variable for the `datahub-gms` service container
-to `false`. For example in your `docker/datahub-gms/docker.env`, you'd place
-
-```
-AUTH_POLICIES_ENABLED=false
-```
+[^1]: Only active if REST_API_AUTHORIZATION_ENABLED is true
+[^2]: DataHub Cloud only
 
-### REST API Authorization
+#### Misc
 
-Policies only affect REST APIs when the environment variable `REST_API_AUTHORIZATION` is set to `true` for GMS. Some policies only apply when this setting is enabled, marked above, and other Metadata and Platform policies apply to the APIs where relevant, also specified in the table above.
+| Entity       | Privilege                                 | Description                                                                                                                                                                       |
+|--------------|-------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Tag          | Edit Tag Color                            | Allow actor to change the color of a Tag.                                                                                                                                         |
+| Domain       | Manage Data Products                      | Allow actor to create, edit, and delete Data Products within a Domain                                                                                                             |
+| GlossaryNode | Manage Direct Glossary Children           | Allow actor to create and delete the direct children of this entity.                                                                                                              |
+| GlossaryNode | Manage All Glossary Children              | Allow actor to create and delete everything underneath this entity.                                                                                                               |
 
+[^1]: Only active if REST_API_AUTHORIZATION_ENABLED is true
+[^2]: DataHub Cloud only
 
 ## Coming Soon
 
@@ -278,7 +338,7 @@ The DataHub team is hard at work trying to improve the Policies feature. We are
 
 Under consideration
 
-- Ability to define Metadata Policies against multiple reosurces scoped to particular "Containers" (e.g. A "schema", "database", or "collection")
+- Ability to define Metadata Policies against multiple resources scoped to particular "Containers" (e.g. A "schema", "database", or "collection")
 
 ## Feedback / Questions / Concerns
 
diff --git a/docs/authorization/roles.md b/docs/authorization/roles.md
index fe41cae2bc3cc3..3e0666a7759c86 100644
--- a/docs/authorization/roles.md
+++ b/docs/authorization/roles.md
@@ -73,9 +73,9 @@ in DataHub.
 
 ### Role Privileges
 
-#### Self-Hosted DataHub and Managed DataHub
+#### Self-Hosted DataHub and DataHub Cloud
 
-These privileges are common to both Self-Hosted DataHub and Managed DataHub.
+These privileges are common to both Self-Hosted DataHub and DataHub Cloud.
 
 ##### Platform Privileges
 
@@ -146,9 +146,9 @@ These privileges are common to both Self-Hosted DataHub and Managed DataHub.
 | Explain ElasticSearch Query API    | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | The ability to use the Operations API explain endpoint.                                          |
 | Produce Platform Event API         | :heavy_check_mark: | :heavy_check_mark: | :x:                | The ability to produce Platform Events using the API.                                            |
 
-#### Managed DataHub
+#### DataHub Cloud
 
-These privileges are only relevant to Managed DataHub.
+These privileges are only relevant to DataHub Cloud.
 
 ##### Platform Privileges
 
@@ -156,10 +156,12 @@ These privileges are only relevant to Managed DataHub.
 |-----------------------------|--------------------|--------------------|--------|-----------------------------------------------------------------------------------------------------|
 | Manage Tests                | :heavy_check_mark: | :heavy_check_mark: | :x:    | Create and remove Asset Tests.                                                                      |
 | View Metadata Proposals     | :heavy_check_mark: | :heavy_check_mark: | :x:    | View the requests tab for viewing metadata proposals.                                               |
-| Create metadata constraints | :heavy_check_mark: | :heavy_check_mark: | :x:    | Create metadata constraints.                                                                        |
+| Create metadata constraints[^1] | :heavy_check_mark: | :heavy_check_mark: | :x:    | Create metadata constraints.                                                                        |
 | Manage Platform Settings    | :heavy_check_mark: | :x:                | :x:    | View and change platform-level settings, like integrations & notifications.                         |
 | Manage Monitors             | :heavy_check_mark: | :x:                | :x:    | Create, update, and delete any data asset monitors, including Custom SQL monitors. Grant with care. |
 
+[^1]: Deprecated feature
+
 ##### Metadata Privileges
 
 | Privilege                             | Admin              | Editor             | Reader             | Description                                                                                    |
@@ -177,8 +179,9 @@ These privileges are only relevant to Managed DataHub.
 | Manage Documentation Proposals        | :heavy_check_mark: | :heavy_check_mark: | :x:                | The ability to manage a proposal update an asset's documentation                               |
 | Manage Group Notification Settings    | :heavy_check_mark: | :heavy_check_mark: | :x:                | The ability to manage notification settings for a group.                                       |
 | Manage Group Subscriptions            | :heavy_check_mark: | :heavy_check_mark: | :x:                | The ability to manage subscriptions for a group.                                               |
+| Manage User Subscriptions             | :heavy_check_mark: | :x:                | :x:                | The ability to manage subscriptions for another user.                                          |
 | Manage Data Contract Proposals        | :heavy_check_mark: | :heavy_check_mark: | :x:                | The ability to manage a proposal for a Data Contract                                           |
-| Share Entity                          | :heavy_check_mark: | :heavy_check_mark: | :x:                | The ability to share an entity with another Acryl instance.                                    |
+| Share Entity                          | :heavy_check_mark: | :heavy_check_mark: | :x:                | The ability to share an entity with another DataHub Cloud instance.                                    |
 
 ## Additional Resources
 
diff --git a/docs/automations/docs-propagation.md b/docs/automations/docs-propagation.md
new file mode 100644
index 00000000000000..a637afcde4dca7
--- /dev/null
+++ b/docs/automations/docs-propagation.md
@@ -0,0 +1,128 @@
+# Documentation Propagation Automation
+
+## Introduction
+
+Documentation Propagation is an automation automatically propagates column and asset (coming soon) descriptions based on downstream column-level lineage and sibling relationships. 
+It simplifies metadata management by ensuring consistency and reducing the manual effort required for documenting data assets to aid
+in Data Governance & Compliance along with Data Discovery. 
+
+This feature is enabled by default in Open Source DataHub.
+
+## Capabilities
+
+### Open Source
+- **Column-Level Docs Propagation**: Automatically propagate documentation to downstream columns and sibling columns that are derived or dependent on the source column.
+- **(Coming Soon) Asset-Level Docs Propagation**: Propagate descriptions to sibling assets. 
+
+### DataHub Cloud (Acryl)
+- Includes all the features of Open Source.
+- **Propagation Rollback (Undo)**: Offers the ability to undo any propagation changes, providing a safety net against accidental updates.
+- **Historical Backfilling**: Automatically backfills historical data for newly documented columns to maintain consistency across time.
+
+### Comparison of Features
+
+| Feature                         | Open Source | DataHub Cloud |
+|---------------------------------|-------------|---------------|
+| Column-Level Docs Propagation   | ✔️           | ✔️             |
+| Asset-Level Docs Propagation    | ✔️           | ✔️             |
+| Downstream Lineage + Siblings   | ✔️           | ✔️             |
+| Propagation Rollback (Undo)     | ❌           | ✔️             |
+| Historical Backfilling          | ❌           | ✔️             |
+
+## Enabling Documentation Propagation
+
+### In Open Source
+
+Notice that the user must have the `Manage Ingestion` permission to view and enable the feature.
+
+1. **Navigate to Settings**: Click on the 'Settings' gear in top navigation bar.
+
+<p align="left">
+  <img width="15%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/oss/settings-nav-link.png"/>
+</p>
+
+2. **Navigate to Features**: Click on the 'Features' tab in the left-hand navigation bar.
+
+<p align="left">
+  <img width="20%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/oss/features-settings-link.png"/>
+</p>
+
+3**Enable Documentation Propagation**: Locate the 'Documentation Propagation' section and toggle the feature to enable it for column-level and asset-level propagation. 
+Currently, Column Level propagation is supported, with asset level propagation coming soon. 
+
+<p align="left">
+  <img width="40%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/oss/docs-propagation/feature-flags.png"/>
+</p>
+
+
+### In DataHub Cloud
+
+1. **Navigate to Automations**: Click on 'Govern' > 'Automations' in the navigation bar.
+
+<p align="left">
+  <img width="20%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/saas/automations-nav-link.png"/>
+</p>
+
+2. **Create An Automation**: Click on 'Create' and select 'Column Documentation Propagation'.
+
+<p align="left">
+  <img width="30%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/saas/docs-propagation/automation-type.png"/>
+</p>
+
+3. **Configure Automation**: Fill in the required fields, such as the name, description, and category. Finally, click 'Save and Run' to start the automation
+
+<p align="left">
+  <img width="30%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/saas/docs-propagation/automation-form.png"/>
+</p>
+
+## Propagating for Existing Assets (DataHub Cloud Only)
+
+In DataHub Cloud, you can back-fill historical data for existing assets to ensure that all existing column descriptions are propagated to downstreams
+when you start the automation. Note that it may take some time to complete the initial back-filling process, depending on the number of assets and the complexity of your lineage.
+
+To do this, navigate to the Automation you created in Step 3 above, click the 3-dot "more" menu:
+
+<p align="left">
+  <img width="15%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/saas/automation-more-menu.png"/>
+</p>
+
+and then click "Initialize".
+
+<p align="left">
+  <img width="15%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/saas/automation-initialize.png"/>
+</p>
+
+This one-time step will kick off the back-filling process for existing descriptions. If you only want to begin propagating
+descriptions going forward, you can skip this step. 
+
+## Rolling Back Propagated Descriptions (DataHub Cloud Only)
+
+In DataHub Cloud, you can rollback all descriptions that have been propagated historically.
+
+This feature allows you to "clean up" or "undo" any accidental propagation that may have occurred automatically, in the case
+that you no longer want propagated descriptions to be visible. 
+
+To do this, navigate to the Automation you created in Step 3 above, click the 3-dot "More" menu
+
+<p align="left">
+  <img width="15%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/saas/automation-more-menu.png"/>
+</p>
+
+and then click "Rollback".
+
+<p align="left">
+  <img width="15%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/saas/automation-rollback.png"/>
+</p>
+
+This one-time step will remove all propagated tags and glossary terms from Snowflake. To simply stop propagating new tags, you can disable the automation.
+
+## Viewing Propagated Descriptions
+
+Once the automation is enabled, you'll be able to recognize propagated descriptions as those with the thunderbolt icon next to them:
+
+The tooltip will provide additional information, including where the description originated and any intermediate hops that were 
+used to propagate the description.
+
+<p align="left">
+  <img width="50%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/oss/docs-propagation/view-propagated-docs.png"/>
+</p>
\ No newline at end of file
diff --git a/docs/automations/snowflake-tag-propagation.md b/docs/automations/snowflake-tag-propagation.md
new file mode 100644
index 00000000000000..bdc80376dfb484
--- /dev/null
+++ b/docs/automations/snowflake-tag-propagation.md
@@ -0,0 +1,88 @@
+
+import FeatureAvailability from '@site/src/components/FeatureAvailability';
+
+# Snowflake Tag Propagation Automation
+
+<FeatureAvailability saasOnly />
+
+## Introduction
+
+Snowflake Tag Propagation is an automation that allows you to sync DataHub Glossary Terms and Tags on
+both columns and tables back to Snowflake. This automation is available in DataHub Cloud (Acryl) only.
+
+## Capabilities
+
+- Automatically Add DataHub Glossary Terms to Snowflake Tables and Columns
+- Automatically Add DataHub Tags to Snowflake Tables and Columns
+- Automatically Remove DataHub Glossary Terms and Tags from Snowflake Tables and Columns when they are removed in DataHub
+
+## Enabling Snowflake Tag Sync
+
+1. **Navigate to Automations**: Click on 'Govern' > 'Automations' in the navigation bar.
+
+<p align="left">
+  <img width="20%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/saas/automations-nav-link.png"/>
+</p>
+
+2. **Create An Automation**: Click on 'Create' and select 'Snowflake Tag Propagation'.
+
+<p align="left">
+  <img width="30%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/saas/snowflake-tag-propagation/automation-type.png"/>
+</p>
+
+3. **Configure Automation**: Fill in the required fields to connect to Snowflake, along with the name, description, and category. 
+Note that you can limit propagation based on specific Tags and Glossary Terms. If none are selected, then ALL Tags or Glossary Terms will be automatically
+propagated to Snowflake tables and columns. Finally, click 'Save and Run' to start the automation
+
+<p align="left">
+  <img width="30%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/saas/snowflake-tag-propagation/automation-form.png"/>
+</p>
+
+## Propagating for Existing Assets
+
+You can back-fill historical data for existing assets to ensure that all existing column and table Tags and Glossary Terms are propagated to Snowflake.
+Note that it may take some time to complete the initial back-filling process, depending on the number of Snowflake assets you have.
+
+To do so, navigate to the Automation you created in Step 3 above, click the 3-dot "More" menu
+
+<p align="left">
+  <img width="15%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/saas/automation-more-menu.png"/>
+</p>
+
+and then click "Initialize".
+
+<p align="left">
+  <img width="15%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/saas/automation-initialize.png"/>
+</p>
+
+This one-time step will kick off the back-filling process for existing descriptions. If you only want to begin propagating
+descriptions going forward, you can skip this step.
+
+## Rolling Back Propagated Tags
+
+You can rollback all tags and glossary terms that have been propagated historically.
+
+This feature allows you to "clean up" or "undo" any accidental propagation that may have occurred automatically, in the case
+that you no longer want propagated descriptions to be visible.
+
+To do this, navigate to the Automation you created in Step 3 above, click the 3-dot "More" menu
+
+<p align="left">
+  <img width="15%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/saas/automation-more-menu.png"/>
+</p>
+
+and then click "Rollback".
+
+<p align="left">
+  <img width="15%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/saas/automation-rollback.png"/>
+</p>
+
+This one-time step will remove all propagated tags and glossary terms from Snowflake. To simply stop propagating new tags, you can disable the automation.
+
+## Viewing Propagated Tags
+
+You can view propagated Tags (and corresponding DataHub URNs) inside the Snowflake UI to confirm the automation is working as expected. 
+
+<p align="left">
+  <img width="50%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/automation/saas/snowflake-tag-propagation/view-snowflake-tags.png"/>
+</p>
diff --git a/docs/dataproducts.md b/docs/dataproducts.md
index af30ff2a0aa099..f80a65d9a7bc4b 100644
--- a/docs/dataproducts.md
+++ b/docs/dataproducts.md
@@ -90,6 +90,8 @@ Here is an example of a Data Product named "Pet of the Week" which belongs to th
 
 When bare domain names like `Marketing` is used, `datahub` will first check if a domain like `urn:li:domain:Marketing` is provisioned, failing that; it will check for a provisioned domain that has the same name. If we are unable to resolve bare domain names to provisioned domains, then yaml-based ingestion will refuse to proceeed until the domain is provisioned on DataHub.
 
+This applies to other fields as well, such as owners, ownership types, tags, and terms.
+
 :::
 
 You can also provide fully-qualified domain names (e.g. `urn:li:domain:dcadded3-2b70-4679-8b28-02ac9abc92eb`) to ensure that no ingestion-time domain resolution is needed.
diff --git a/docs/deploy/aws.md b/docs/deploy/aws.md
index d1003077e24861..67dd9a734e67f5 100644
--- a/docs/deploy/aws.md
+++ b/docs/deploy/aws.md
@@ -76,7 +76,7 @@ First, if you did not use eksctl to setup the kubernetes cluster, make sure to g
 Download the IAM policy document for allowing the controller to make calls to AWS APIs on your behalf.
 
 ```
-curl -o iam_policy.json https://raw.githubusercontent.com/kubernetes-sigs/aws-load-balancer-controller/v2.2.0/docs/install/iam_policy.json
+curl -o iam_policy.json https://raw.githubusercontent.com/kubernetes-sigs/aws-load-balancer-controller/main/docs/install/iam_policy.json
 ```
 
 Create an IAM policy based on the policy document by running the following.
@@ -148,13 +148,9 @@ datahub-frontend:
       alb.ingress.kubernetes.io/certificate-arn: <<certificate-arn>>
       alb.ingress.kubernetes.io/inbound-cidrs: 0.0.0.0/0
       alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
-      alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
+      alb.ingress.kubernetes.io/ssl-redirect: '443'
     hosts:
       - host: <<host-name>>
-        redirectPaths:
-          - path: /*
-            name: ssl-redirect
-            port: use-annotation
         paths:
           - /*
 ```
diff --git a/docs/deploy/confluent-cloud.md b/docs/deploy/confluent-cloud.md
index 096fd9984f474d..46931de745be62 100644
--- a/docs/deploy/confluent-cloud.md
+++ b/docs/deploy/confluent-cloud.md
@@ -17,9 +17,8 @@ First, you'll need to create following new topics in the [Confluent Control Cent
 7. (Deprecated) **MetadataAuditEvent_v4**: Metadata change log messages
 8. (Deprecated) **FailedMetadataChangeEvent_v4**: Failed to process #1 event
 9. **MetadataGraphEvent_v4**:
-10. **MetadataGraphEvent_v4**:
-11. **PlatformEvent_v1**
-12. **DataHubUpgradeHistory_v1**: Notifies the end of DataHub Upgrade job so dependants can act accordingly (_eg_, startup).
+10. **PlatformEvent_v1**
+11. **DataHubUpgradeHistory_v1**: Notifies the end of DataHub Upgrade job so dependants can act accordingly (_eg_, startup).
     Note this topic requires special configuration: **Infinite retention**. Also, 1 partition is enough for the occasional traffic.
 
 The first five are the most important, and are explained in more depth in [MCP/MCL](../advanced/mcp-mcl.md). The final topics are
@@ -243,4 +242,4 @@ Accepting contributions for a setup script compatible with Confluent Cloud!
 
 The kafka-setup-job container we ship with is only compatible with a distribution of Kafka wherein ZooKeeper
 is exposed and available. A version of the job using the [Confluent CLI](https://docs.confluent.io/confluent-cli/current/command-reference/kafka/topic/confluent_kafka_topic_create.html) 
-would be very useful for the broader community. 
\ No newline at end of file
+would be very useful for the broader community. 
diff --git a/docs/developers.md b/docs/developers.md
index 0c9d7bee3d79f2..401169490dd4b6 100644
--- a/docs/developers.md
+++ b/docs/developers.md
@@ -46,7 +46,7 @@ Use [gradle wrapper](https://docs.gradle.org/current/userguide/gradle_wrapper.ht
 ./gradlew build
 ```
 
-Note that the above will also run run tests and a number of validations which makes the process considerably slower.
+Note that the above will also run tests and a number of validations which makes the process considerably slower.
 
 We suggest partially compiling DataHub according to your needs:
 
diff --git a/docs/features.md b/docs/features.md
index 7951eea1f909c8..bcf3ec3618f88b 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -28,7 +28,7 @@ To get started with DataHub, you can use a simple CLI command. Alternatively, yo
 
 - [Quickstart](quickstart.md)
 - [Self-hosted DataHub](deploy/kubernetes.md)
-- [Managed DataHub](managed-datahub/managed-datahub-overview.md)
+- [DataHub Cloud](managed-datahub/managed-datahub-overview.md)
 
 ### Ingestion
 
diff --git a/docs/features/feature-guides/documentation-forms.md b/docs/features/feature-guides/documentation-forms.md
index 8b2966810de7c0..2edeb8ce302d77 100644
--- a/docs/features/feature-guides/documentation-forms.md
+++ b/docs/features/feature-guides/documentation-forms.md
@@ -77,7 +77,7 @@ Provide a step-by-step guide to use feature, including relevant screenshots and/
 
 ### Videos
 
-**Asset Verification in Acryl Cloud**
+**Asset Verification in DataHub Cloud**
 
 <p align="center">
 	<iframe width="560" height="315" src="https://www.loom.com/embed/dd834d3cb8f041fca001cea19b2b4071?sid=7073dcd4-407c-41ec-b41d-c99f26dd6a2f" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
@@ -101,7 +101,7 @@ You sure can! Please keep in mind that an Asset will only be considered Document
 
 ### API Tutorials
 
-- [Create a Documentation Form](../../../docs/api/tutorials/forms.md)
+- [API Guides on Documentation Form](../../../docs/api/tutorials/forms.md)
 
 :::note
 You must create a Structured Property before including it in a Documentation Form.
diff --git a/docs/how/kafka-config.md b/docs/how/kafka-config.md
index 2f20e8b548f835..06c7418f167136 100644
--- a/docs/how/kafka-config.md
+++ b/docs/how/kafka-config.md
@@ -116,6 +116,27 @@ We've included an environment variable to customize the consumer group id, if yo
 
 - `KAFKA_CONSUMER_GROUP_ID`: The name of the kafka consumer's group id.
 
+#### datahub-mae-consumer MCL Hooks
+
+By default, all MetadataChangeLog processing hooks execute as part of the same kafka consumer group based on the 
+previously mentioned `KAFKA_CONSUMER_GROUP_ID`.
+
+The various MCL Hooks could alsp be separated into separate groups which allows for controlling parallelization and 
+prioritization of the hooks.
+
+For example, the `UpdateIndicesHook` and `SiblingsHook` processing can be delayed by other hooks. Separating these
+hooks into their own group can reduce latency from these other hooks. The `application.yaml` configuration
+includes options for assigning a suffix to the consumer group, see `consumerGroupSuffix`.
+
+| Environment Variable                           | Default | Description                                                                                 |
+|------------------------------------------------|---------|---------------------------------------------------------------------------------------------|
+| SIBLINGS_HOOK_CONSUMER_GROUP_SUFFIX            | ''      | Siblings processing hook. Considered one of the primary hooks in the `datahub-mae-consumer` |
+| UPDATE_INDICES_CONSUMER_GROUP_SUFFIX           | ''      | Primary processing hook.                                                                    |
+| INGESTION_SCHEDULER_HOOK_CONSUMER_GROUP_SUFFIX | ''      | Scheduled ingestion hook.                                                                   |
+| INCIDENTS_HOOK_CONSUMER_GROUP_SUFFIX           | ''      | Incidents hook.                                                                             |
+| ECE_CONSUMER_GROUP_SUFFIX                      | ''      | Entity Change Event hook which publishes to the Platform Events topic.                      |
+| FORMS_HOOK_CONSUMER_GROUP_SUFFIX               | ''      | Forms processing.                                                                           |
+
 ## Applying Configurations
 
 ### Docker
diff --git a/docs/how/search.md b/docs/how/search.md
index 7012f5321f2ff7..c809ab1efba12d 100644
--- a/docs/how/search.md
+++ b/docs/how/search.md
@@ -71,7 +71,7 @@ After creating a filter, you can choose whether results should or should not mat
 
 ### Results
 
-Search results appear ranked by their relevance. In self-hosted DataHub ranking is based on how closely the query matched textual fields of an asset and its metadata. In Managed DataHub, ranking is based on a combination of textual relevance, usage (queries / views), and change frequency. 
+Search results appear ranked by their relevance. In self-hosted DataHub ranking is based on how closely the query matched textual fields of an asset and its metadata. In DataHub Cloud, ranking is based on a combination of textual relevance, usage (queries / views), and change frequency. 
 
 With better metadata comes better results. Learn more about ingestion technical metadata in the [metadata ingestion](../../metadata-ingestion/README.md) guide.
 
@@ -148,24 +148,42 @@ The same GraphQL API that powers the Search UI can be used
 for integrations and programmatic use-cases. 
 
 ```
-# Example query
-{
-  searchAcrossEntities(
-    input: {types: [], query: "*", start: 0, count: 10, filters: [{field: "fieldTags", value: "urn:li:tag:Dimension"}]}
+# Example query - search for datasets matching the example_query_text who have the Dimension tag applied to a schema field and are from the data platform looker
+query searchEntities {
+  search(
+    input: {
+      type: DATASET,
+      query: "example_query_text",
+      orFilters: [
+        {
+          and: [
+            {
+              field: "fieldTags",
+              values: ["urn:li:tag:Dimension"]
+            },
+            {
+              field: "platform",
+              values: ["urn:li:dataPlatform:looker"]
+            }
+          ]
+        }
+      ],
+      start: 0,
+      count: 10
+    }
   ) {
     start
     count
     total
     searchResults {
       entity {
+        urn
         type
         ... on Dataset {
-          urn
-          type
+          name
           platform {
             name
           }
-          name
         }
       }
     }
diff --git a/docs/how/updating-datahub.md b/docs/how/updating-datahub.md
index a9c24849544a3c..08cfe17fb955fb 100644
--- a/docs/how/updating-datahub.md
+++ b/docs/how/updating-datahub.md
@@ -18,6 +18,29 @@ This file documents any backwards-incompatible changes in DataHub and assists pe
 
 ## Next
 
+### Breaking Changes
+- #9857 (#10773) `lower` method was removed from `get_db_name` of `SQLAlchemySource` class. This change will affect the urns of all related to `SQLAlchemySource` entities.
+  
+  Old `urn`, where `data_base_name` is `Some_Database`:
+  ```
+  - urn:li:dataJob:(urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD),Proc.With.SpecialChar)
+  ```
+  New `urn`, where `data_base_name` is `Some_Database`:
+  ```
+  - urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)
+  ```
+  Re-running with stateful ingestion should automatically clear up the entities with old URNS and add entities with new URNs, therefore not duplicating the containers or jobs. 
+
+- #11313 - `datahub get` will no longer return a key aspect for entities that don't exist.
+
+### Potential Downtime
+
+### Deprecations
+
+### Other Notable Changes
+
+## 0.14.0.2
+
 ### Breaking Changes
 
 - Protobuf CLI will no longer create binary encoded protoc custom properties. Flag added `-protocProp` in case this 
@@ -55,6 +78,19 @@ New (optional fields `systemMetadata` and `headers`):
   "headers": {}
 }
 ```
+- #10858 Profiling configuration for Glue source has been updated.
+
+Previously, the configuration was:
+```yaml
+profiling: {}
+```
+
+Now, it needs to be:
+
+```yaml
+profiling:
+  enabled: true
+```
 
 ### Potential Downtime
 
@@ -66,7 +102,10 @@ New (optional fields `systemMetadata` and `headers`):
 
 ### Other Notable Changes
 - #10498 - Tableau ingestion can now be configured to ingest multiple sites at once and add the sites as containers. The feature is currently only available for Tableau Server.
-
+- #10466 - Extends configuration in `~/.datahubenv` to match `DatahubClientConfig` object definition. See full configuration in https://datahubproject.io/docs/python-sdk/clients/. The CLI should now respect the updated configurations specified in `~/.datahubenv` across its functions and utilities. This means that for systems where ssl certification is disabled, setting `disable_ssl_verification: true` in `~./datahubenv` will apply to all CLI calls.
+- #11002 - We will not auto-generate a `~/.datahubenv` file. You must either run `datahub init` to create that file, or set environment variables so that the config is loaded.
+- #11023 - Added a new parameter to datahub's `put` cli command: `--run-id`. This parameter is useful to associate a given write to an ingestion process. A use-case can be mimick transformers when a transformer for aspect being written does not exist.
+- #11051 - Ingestion reports will now trim the summary text to a maximum of 800k characters to avoid generating `dataHubExecutionRequestResult` that are too large for GMS to handle.
 ## 0.13.3
 
 ### Breaking Changes
@@ -80,7 +119,6 @@ New (optional fields `systemMetadata` and `headers`):
 ### Deprecations
 
 ### Other Notable Change
-- #10466 - Extends configuration in `~/.datahubenv` to match `DatahubClientConfig` object definition. See full configuration in https://datahubproject.io/docs/python-sdk/clients/. The CLI should now respect the updated configurations specified in `~/.datahubenv` across its functions and utilities. This means that for systems where ssl certification is disabled, setting `disable_ssl_verification: true` in `~./datahubenv` will apply to all CLI calls.
 
 ## 0.13.1
 
diff --git a/docs/incidents/incidents.md b/docs/incidents/incidents.md
index 41b4df10b78281..c1412d0bebd043 100644
--- a/docs/incidents/incidents.md
+++ b/docs/incidents/incidents.md
@@ -417,9 +417,9 @@ Authorization: Bearer <personal-access-token>
 Also, remember that you can play with an interactive version of the GraphQL API at `https://your-account-id.acryl.io/api/graphiql`
 :::
 
-## Enabling Slack Notifications (Acryl Cloud Only)
+## Enabling Slack Notifications (DataHub Cloud Only)
 
-In Acryl Cloud, you can configure your to send Slack notifications to a specific channel when incidents are raised or their status is changed.
+In DataHub Cloud, you can configure your to send Slack notifications to a specific channel when incidents are raised or their status is changed.
 
 These notifications are also able to tag the immediate asset's owners, along with the owners of downstream assets consuming it.
 
diff --git a/docs/lineage/airflow.md b/docs/lineage/airflow.md
index 62715ed506ffe9..65da1fd5251dc9 100644
--- a/docs/lineage/airflow.md
+++ b/docs/lineage/airflow.md
@@ -17,8 +17,8 @@ There's two actively supported implementations of the plugin, with different Air
 
 | Approach  | Airflow Version | Notes                                                                       |
 | --------- | --------------- | --------------------------------------------------------------------------- |
-| Plugin v2 | 2.3+            | Recommended. Requires Python 3.8+                                           |
-| Plugin v1 | 2.1+            | No automatic lineage extraction; may not extract lineage if the task fails. |
+| Plugin v2 | 2.3.4+          | Recommended. Requires Python 3.8+                                           |
+| Plugin v1 | 2.1 - 2.8       | No automatic lineage extraction; may not extract lineage if the task fails. |
 
 If you're using Airflow older than 2.1, it's possible to use the v1 plugin with older versions of `acryl-datahub-airflow-plugin`. See the [compatibility section](#compatibility) for more details.
 
@@ -45,7 +45,7 @@ Set up a DataHub connection in Airflow, either via command line or the Airflow U
 airflow connections add  --conn-type 'datahub-rest' 'datahub_rest_default' --conn-host 'http://datahub-gms:8080' --conn-password '<optional datahub auth token>'
 ```
 
-If you are using hosted Acryl Datahub then please use `https://YOUR_PREFIX.acryl.io/gms` as the `--conn-host` parameter.
+If you are using DataHub Cloud then please use `https://YOUR_PREFIX.acryl.io/gms` as the `--conn-host` parameter.
 
 #### Airflow UI
 
@@ -66,7 +66,7 @@ enabled = True  # default
 ```
 
 | Name                       | Default value        | Description                                                                              |
-|----------------------------|----------------------|------------------------------------------------------------------------------------------|
+| -------------------------- | -------------------- | ---------------------------------------------------------------------------------------- |
 | enabled                    | true                 | If the plugin should be enabled.                                                         |
 | conn_id                    | datahub_rest_default | The name of the datahub rest connection.                                                 |
 | cluster                    | prod                 | name of the airflow cluster, this is equivalent to the `env` of the instance             |
@@ -84,7 +84,7 @@ enabled = True  # default
 
 ### Installation
 
-The v1 plugin requires Airflow 2.1+ and Python 3.8+. If you're on older versions, it's still possible to use an older version of the plugin. See the [compatibility section](#compatibility) for more details.
+The v1 plugin requires Airflow 2.1 - 2.8 and Python 3.8+. If you're on older versions, it's still possible to use an older version of the plugin. See the [compatibility section](#compatibility) for more details.
 
 If you're using Airflow 2.3+, we recommend using the v2 plugin instead. If you need to use the v1 plugin with Airflow 2.3+, you must also set the environment variable `DATAHUB_AIRFLOW_PLUGIN_USE_V1_PLUGIN=true`.
 
@@ -132,7 +132,7 @@ conn_id = datahub_rest_default  # or datahub_kafka_default
 ```
 
 | Name                       | Default value        | Description                                                                                                                                                                            |
-|----------------------------|----------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| -------------------------- | -------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | enabled                    | true                 | If the plugin should be enabled.                                                                                                                                                       |
 | conn_id                    | datahub_rest_default | The name of the datahub connection you set in step 1.                                                                                                                                  |
 | cluster                    | prod                 | name of the airflow cluster                                                                                                                                                            |
@@ -240,6 +240,7 @@ See this [example PR](https://github.com/datahub-project/datahub/pull/10452) whi
 There might be a case where the DAGs are removed from the Airflow but the corresponding pipelines and tasks are still there in the Datahub, let's call such pipelines ans tasks, `obsolete pipelines and tasks`
 
 Following are the steps to cleanup them from the datahub:
+
 - create a DAG named `Datahub_Cleanup`, i.e.
 
 ```python
@@ -263,8 +264,31 @@ with DAG(
     )
 
 ```
+
 - ingest this DAG, and it will remove all the obsolete pipelines and tasks from the Datahub based on the `cluster` value set in the `airflow.cfg`
 
+## Get all dataJobs associated with a dataFlow
+
+If you are looking to find all tasks (aka DataJobs) that belong to a specific pipeline (aka DataFlow), you can use the following GraphQL query:
+
+```graphql
+query {
+  dataFlow(urn: "urn:li:dataFlow:(airflow,db_etl,prod)") {
+    childJobs: relationships(
+      input: { types: ["IsPartOf"], direction: INCOMING, start: 0, count: 100 }
+    ) {
+      total
+      relationships {
+        entity {
+          ... on DataJob {
+            urn
+          }
+        }
+      }
+    }
+  }
+}
+```
 
 ## Emit Lineage Directly
 
diff --git a/docs/lineage/dagster.md b/docs/lineage/dagster.md
index 785aeaa4c03b29..f5f17432abe8ba 100644
--- a/docs/lineage/dagster.md
+++ b/docs/lineage/dagster.md
@@ -1,70 +1,191 @@
 # Dagster Integration
-DataHub supports the integration of
 
-- Dagster Pipeline metadata
-- Job and Op run information as well as
-- Lineage information when present
+This connector supports extracting:
 
-## Using Datahub's Dagster Sensor
+- Dagster Pipeline and Task Metadata
+- Pipeline Run Status
+- Table Lineage
 
-Dagster sensors allow us to perform some actions based on some state change. Datahub's defined dagster sensor will emit metadata after every dagster pipeline run execution. This sensor is able to emit both pipeline success as well as failures. For more details about Dagster sensors please refer [Sensors](https://docs.dagster.io/concepts/partitions-schedules-sensors/sensors).
+from Dagster.
+
+## Supported Versions
+
+This integration was verified using Dagster 1.7.0+. That does not necessary mean it will not be compatible will older versions. 
+
+## Using DataHub's Dagster Sensor
+
+Dagster Sensors allow us to perform actions when important events occur in Dagster. DataHub's Dagster Sensor allows you to emit metadata after every Dagster pipeline run. This sensor can emit Pipelines, Tasks, and run results. For more details about Dagster Sensors, please refer to [the documentation](https://docs.dagster.io/concepts/partitions-schedules-sensors/sensors).
 
 ### Prerequisites
 
-1. You need to create a new dagster project. See <https://docs.dagster.io/getting-started/create-new-project>.
-2. There are two ways to define Dagster definition before starting dagster UI. One using [Definitions](https://docs.dagster.io/_apidocs/definitions#dagster.Definitions) class (recommended) and second using [Repositories](https://docs.dagster.io/concepts/repositories-workspaces/repositories#repositories).
-3. Creation of new dagster project by default uses Definition class to define Dagster definition.
+1. Create a Dagster project. See [Create New Project](https://docs.dagster.io/getting-started/create-new-project).
+2. Create a [Definitions](https://docs.dagster.io/_apidocs/definitions#dagster.Definitions) class or [Repositories](https://docs.dagster.io/concepts/repositories-workspaces/repositories#repositories).
+3. The creation of a new Dagster project via the UI uses the Definition class to define Dagster pipelines.
 
 ### Setup
 
-1. You need to install the required dependency.
+1. Install the DataHub Dagster plugin package:
 
-```shell
-pip install acryl_datahub_dagster_plugin
-```
+    ```shell
+    pip install acryl_datahub_dagster_plugin
+    ```
 
-2. You need to import DataHub dagster plugin provided sensor definition and add it in Dagster definition or dagster repository before starting dagster UI as show below:
-**Using Definitions class:**
+2. Import the DataHub Dagster Sensor, which is provided in the plugin package, to your Dagster Definition or Repository before starting the Dagster UI:
 
-```python
-{{ inline /metadata-ingestion-modules/dagster-plugin/examples/basic_setup.py }}
-```
+    **Example Definitions Class:**
+
+    ```python
+    {{ inline /metadata-ingestion-modules/dagster-plugin/examples/basic_setup.py }}
+    ```
 
-3. The DataHub dagster plugin provided sensor internally uses below configs. You can set these configs using environment variables. If not set, the sensor will take the default value.
+3. The DataHub Dagster plugin-provided sensor internally uses the following configurations. You can override the default config values using environment variables.
 
    **Configuration options:**
 
-   | Configuration Option          | Default value | Description                                                                                                                                                                                                                                                                                                                       |
+   | Configuration Option          | Default Value | Description                                                                                                                                                                                                                                                                                                                       |
    |-------------------------------|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
    | datahub_client_config         |               | The DataHub client config                                                                                                                                                                                                                                                                                                         |
-   | dagster_url                   |               | The url to your Dagster Webserver.                                                                                                                                                                                                                                                                                                |
-   | capture_asset_materialization | True          | Whether to capture asset keys as Dataset on AssetMaterialization event                                                                                                                                                                                                                                                            |
-   | capture_input_output          | True          | Whether to capture and try to parse input and output from HANDLED_OUTPUT,.LOADED_INPUT events. (currently only [PathMetadataValue](https://github.com/dagster-io/dagster/blob/7e08c05dcecef9fd07f887c7846bd1c9a90e7d84/python_modules/dagster/dagster/_core/definitions/metadata/__init__.py#L655) metadata supported (EXPERIMENTAL) |
-   | platform_instance             |           | The instance of the platform that all assets produced by this recipe belong to. It is optional                                                                                                                                                                                                                                    |
-   | asset_lineage_extractor             |           | You can implement your own logic to capture asset lineage information. See example for details[]                                                                                                                                                                                                                                  |
+   | dagster_url                   |               | The URL to your Dagster Webserver.                                                                                                                                                                                                                                                                                                |
+   | capture_asset_materialization | True          | Whether to capture asset keys as DataHub Datasets on AssetMaterialization event                                                                                                                                                                                                                                                            |
+   | capture_input_output          | True          | Whether to capture and try to parse input and output from HANDLED_OUTPUT, LOADED_INPUT events. (currently only [PathMetadataValue](https://github.com/dagster-io/dagster/blob/7e08c05dcecef9fd07f887c7846bd1c9a90e7d84/python_modules/dagster/dagster/_core/definitions/metadata/__init__.py#L655) metadata supported (EXPERIMENTAL) |
+   | platform_instance             |               | The instance of the platform that all assets produced by this recipe belong to. It is optional                                                                                                                                                                                                                                    |
+   | asset_lineage_extractor       |               | You can implement your own logic to capture asset lineage information. See example for details[]                                                                                                                                                                                                                                  |
+   | enable_asset_query_metadata_parsing |           | Whether to enable parsing query from asset metadata. See below for details[]                                                                                                                                                                                                                                  |
+
+4. Once the Dagster UI is running, turn on the provided Sensor execution. To turn on the Sensor, click on the **Overview** tab and then on the **Sensors** tab. Simply toggle the DataHub sensor on.
+
+Woohoo! Now, the DataHub Sensor is ready to emit metadata after every pipeline run.
+
+### How to Validate Installation
+
+1. Navigate to the Dagster UI.
+2. Go to **Overview** > **Sensors** and look for `datahub_sensor`.
+3. Start a Dagster Job. In the daemon logs, you should see DataHub-related log messages:
+
+    ```
+    datahub_sensor - Emitting metadata...
+    ```
+
+    This means that DataHub's sensor is correctly configured to emit metadata to DataHub.
+
+## Capturing Table Lineage
+
+There are a few ways to extract lineage, or relationships between tables, from Dagster. We recommend one or more of the following approaches to extract lineage automatically.
+
+### Extracting Lineage from SQL Queries
+
+#### But First: Extracting Asset Identifiers
+
+When naming Dagster Assets, we recommend the following structure:
+
+`key_prefix=["env", "platform", "db_name", "schema_name"]`
+
+This ensures that we correctly resolve the Asset name to a Dataset URN in DataHub.
 
-4. Once Dagster UI is up, you need to turn on the provided sensor execution. To turn on the sensor, click on Overview tab and then on Sensors tab. You will see a toggle button in front of all defined sensors to turn it on/off.
+For example:
 
-5. DataHub dagster plugin provided sensor is ready to emit metadata after every dagster pipeline run execution.
+```python
+@asset(
+    key_prefix=["prod", "snowflake", "db_name", "schema_name"], # the fqdn asset name to be able to identify platform and make sure the asset is unique
+    deps=[iris_dataset],
+)
+```
+
+If you properly name your Dagster Asset, you can establish a connection between the Asset and the dataset it is referring to, which is likely already stored in DataHub. This allows for accurate tracking and lineage information in the next steps.
 
-### How to validate installation
+If you follow a different naming convention, you can create your own `asset_keys_to_dataset_urn_converter` logic and set a custom callback function. This can be used to generate a DataHub Dataset URN in any way you please, from metadata or otherwise.
 
-1. Go and check in Dagster UI at Overview -> Sensors menu if you can see the 'datahub_sensor'.
-2. Run a Dagster Job. In the dagster daemon logs, you should see DataHub related log messages like:
+Here is an example that can create a DataHub URN from the Asset key naming convention specified above:
 
+```python
+def asset_keys_to_dataset_urn_converter(
+    self, asset_key: Sequence[str]
+) -> Optional[DatasetUrn]:
+    """
+    Convert asset key to dataset urn
+
+    By default, we assume the following asset key structure:
+    key_prefix=["prod", "snowflake", "db_name", "schema_name"]
+    """
+    if len(asset_key) >= 3:
+        return DatasetUrn(
+            platform=asset_key[1],
+            env=asset_key[0],
+            name=".".join(asset_key[2:]),
+        )
+    else:
+        return None
 ```
-datahub_sensor - Emitting metadata...
+
+DataHub's Dagster integration can automatically detect dataset inputs and outputs for Software Defined Assets by analyzing the SQL queries it executes. To enable this feature, simply add the executed query to the Asset Metadata using the `Query` tag.
+
+Here's an example of a Software Defined Asset with an annotated Query:
+
+```python
+@asset(key_prefix=["prod", "snowflake", "db_name", "schema_name"])
+def my_asset_table_a(snowflake: SnowflakeResource) -> MaterializeResult:
+    query = """
+        create or replace table db_name.schema_name.my_asset_table_a as (
+            SELECT *
+            FROM db_name.schema_name.my_asset_table_b
+        );
+    """
+    with snowflake.get_connection() as connection:
+        with connection.cursor() as cursor:
+            cursor.execute(query)
+    return MaterializeResult(
+        metadata={
+            "Query": MetadataValue.text(query),
+        }
+    )
 ```
 
-## Dagster Ins and Out
+In this example, the plugin will automatically identify and set the upstream lineage as `db_name.schema_name.my_asset_table_b`.
+
+Note: Proper asset naming is crucial, as the query parser determines the query language from the generated URN. In the example above, it will be `snowflake`.
+
+For a complete example job, refer to the [iris.py file](https://github.com/datahub-project/datahub/blob/master/metadata-ingestion-modules/dagster-plugin/examples/iris.py) in the DataHub repository.
+
+### Extracting Lineage using SnowflakePandasIOManager
+
+The plugin offers an extended version of base SnowflakePandasIOManager provided by Dagster called `DataHubSnowflakePandasIOManager`. This version automatically captures Snowflake assets created by the IO manager and adds DataHub URN and links to the assets in Dagster.
+
+To use it, simply replace `SnowflakePandasIOManager` with `DataHubSnowflakePandasIOManager`. The enhanced version accepts two additional parameters:
+
+1. `datahub_base_url`: The base URL of the DataHub UI, used to generate direct links to Snowflake Datasets in DataHub. If not set, no URL will be generated.
+2. `datahub_env`: The DataHub environment to use when generating URNs. Defaults to `PROD` if not specified.
+
+Example usage:
+
+```python
+from datahub_dagster_plugin.modules.snowflake_pandas.datahub_snowflake_pandas_io_manager import (
+    DataHubSnowflakePandasIOManager,
+)
+# ...
+resources={
+    "snowflake_io_manager": DataHubSnowflakePandasIOManager(
+        database="MY_DB",
+        account="my_snowflake_account",
+        warehouse="MY_WAREHOUSE",
+        user="my_user",
+        password="my_password",
+        role="my_role",
+        datahub_base_url="http://localhost:9002",
+    ),
+}
+```
+
+### Using Dagster Ins and Out
+
+We can provide inputs and outputs to both Assets and Ops explicitly using a dictionary of `Ins` and `Out` corresponding to the decorated function arguments. While providing inputs and outputs, we can provide additional metadata as well.
+
+To create dataset upstream and downstream dependency for the Assets and Ops, you can use an ins and out dictionary with metadata provided. For reference, look at the sample jobs created using assets [`assets_job.py`](../../metadata-ingestion-modules/dagster-plugin/examples/assets_job.py), or ops [`ops_job.py`](../../metadata-ingestion-modules/dagster-plugin/examples/ops_job.py).
 
-We can provide inputs and outputs to both assets and ops explicitly using a dictionary of `Ins` and `Out` corresponding to the decorated function arguments. While providing inputs and outputs explicitly we can provide metadata as well.
-To create dataset upstream and downstream dependency for the assets and ops you can use an ins and out dictionary with metadata provided. For reference, look at the sample jobs created using assets [`assets_job.py`](../../metadata-ingestion-modules/dagster-plugin/examples/assets_job.py), or ops [`ops_job.py`](../../metadata-ingestion-modules/dagster-plugin/examples/ops_job.py).
+### Using Custom Logic for Extracting Lineage
 
-## Define your custom logic to capture asset lineage information
-You can define your own logic to capture asset lineage information. 
+You can define your own logic to capture asset lineage information.
 
-The output Tuple contains two dictionaries, one for input assets and the other for output assets. The key of the dictionary is the op key and the value is the set of asset urns that are upstream or downstream of the op.
+The output Tuple contains two dictionaries, one for input assets and the other for output assets. The key of the dictionary is the op key and the value is the set of asset URNs that are upstream or downstream of the op.
 
 ```python
 from datahub_dagster_plugin.client.dagster_generator import DagsterGenerator, DatasetLineage
@@ -74,16 +195,16 @@ def asset_lineage_extractor(
     dagster_generator: DagsterGenerator,
     graph: DataHubGraph,
 ) -> Dict[str, DatasetLineage]:
-   dataset_lineage: Dict[str, DatasetLineage] = {}
+    dataset_lineage: Dict[str, DatasetLineage] = {}
 
     # Extracting input and output assets from the context
     return dataset_lineage
 ```
 
-[See example job here](https://github.com/datahub-project/datahub/blob/master/metadata-ingestion-modules/dagster-plugin/examples/advanced_ops_jobs.py).
+[See an example job here](https://github.com/datahub-project/datahub/blob/master/metadata-ingestion-modules/dagster-plugin/examples/advanced_ops_jobs.py).
 
 ## Debugging
 
-### Connection error for Datahub Rest URL
+### Connection Error for DataHub Rest URL
 
-If you get ConnectionError: HTTPConnectionPool(host='localhost', port=8080), then in that case your DataHub GMS service is not up.
+If you get `ConnectionError: HTTPConnectionPool(host='localhost', port=8080)`, then in that case your DataHub GMS service is not up.
diff --git a/docs/lineage/prefect.md b/docs/lineage/prefect.md
new file mode 100644
index 00000000000000..538e50d979e01d
--- /dev/null
+++ b/docs/lineage/prefect.md
@@ -0,0 +1,137 @@
+# Prefect Integration with DataHub
+
+## Overview
+
+DataHub supports integration with Prefect, allowing you to ingest:
+
+- Prefect flow and task metadata
+- Flow run and Task run information
+- Lineage information (when available)
+
+This integration enables you to track and monitor your Prefect workflows within DataHub, providing a comprehensive view of your data pipeline activities.
+
+## Prefect DataHub Block
+
+### What is a Prefect DataHub Block?
+
+Blocks in Prefect are primitives that enable the storage of configuration and provide an interface for interacting with external systems. The `prefect-datahub` block uses the [DataHub REST](../../metadata-ingestion/sink_docs/datahub.md#datahub-rest) emitter to send metadata events while running Prefect flows.
+
+### Prerequisites
+
+1. Use either Prefect Cloud (recommended) or a self-hosted Prefect server.
+2. For Prefect Cloud setup, refer to the [Cloud Quickstart](https://docs.prefect.io/latest/getting-started/quickstart/) guide.
+3. For self-hosted Prefect server setup, refer to the [Host Prefect Server](https://docs.prefect.io/latest/guides/host/) guide.
+4. Ensure the Prefect API URL is set correctly. Verify using:
+
+   ```shell
+   prefect profile inspect
+   ```
+
+5. API URL format:
+   - Prefect Cloud: `https://api.prefect.cloud/api/accounts/<account_id>/workspaces/<workspace_id>`
+   - Self-hosted: `http://<host>:<port>/api`
+
+## Setup Instructions
+
+### 1. Installation
+
+Install `prefect-datahub` using pip:
+
+```shell
+pip install 'prefect-datahub'
+```
+
+Note: Requires Python 3.7+
+
+### 2. Saving Configurations to a Block
+
+Save your configuration to the [Prefect block document store](https://docs.prefect.io/latest/concepts/blocks/#saving-blocks):
+
+```python
+from prefect_datahub.datahub_emitter import DatahubEmitter
+
+DatahubEmitter(
+    datahub_rest_url="http://localhost:8080",
+    env="PROD",
+    platform_instance="local_prefect"
+).save("MY-DATAHUB-BLOCK")
+```
+
+Configuration options:
+
+| Config | Type | Default | Description |
+|--------|------|---------|-------------|
+| datahub_rest_url | `str` | `http://localhost:8080` | DataHub GMS REST URL |
+| env | `str` | `PROD` | Environment for assets (see [FabricType](https://datahubproject.io/docs/graphql/enums/#fabrictype)) |
+| platform_instance | `str` | `None` | Platform instance for assets (see [Platform Instances](https://datahubproject.io/docs/platform-instances/)) |
+
+### 3. Using the Block in Prefect Workflows
+
+Load and use the saved block in your Prefect workflows:
+
+```python
+from prefect import flow, task
+from prefect_datahub.dataset import Dataset
+from prefect_datahub.datahub_emitter import DatahubEmitter
+
+datahub_emitter = DatahubEmitter.load("MY-DATAHUB-BLOCK")
+
+@task(name="Transform", description="Transform the data")
+def transform(data):
+    data = data.split(" ")
+    datahub_emitter.add_task(
+        inputs=[Dataset("snowflake", "mydb.schema.tableA")],
+        outputs=[Dataset("snowflake", "mydb.schema.tableC")],
+    )
+    return data
+
+@flow(name="ETL flow", description="Extract transform load flow")
+def etl():
+    data = transform("This is data")
+    datahub_emitter.emit_flow()
+```
+
+**Note**: To emit tasks, you must call `emit_flow()`. Otherwise, no metadata will be emitted.
+
+## Concept Mapping
+
+| Prefect Concept | DataHub Concept |
+|-----------------|-----------------|
+| [Flow](https://docs.prefect.io/latest/concepts/flows/) | [DataFlow](https://datahubproject.io/docs/generated/metamodel/entities/dataflow/) |
+| [Flow Run](https://docs.prefect.io/latest/concepts/flows/#flow-runs) | [DataProcessInstance](https://datahubproject.io/docs/generated/metamodel/entities/dataprocessinstance) |
+| [Task](https://docs.prefect.io/latest/concepts/tasks/) | [DataJob](https://datahubproject.io/docs/generated/metamodel/entities/datajob/) |
+| [Task Run](https://docs.prefect.io/latest/concepts/tasks/#tasks) | [DataProcessInstance](https://datahubproject.io/docs/generated/metamodel/entities/dataprocessinstance) |
+| [Task Tag](https://docs.prefect.io/latest/concepts/tasks/#tags) | [Tag](https://datahubproject.io/docs/generated/metamodel/entities/tag/) |
+
+## Validation and Troubleshooting
+
+### Validating the Setup
+
+1. Check the Prefect UI's Blocks menu for the DataHub emitter.
+2. Run a Prefect workflow and look for DataHub-related log messages:
+
+   ```text
+   Emitting flow to datahub...
+   Emitting tasks to datahub...
+   ```
+
+### Debugging Common Issues
+
+#### Incorrect Prefect API URL
+
+If the Prefect API URL is incorrect, set it manually:
+
+```shell
+prefect config set PREFECT_API_URL='http://127.0.0.1:4200/api'
+```
+
+#### DataHub Connection Error
+
+If you encounter a `ConnectionError: HTTPConnectionPool(host='localhost', port=8080)`, ensure that your DataHub GMS service is running.
+
+## Additional Resources
+
+- [Prefect Documentation](https://docs.prefect.io/)
+- [DataHub Documentation](https://datahubproject.io/docs/)
+
+For more information or support, please refer to the official Prefect and DataHub documentation or reach out to their respective communities.
diff --git a/docs/managed-datahub/approval-workflows.md b/docs/managed-datahub/approval-workflows.md
index 75cab458d285d9..e28ba1b87d7eaa 100644
--- a/docs/managed-datahub/approval-workflows.md
+++ b/docs/managed-datahub/approval-workflows.md
@@ -6,7 +6,7 @@ import FeatureAvailability from '@site/src/components/FeatureAvailability';
 
 ## Overview
 
-Keeping all your metadata properly classified can be hard work when you only have a limited number of trusted data stewards. With Managed DataHub, you can source proposals of Tags and Glossary Terms associated to datasets or dataset columns. These proposals may come from users with limited context or programatic processes using hueristics. Then, data stewards and data owners can go through them and only approve proposals they consider correct. This reduces the burden of your stewards and owners while increasing coverage.
+Keeping all your metadata properly classified can be hard work when you only have a limited number of trusted data stewards. With DataHub Cloud, you can source proposals of Tags and Glossary Terms associated to datasets or dataset columns. These proposals may come from users with limited context or programatic processes using hueristics. Then, data stewards and data owners can go through them and only approve proposals they consider correct. This reduces the burden of your stewards and owners while increasing coverage.
 
 Approval workflows also cover the Business Glossary itself. This allows you to source Glossary Terms and Glossary Term description changes from across your organization while limiting who has final control over what gets in.
 
diff --git a/docs/managed-datahub/chrome-extension.md b/docs/managed-datahub/chrome-extension.md
index a4560bc8cc09ba..a98aa6cb7e3040 100644
--- a/docs/managed-datahub/chrome-extension.md
+++ b/docs/managed-datahub/chrome-extension.md
@@ -1,12 +1,12 @@
 ---
-description: Learn how to upload and use the Acryl DataHub Chrome extension (beta) locally before it's available on the Chrome store.
+description: Learn how to upload and use the DataHub Cloud Chrome extension (beta) locally before it's available on the Chrome store.
 ---
 
-# Acryl DataHub Chrome Extension
+# DataHub Cloud Chrome Extension
 
 ## Installing the Extension
 
-In order to use the Acryl DataHub Chrome extension, you need to download it onto your browser from the Chrome web store [here](https://chrome.google.com/webstore/detail/datahub-chrome-extension/aoenebhmfokhglijmoacfjcnebdpchfj).
+In order to use the DataHub Cloud Chrome extension, you need to download it onto your browser from the Chrome web store [here](https://chrome.google.com/webstore/detail/datahub-chrome-extension/aoenebhmfokhglijmoacfjcnebdpchfj).
 
 
 <p align="center">
@@ -18,7 +18,7 @@ Simply click "Add to Chrome" then "Add extension" on the ensuing popup.
 
 ## Configuring the Extension
 
-Once you have your extension installed, you'll need to configure it to work with your Acryl DataHub deployment.
+Once you have your extension installed, you'll need to configure it to work with your DataHub Cloud deployment.
 
 1. Click the extension button on the right of your browser's address bar to view all of your installed extensions. Click on the newly installed DataHub extension.
 
@@ -40,7 +40,7 @@ If your organization uses standard SaaS domains for Looker, you should be ready
 
 ### Additional Configurations
 
-Some organizations have custom SaaS domains for Looker and some Acryl DataHub deployments utilize **Platform Instances** and set custom **Environments** when creating DataHub assets. If any of these situations applies to you, please follow the next few steps to finish configuring your extension.
+Some organizations have custom SaaS domains for Looker and some DataHub Cloud deployments utilize **Platform Instances** and set custom **Environments** when creating DataHub assets. If any of these situations applies to you, please follow the next few steps to finish configuring your extension.
 
 1. Click on the extension button and select your DataHub extension to open the popup again. Now click the settings icon in order to open the configurations page.
 
@@ -62,13 +62,13 @@ Some organizations have custom SaaS domains for Looker and some Acryl DataHub de
 
 Once you have everything configured on your extension, it's time to use it!
 
-1. First ensure that you are logged in to your Acryl DataHub instance.
+1. First ensure that you are logged in to your DataHub Cloud instance.
 
 2. Navigate to Looker or Tableau and log in to view your data assets.
 
 3. Navigate to a page where DataHub can provide insights on your data assets (Dashboards and Explores).
 
-4. Click the Acryl DataHub extension button on the bottom right of your page to open a drawer where you can now see additional information about this asset right from your DataHub instance.
+4. Click the DataHub Cloud extension button on the bottom right of your page to open a drawer where you can now see additional information about this asset right from your DataHub instance.
 
 
 <p align="center">
@@ -78,7 +78,7 @@ Once you have everything configured on your extension, it's time to use it!
 
 ## Advanced: Self-Hosted DataHub
 
-If you are using the Acryl DataHub Chrome extension for your self-hosted DataHub instance, everything above is applicable. However, there is one additional step you must take in order to set up your instance to be compatible with the extension.
+If you are using the DataHub Cloud Chrome extension for your self-hosted DataHub instance, everything above is applicable. However, there is one additional step you must take in order to set up your instance to be compatible with the extension.
 
 ### Configure Auth Cookies
 
diff --git a/docs/managed-datahub/configuring-identity-provisioning-with-okta.md b/docs/managed-datahub/configuring-identity-provisioning-with-okta.md
new file mode 100644
index 00000000000000..a7939b514166da
--- /dev/null
+++ b/docs/managed-datahub/configuring-identity-provisioning-with-okta.md
@@ -0,0 +1,119 @@
+---
+title: "SCIM Integration: Okta and DataHub"
+hide_title: true
+---
+import FeatureAvailability from '@site/src/components/FeatureAvailability';
+
+## SCIM Integration: Okta and DataHub
+<FeatureAvailability saasOnly />
+
+## Overview
+This document covers the steps required to enable SCIM provisioning from Okta to DataHub.
+
+This document assumes you are using OIDC for SSO with DataHub.
+Since Okta doesn't currently support SCIM with OIDC, you would need to create an additional SWA-app-integration to enable SCIM provisioning.
+
+On completing the steps in this guide, Okta will start automatically pushing changes to users/groups of this SWA-app-integration to DataHub, thereby simplifying provisioning of users/groups in DataHub.
+
+### Why SCIM provisioning? 
+Let us look at an example of the flows enabled through SCIM provisioning.
+
+Consider the following configuration in Okta
+- A group `governance-team`
+- And it has two members `john` and `sid`
+- And the group has role `Reader`
+
+Through SCIM provisioning, the following are enabled:
+* If the `governance-team` group is assigned to the DataHub app in Okta with the role `Reader`, Okta will create the users `john` and `sid` in DataHub with the `Reader` role.
+* If you remove `john` from group `governance-team` then `john` would automatically get deactivated in DataHub.
+* If you remove `sid` from the DataHub app in Okta, then `sid` would automatically get deactivated in DataHub. 
+
+Generally, any user assignment/unassignment to the app in Okta - directly or through groups - are automatically reflected in the DataHub application.
+
+This guide also covers other variations such as how to assign a role to a user directly, and how group-information can be pushed to DataHub.
+
+> Only Admin, Editor and Reader roles are supported in DataHub. These roles are preconfigured/created on DataHub.
+
+## Configuring SCIM provisioning
+
+### 1. Create an SWA app integration
+a). Create a new [SWA app integration](https://help.okta.com/en-us/content/topics/apps/apps_app_integration_wizard_swa.htm), called say, `DataHub-SCIM-SWA`.
+
+Note: this app-integration will only be used for SCIM provisioning. You would continue to use the existing OIDC-app-integration for SSO. 
+
+b). In the `General` tab of the `DataHub-SCIM-SWA` application, check the `Enable SCIM provisioning` option
+
+<p>
+<img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/scim/okta/appSettingsEnableScim.png"/>
+</p>
+
+You may also want to configure the other selections as shown in the above image, so that this application isn't visible to your users.
+
+### 2. Configure SCIM
+
+a). Generate a personal access token from [DataHub](../../docs/authentication/personal-access-tokens.md#creating-personal-access-tokens).
+
+b). In the `Provisioning` tab, configure the DataHub-SCIM endpoint as shown in the below image:
+
+<p>
+<img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/scim/okta/scimConfig1.png"/>
+</p>
+
+**Note**: Set the value of the `Bearer` field to the personal access token obtained in step (a) above.  
+
+c). Configure the `To App` section as shown below:
+
+<p>
+<img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/scim/okta/scimConfig2.png"/>
+</p>
+
+**Note**: We are not pushing passwords to DataHub over SCIM, since we are assuming SSO with OIDC as mentioned earlier.
+
+### 3. Add a custom attribute to represent roles
+a). Navigate to `Directory` -> `Profile Editor`, and select the user-profile of this new application.
+
+<p>
+<img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/scim/okta/profileEditor.png"/>
+</p>
+
+b). Click `Add Attribute` and define a new attribute that will be used to specify the role of a DataHub user.
+
+<p>
+<img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/scim/okta/defineRoleAttribute.png"/>
+</p>
+
+* Set value of `External name` to `roles.^[primary==true].value`
+* Set value of `External namespace` to `urn:ietf:params:scim:schemas:core:2.0:User`
+* Define an enumerated list of values as shown in the above image
+* Mark this attribute as required
+* Select `Attribute type` as `Personal`
+
+c). Add a similar attribute for groups i.e. repeat step (b) above, but select `Attribute Type` as `Group`. (Specify the variable name as, say, `dataHubGroupRoles`.)
+
+### 4. Assign users & groups to the app
+Assign users and groups to the app from the `Assignments` tab:
+
+<p>
+<img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/scim/okta/assignUsersGroups.png"/>
+</p>
+
+While assigning a user/group, choose an appropriate value for the dataHubRoles/dataHubGroupRoles attribute.
+Note that when a role is selected for a group, the corresponding role is pushed for all users of that group in DataHub.
+
+### The provisioning setup is now complete
+Once the above steps are completed, user assignments/unassignments to the DataHub-SCIM-SWA app in Okta will get reflected in DataHub automatically.
+
+> #### A note on user deletion
+>Note that when users are unassigned or deactivated in Okta, the corresponding users in DataHub are also deactivated (marked "suspended").
+But when a user is *deleted* in Okta, the corresponding user in DataHub does *not* get deleted.
+Refer the Okta documentation on [Delete (Deprovision)](https://developer.okta.com/docs/concepts/scim/#delete-deprovision) for more details.
+
+### 5. (Optional): Configure push groups
+When groups are assigned to the app, Okta pushes the group-members as users to DataHub, but the group itself isn't pushed.
+To push group information to DataHub, configure the `Push Groups` tab accordingly as shown below:
+
+<p>
+<img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/scim/okta/pushGroups.png"/>
+</p>
+
+Refer to the Okta [Group Push](https://help.okta.com/en-us/content/topics/users-groups-profiles/app-assignments-group-push.htm) documentation for more details.
\ No newline at end of file
diff --git a/docs/managed-datahub/datahub-api/graphql-api/getting-started.md b/docs/managed-datahub/datahub-api/graphql-api/getting-started.md
index 736bf6fea6811d..5993e2dfd773dd 100644
--- a/docs/managed-datahub/datahub-api/graphql-api/getting-started.md
+++ b/docs/managed-datahub/datahub-api/graphql-api/getting-started.md
@@ -4,7 +4,7 @@ description: Getting started with the DataHub GraphQL API.
 
 # Getting Started
 
-The Acryl DataHub GraphQL API is an extension of the open source [DataHub GraphQL API.](docs/api/graphql/overview.md)
+The DataHub Cloud GraphQL API is an extension of the open source [DataHub GraphQL API.](docs/api/graphql/overview.md)
 
 For a full reference to the Queries & Mutations available for consumption, check out [Queries](graphql/queries.md) & [Mutations](graphql/mutations.md).
 
@@ -39,7 +39,7 @@ e.g. to connect to ingestion endpoint for doing ingestion programmatically you c
 
 The entire GraphQL API can be explored & [introspected](https://graphql.org/learn/introspection/) using GraphiQL, an interactive query tool which allows you to navigate the entire Acryl GraphQL schema as well as craft & issue using an intuitive UI.
 
-[GraphiQL](https://www.gatsbyjs.com/docs/how-to/querying-data/running-queries-with-graphiql/) is available for each Acryl DataHub deployment, locating at `https://your-account.acryl.io/api/graphiql`.
+[GraphiQL](https://www.gatsbyjs.com/docs/how-to/querying-data/running-queries-with-graphiql/) is available for each DataHub Cloud deployment, locating at `https://your-account.acryl.io/api/graphiql`.
 
 ### Querying the API
 
diff --git a/docs/managed-datahub/managed-datahub-overview.md b/docs/managed-datahub/managed-datahub-overview.md
index 4efc96eaf17a7c..f4d155ff0dbe10 100644
--- a/docs/managed-datahub/managed-datahub-overview.md
+++ b/docs/managed-datahub/managed-datahub-overview.md
@@ -1,8 +1,8 @@
-# How Acryl DataHub compares to DataHub
+# How DataHub Cloud compares to DataHub
 
 DataHub is the #1 open source data catalog for developers.
 
-Acryl DataHub takes DataHub to the next level by offering features that allow
+DataHub Cloud takes DataHub to the next level by offering features that allow
 you to roll out the product to the entire organization beyond your central data
 platform team.
 
@@ -12,7 +12,7 @@ checklists and we hope you love them too!
 ## Search and Discovery
 Features aimed at making it easy to discover data assets at your organization and understand relationships between them.
 
-| Feature | DataHub | Acryl DataHub | 
+| Feature | DataHub | DataHub Cloud | 
 | ---------------------------------------------- | ------- | ------------- |
 | Integrations for 50+ data sources | ✅ | ✅ | 
 | Table level, Column-level, Job-level lineage | ✅ | ✅ |
@@ -32,7 +32,7 @@ Features aimed at making it easy to discover data assets at your organization an
 Features that help you govern the crown jewels of your organization, and trim
 out the datasets that seem to grow like weeds when no one’s looking.
 
-| Feature | DataHub | Acryl DataHub |
+| Feature | DataHub | DataHub Cloud |
 | ---------------------------------------------- | ------- | ------------- |
 | Shift-Left governance | ✅ | ✅ |
 | Dataset ownership management | ✅ | ✅ |
@@ -48,7 +48,7 @@ Features that help you ensure your data pipelines are producing high quality
 assets, and if they’re not, making sure you and impacted users are the first to
 know. 
 
-| Feature | DataHub | Acryl DataHub |
+| Feature | DataHub | DataHub Cloud |
 | ---------------------------------------------- | ------- | ------------- |
 | Surface data quality results | ✅ | ✅ |
 | Create data contracts | ✅ | ✅ |
@@ -68,7 +68,7 @@ know.
 ## Enterprise Grade
 Features needed to roll out at scale to large enterprises.
 
-| Feature | DataHub | Acryl DataHub |
+| Feature | DataHub | DataHub Cloud |
 | ---------------------------------------------- | ------- | ------------- |
 | Battle-tested open source metadata platform | ✅ | ✅ |
 | Metadata change events as a real-time stream | ✅ | ✅ |
@@ -82,7 +82,7 @@ Features needed to roll out at scale to large enterprises.
 ## Implementation and Support
 Features related to ease of deployment and maintenance.
 
-| Feature | DataHub | Acryl DataHub |
+| Feature | DataHub | DataHub Cloud |
 | ---------------------------------------------- | ------- | ------------- |
 | Community support | ✅ | ✅ |
 | Your own engineering team | ✅ | ❌ (They can instead focus on high-value work like contributing features to the open source product, or build amazing data applications with the APIs!)|
@@ -102,7 +102,7 @@ the form using the link below, and someone from the Acryl team will reach
 out to set up a chat.
 
 <a href="https://www.acryldata.io/sign-up?utm_source=datahub&utm_medium=referral&utm_campaign=acryl_vs_datahub" style={{ display: 'inline-block', padding: '10px 20px', margin: '10px 0', backgroundColor: '#007bff', color: 'white', borderRadius: '5px', textDecoration: 'none', textAlign: 'center' }}>
-  Learn about Acryl DataHub
+  Learn about DataHub Cloud
 </a>
 
 <!-- 
diff --git a/docs/managed-datahub/observe/column-assertions.md b/docs/managed-datahub/observe/column-assertions.md
index 3e5b903dc60ba7..d07e0c7114e46b 100644
--- a/docs/managed-datahub/observe/column-assertions.md
+++ b/docs/managed-datahub/observe/column-assertions.md
@@ -8,7 +8,7 @@ import FeatureAvailability from '@site/src/components/FeatureAvailability';
 
 <FeatureAvailability saasOnly />
 
-> The **Column Assertions** feature is available as part of the **Acryl Observe** module of Acryl Cloud.
+> The **Column Assertions** feature is available as part of the **Acryl Observe** module of DataHub Cloud.
 > If you are interested in learning more about **Acryl Observe** or trying it out, please [visit our website](https://www.acryldata.io/observe).
 
 ## Introduction
@@ -17,9 +17,9 @@ Can you remember a time when an important warehouse table column changed dramati
 
 There are many reasons why important columns in your Snowflake, Redshift, BigQuery, or Databricks tables may change - application code bugs, new feature rollouts, etc. Oftentimes, these changes break important assumptions made about the data used in building key downstream data products like reporting dashboards or data-driven product features.
 
-What if you could reduce the time to detect these incidents, so that the people responsible for the data were made aware of data issues before anyone else? With Acryl DataHub Column  Assertions, you can.
+What if you could reduce the time to detect these incidents, so that the people responsible for the data were made aware of data issues before anyone else? With DataHub Cloud Column  Assertions, you can.
 
-With Acryl DataHub, you can define **Column Value** assertions to ensure each value in a column matches specific constraints, and **Column Metric** assertions to ensure that computed metrics from columns align with your expectations. As soon as things go wrong, your team will be the first to know, before the data issue becomes a larger data incident. 
+With DataHub Cloud, you can define **Column Value** assertions to ensure each value in a column matches specific constraints, and **Column Metric** assertions to ensure that computed metrics from columns align with your expectations. As soon as things go wrong, your team will be the first to know, before the data issue becomes a larger data incident. 
 
 In this guide, we'll cover the basics of Column Assertions - what they are, how to configure them, and more - so that you and your team can start building trust in your most important data assets.
 
@@ -36,7 +36,7 @@ Column Assertions are currently supported for:
 5. DataHub Dataset Profile Metrics (collected via ingestion)
 
 Note that an Ingestion Source _must_ be configured with the data platform of your choice in
-Acryl DataHub's **Ingestion** tab.
+DataHub Cloud's **Ingestion** tab.
 
 > Note that Column Assertions are not yet supported if you are connecting to your warehouse
 > using the DataHub CLI.
@@ -248,7 +248,7 @@ To resume the assertion, simply click **Start**.
 
 ## Creating Column Assertions via API
 
-Under the hood, Acryl DataHub implements Column Assertion Monitoring using two concepts:
+Under the hood, DataHub Cloud implements Column Assertion Monitoring using two concepts:
 
 - **Assertion**: The specific expectation for the column metric. e.g. "The value of an integer column is greater than 10 for all rows in the table." This is the "what".
 - **Monitor**: The process responsible for evaluating the Assertion on a given evaluation schedule and using specific
diff --git a/docs/managed-datahub/observe/custom-sql-assertions.md b/docs/managed-datahub/observe/custom-sql-assertions.md
index ce6e46cfda1fda..0532d262d4cca3 100644
--- a/docs/managed-datahub/observe/custom-sql-assertions.md
+++ b/docs/managed-datahub/observe/custom-sql-assertions.md
@@ -8,7 +8,7 @@ import FeatureAvailability from '@site/src/components/FeatureAvailability';
 
 <FeatureAvailability saasOnly />
 
-> The **Custom SQL Assertions** feature is available as part of the **Acryl Observe** module of Acryl Cloud.
+> The **Custom SQL Assertions** feature is available as part of the **Acryl Observe** module of DataHub Cloud.
 > If you are interested in learning more about **Acryl Observe** or trying it out, please [visit our website](https://www.acryldata.io/observe).
 
 ## Introduction
@@ -23,9 +23,9 @@ changes to key metric definitions, etc. Often times, these changes break importa
 like reporting dashboards or data-driven product features.
 
 What if you could reduce the time to detect these incidents, so that the people responsible for the data were made aware of data
-issues _before_ anyone else? With Acryl DataHub **Custom SQL Assertions**, you can.
+issues _before_ anyone else? With DataHub Cloud **Custom SQL Assertions**, you can.
 
-Acryl DataHub allows users to define complex expectations about a particular warehouse Table through custom SQL queries, and then monitor those expectations over time as the table grows and changes.
+DataHub Cloud allows users to define complex expectations about a particular warehouse Table through custom SQL queries, and then monitor those expectations over time as the table grows and changes.
 
 In this article, we'll cover the basics of monitoring Custom SQL Assertions - what they are, how to configure them, and more - so that you and your team can
 start building trust in your most important data assets.
@@ -41,7 +41,7 @@ Custom SQL Assertions are currently supported for:
 3. BigQuery
 4. Databricks
 
-Note that an Ingestion Source _must_ be configured with the data platform of your choice in Acryl DataHub's **Ingestion**
+Note that an Ingestion Source _must_ be configured with the data platform of your choice in DataHub Cloud's **Ingestion**
 tab.
 
 > Note that SQL Assertions are not yet supported if you are connecting to your warehouse
@@ -55,7 +55,7 @@ the Table. You have full control over the SQL query, and can use any SQL feature
 Custom SQL Assertions can be particularly useful when you have complex tables or relationships
 that are used to generate important metrics or reports, and where the meaning of the table is expected to be stable over time.
 If you have existing SQL queries that you already use to monitor your data, you may find that Custom SQL Assertions are an easy way to port them
-to Acryl DataHub to get started.
+to DataHub Cloud to get started.
 
 For example, imagine that you have a Table that tracks the number of purchases made on your company's e-commerce web store.
 You have a SQL query that you use to calculate the number of purchases made in the past 24 hours, and you'd like to monitor this
@@ -202,7 +202,7 @@ To resume the assertion, simply click **Start**.
 
 ## Creating Custom SQL Assertions via API
 
-Under the hood, Acryl DataHub implements Custom SQL Assertion Monitoring using two concepts:
+Under the hood, DataHub Cloud implements Custom SQL Assertion Monitoring using two concepts:
 
 - **Assertion**: The specific expectation for the custom assertion, e.g. "The table was changed in the past 7 hours"
   or "The table is changed on a schedule of every day by 8am". This is the "what".
diff --git a/docs/managed-datahub/observe/freshness-assertions.md b/docs/managed-datahub/observe/freshness-assertions.md
index 5e80c9dd940dc1..3551e2a1b95e0b 100644
--- a/docs/managed-datahub/observe/freshness-assertions.md
+++ b/docs/managed-datahub/observe/freshness-assertions.md
@@ -8,7 +8,7 @@ import FeatureAvailability from '@site/src/components/FeatureAvailability';
 
 <FeatureAvailability saasOnly />
 
-> The **Freshness Assertions** feature is available as part of the **Acryl Observe** module of Acryl Cloud.
+> The **Freshness Assertions** feature is available as part of the **Acryl Observe** module of DataHub Cloud.
 > If you are interested in learning more about **Acryl Observe** or trying it out, please [visit our website](https://www.acryldata.io/observe). 
 
 ## Introduction
@@ -22,9 +22,9 @@ There are many reasons why an important Table on Snowflake, Redshift, BigQuery,
 
 What if you could reduce the time to detect these incidents, so that the people responsible for the data were made aware of data 
 issues _before_ anyone else? What if you could communicate commitments about the freshness or change frequency
-of a table? With Acryl DataHub Freshness Assertions, you can.
+of a table? With DataHub Cloud Freshness Assertions, you can.
 
-Acryl DataHub allows users to define expectations about when a particular Table in the warehouse
+DataHub Cloud allows users to define expectations about when a particular Table in the warehouse
 should change, and then monitor those expectations over time, with the ability to be notified when things go wrong. 
 
 In this article, we'll cover the basics of monitoring Freshness Assertions - what they are, how to configure them, and more - so that you and your team can
@@ -42,7 +42,7 @@ Freshness Assertions are currently supported for:
 4. Databricks
 5. DataHub Operations (collected via ingestion)
 
-Note that an Ingestion Source _must_ be configured with the data platform of your choice in Acryl DataHub's **Ingestion** 
+Note that an Ingestion Source _must_ be configured with the data platform of your choice in DataHub Cloud's **Ingestion** 
 tab.
 
 > Note that Freshness Assertions are not yet supported if you are connecting to your warehouse
@@ -99,7 +99,7 @@ We can either check for change to the Table
 
 #### 3. Change Source
 
-The **Change Source**: This is the mechanism that Acryl DataHub should use to determine whether the Table has changed. The supported
+The **Change Source**: This is the mechanism that DataHub Cloud should use to determine whether the Table has changed. The supported
 Change Source types vary by the platform, but generally fall into these categories:
 
   - **Audit Log** (Default): A metadata API or Table that is exposed by the Data Warehouse which contains captures information about the
@@ -249,11 +249,11 @@ To resume the assertion, simply click **Start**.
 
 ## Smart Assertions ⚡
 
-As part of the **Acryl Observe** module, Acryl DataHub also provides **Smart Assertions** out of the box. These are
+As part of the **Acryl Observe** module, DataHub Cloud also provides **Smart Assertions** out of the box. These are
 dynamic, AI-powered Freshness Assertions that you can use to monitor the freshness of important warehouse Tables, without
 requiring any manual setup. 
 
-If Acryl DataHub is able to detect a pattern in the change frequency of a Snowflake, Redshift, BigQuery, or Databricks Table, you'll find
+If DataHub Cloud is able to detect a pattern in the change frequency of a Snowflake, Redshift, BigQuery, or Databricks Table, you'll find
 a recommended Smart Assertion under the `Validations` tab on the Table profile page:
 
 <p align="left">
@@ -268,7 +268,7 @@ Don't need it anymore? Smart Assertions can just as easily be turned off by clic
 
 ## Creating Freshness Assertions via API 
 
-Under the hood, Acryl DataHub implements Freshness Assertion Monitoring using two concepts:
+Under the hood, DataHub Cloud implements Freshness Assertion Monitoring using two concepts:
 
 - **Assertion**: The specific expectation for freshness, e.g. "The table was changed int the past 7 hours"
   or "The table is changed on a schedule of every day by 8am". This is the "what". 
diff --git a/docs/managed-datahub/observe/schema-assertions.md b/docs/managed-datahub/observe/schema-assertions.md
index b7869218932d81..4ee5dd26ec3b99 100644
--- a/docs/managed-datahub/observe/schema-assertions.md
+++ b/docs/managed-datahub/observe/schema-assertions.md
@@ -8,7 +8,7 @@ import FeatureAvailability from '@site/src/components/FeatureAvailability';
 
 <FeatureAvailability saasOnly />
 
-> The **Schema Assertions** feature is available as part of the **Acryl Observe** module of Acryl Cloud.
+> The **Schema Assertions** feature is available as part of the **Acryl Observe** module of DataHub Cloud.
 > If you are interested in learning more about **Acryl Observe** or trying it out, please [visit our website](https://www.acryldata.io/observe).
 
 ## Introduction
@@ -20,9 +20,9 @@ There are many reasons why the structure of an important Table on Snowflake, Red
 of downstream consumers of the table. 
 
 What if you could reduce the time to detect these incidents, so that the people responsible for the data were made aware of data
-issues _before_ anyone else? With Acryl DataHub **Schema Assertions**, you can.
+issues _before_ anyone else? With DataHub Cloud **Schema Assertions**, you can.
 
-Acryl DataHub allows users to define expectations about a table's columns and their data types, and will monitor and validate these expectations over
+DataHub Cloud allows users to define expectations about a table's columns and their data types, and will monitor and validate these expectations over
 time, notifying you when a breaking change occurs. 
 
 In this article, we'll cover the basics of monitoring Schema Assertions - what they are, how to configure them, and more - so that you and your team can
diff --git a/docs/managed-datahub/observe/volume-assertions.md b/docs/managed-datahub/observe/volume-assertions.md
index 7d801933834abc..a07fff6dc3bca8 100644
--- a/docs/managed-datahub/observe/volume-assertions.md
+++ b/docs/managed-datahub/observe/volume-assertions.md
@@ -8,7 +8,7 @@ import FeatureAvailability from '@site/src/components/FeatureAvailability';
 
 <FeatureAvailability saasOnly />
 
-> The **Volume Assertions** feature is available as part of the **Acryl Observe** module of Acryl Cloud.
+> The **Volume Assertions** feature is available as part of the **Acryl Observe** module of DataHub Cloud.
 > If you are interested in learning more about **Acryl Observe** or trying it out, please [visit our website](https://www.acryldata.io/observe).
 
 ## Introduction
@@ -23,9 +23,9 @@ changes to key metric definitions, etc. Often times, these changes break importa
 like reporting dashboards or data-driven product features.
 
 What if you could reduce the time to detect these incidents, so that the people responsible for the data were made aware of data
-issues _before_ anyone else? With Acryl DataHub **Volume Assertions**, you can.
+issues _before_ anyone else? With DataHub Cloud **Volume Assertions**, you can.
 
-Acryl DataHub allows users to define expectations about the normal volume, or size, of a particular warehouse Table,
+DataHub Cloud allows users to define expectations about the normal volume, or size, of a particular warehouse Table,
 and then monitor those expectations over time as the table grows and changes.
 
 In this article, we'll cover the basics of monitoring Volume Assertions - what they are, how to configure them, and more - so that you and your team can
@@ -43,7 +43,7 @@ Volume Assertions are currently supported for:
 4. Databricks
 5. DataHub Dataset Profile (collected via ingestion)
 
-Note that an Ingestion Source _must_ be configured with the data platform of your choice in Acryl DataHub's **Ingestion**
+Note that an Ingestion Source _must_ be configured with the data platform of your choice in DataHub Cloud's **Ingestion**
 tab.
 
 > Note that Volume Assertions are not yet supported if you are connecting to your warehouse
@@ -111,7 +111,7 @@ table that are following an abnormal pattern of growth.
 
 #### 3. Volume Source
 
-The **Volume Source**: This is the mechanism that Acryl DataHub should use to determine the table volume (row count). The supported
+The **Volume Source**: This is the mechanism that DataHub Cloud should use to determine the table volume (row count). The supported
 source types vary by the platform, but generally fall into these categories:
 
 - **Information Schema**: A system Table that is exposed by the Data Warehouse which contains live information about the Databases
@@ -226,11 +226,11 @@ To resume the assertion, simply click **Start**.
 
 ## Smart Assertions ⚡
 
-As part of the **Acryl Observe** module, Acryl DataHub also provides **Smart Assertions** out of the box. These are
+As part of the **Acryl Observe** module, DataHub Cloud also provides **Smart Assertions** out of the box. These are
 dynamic, AI-powered Volume Assertions that you can use to monitor the volume of important warehouse Tables, without
 requiring any manual setup.
 
-If Acryl DataHub is able to detect a pattern in the volume of a Snowflake, Redshift, BigQuery, or Databricks Table, you'll find
+If DataHub Cloud is able to detect a pattern in the volume of a Snowflake, Redshift, BigQuery, or Databricks Table, you'll find
 a recommended Smart Assertion under the `Validations` tab on the Table profile page:
 
 <p align="left">
@@ -245,7 +245,7 @@ Don't need it anymore? Smart Assertions can just as easily be turned off by clic
 
 ## Creating Volume Assertions via API
 
-Under the hood, Acryl DataHub implements Volume Assertion Monitoring using two concepts:
+Under the hood, DataHub Cloud implements Volume Assertion Monitoring using two concepts:
 
 - **Assertion**: The specific expectation for volume, e.g. "The table was changed int the past 7 hours"
   or "The table is changed on a schedule of every day by 8am". This is the "what".
diff --git a/docs/managed-datahub/operator-guide/setting-up-events-api-on-aws-eventbridge.md b/docs/managed-datahub/operator-guide/setting-up-events-api-on-aws-eventbridge.md
index c4a636e9c472d2..183944c90240fc 100644
--- a/docs/managed-datahub/operator-guide/setting-up-events-api-on-aws-eventbridge.md
+++ b/docs/managed-datahub/operator-guide/setting-up-events-api-on-aws-eventbridge.md
@@ -1,7 +1,7 @@
 ---
 description: >-
   This guide will walk through the configuration required to start receiving
-  Acryl DataHub events via AWS EventBridge.
+  DataHub Cloud events via AWS EventBridge.
 ---
 import FeatureAvailability from '@site/src/components/FeatureAvailability';
 
diff --git a/docs/managed-datahub/operator-guide/setting-up-remote-ingestion-executor.md b/docs/managed-datahub/operator-guide/setting-up-remote-ingestion-executor.md
index a0e5f01d37d84f..7a58363cea6589 100644
--- a/docs/managed-datahub/operator-guide/setting-up-remote-ingestion-executor.md
+++ b/docs/managed-datahub/operator-guide/setting-up-remote-ingestion-executor.md
@@ -17,15 +17,15 @@ The Remote Executor can now also be used for monitoring of ingestion sources.
 
 :::
 
-Acryl DataHub comes packaged with an Acryl-managed executor, which is hosted inside of Acryl's environment on your behalf. However, there are certain scenarios in which an Acryl-hosted executor is not ideal or sufficient to cover all of an organization's ingestion sources. For example, if an ingestion source is hosted behind a firewall or in an environment with strict access policies, then the Acryl executor might be unable to connect to it to extract metadata.
+DataHub Cloud comes packaged with an Acryl-managed executor, which is hosted inside of Acryl's environment on your behalf. However, there are certain scenarios in which an Acryl-hosted executor is not ideal or sufficient to cover all of an organization's ingestion sources. For example, if an ingestion source is hosted behind a firewall or in an environment with strict access policies, then the Acryl executor might be unable to connect to it to extract metadata.
 
-To accommodate these cases, Acryl supports configuring a Remote Ingestion Executor which can be deployed inside of your environment – whether that is on-prem or in cloud. This setup allows you to continue leveraging the Acryl DataHub console to create, schedule, and run both ingestion and assertion monitors, all while retaining network and credential isolation.
+To accommodate these cases, Acryl supports configuring a Remote Ingestion Executor which can be deployed inside of your environment – whether that is on-prem or in cloud. This setup allows you to continue leveraging the DataHub Cloud console to create, schedule, and run both ingestion and assertion monitors, all while retaining network and credential isolation.
 
 ## Deploying a Remote Executor
 
 :::note
 
-The Remote Ingestion Executor is only available for Managed DataHub. Setting up a new executor requires coordination with an Acryl representative.
+The Remote Ingestion Executor is only available for DataHub Cloud. Setting up a new executor requires coordination with an Acryl representative.
 
 :::
 
@@ -51,7 +51,7 @@ Steps you will need to perform on your end when instructed by your Acryl represe
 2. **Provision an Acryl Executor** (ECS)**:** Acryl team will provide a [Cloudformation Template](https://raw.githubusercontent.com/acryldata/datahub-cloudformation/master/remote-executor/datahub-executor.ecs.template.yaml) that you can run to provision an ECS cluster with a single remote ingestion task. It will also provision an AWS role for the task which grants the permissions necessary to read and delete from the private queue created for you, along with reading the secrets you've specified. At minimum, the template requires the following parameters:
    1. **Deployment Location:** The AWS VPC and subnet in which the Acryl Executor task is to be provisioned.
    2. **DataHub Personal Access Token**: A valid DataHub PAT. This can be generated inside of **Settings > Access Tokens** of DataHub web application. You can alternatively create a secret in AWS Secrets Manager and refer to that by ARN.
-   3. **Acryl DataHub URL**: The URL for your DataHub instance, e.g. `<your-company>.acryl.io/gms`. Note that you MUST enter the trailing /gms when configuring the executor.
+   3. **DataHub Cloud URL**: The URL for your DataHub instance, e.g. `<your-company>.acryl.io/gms`. Note that you MUST enter the trailing /gms when configuring the executor.
    4. **Acryl Remote Executor Version:** The version of the remote executor to deploy. This is converted into a container image tag. It will be set to the latest version of the executor by default.
    5. **Source Secrets:** The template accepts up to 10 named secrets which live inside your environment. Secrets are specified using the **OptionalSecrets** parameter in the following form: `SECRET_NAME=SECRET_ARN` with multiple separated by comma, e.g. `SECRET_NAME_1=SECRET_ARN_1,SECRET_NAME_2,SECRET_ARN_2.`
    6.  **Environment Variables:** The template accepts up to 10 arbitrary environment variables. These can be used to inject properties into your ingestion recipe from within your environment. Environment variables are specified using the **OptionalEnvVars** parameter in the following form: `ENV_VAR_NAME=ENV_VAR_VALUE` with multiple separated by comma, e.g. `ENV_VAR_NAME_1=ENV_VAR_VALUE_1,ENV_VAR_NAME_2,ENV_VAR_VALUE_2.`
@@ -114,7 +114,7 @@ The Helm chart [datahub-executor-worker](https://github.com/acryldata/datahub-ex
   ```
   kubectl create secret generic datahub-access-token-secret --from-literal=datahub-access-token-secret-key=<DATAHUB-ACCESS-TOKEN>
   ```
-5. **Acryl DataHub URL**: The URL for your DataHub instance, e.g. `https://<your-company>.acryl.io/gms`. Note that you MUST enter the trailing /gms when configuring the executor.
+5. **DataHub Cloud URL**: The URL for your DataHub instance, e.g. `https://<your-company>.acryl.io/gms`. Note that you MUST enter the trailing /gms when configuring the executor.
 6. **Acryl Remote Executor Version:** The version of the remote executor to deploy. This is converted into a container image tag.
 7. **Optionally** pass source secrets/environment variables as necessary. See [values.yaml](https://github.com/acryldata/datahub-executor-helm/blob/main/charts/datahub-executor-worker/values.yaml) file for all the available configurable options.
 8. **Install DataHub Executor chart as follows:**
diff --git a/docs/managed-datahub/release-notes/v_0_1_69.md b/docs/managed-datahub/release-notes/v_0_1_69.md
index 03939a6fe077b6..07c3af38499459 100644
--- a/docs/managed-datahub/release-notes/v_0_1_69.md
+++ b/docs/managed-datahub/release-notes/v_0_1_69.md
@@ -1,6 +1,6 @@
 # v0.1.69
 ---
-This is a scheduled release which contains all changes from OSS DataHub upto commit `10a31b1aa08138c616c0e44035f8f843bef13085`. In addition to all the features added in OSS DataHub below are Managed DataHub specific release notes.
+This is a scheduled release which contains all changes from OSS DataHub upto commit `10a31b1aa08138c616c0e44035f8f843bef13085`. In addition to all the features added in OSS DataHub below are DataHub Cloud specific release notes.
 
 Release Availability Date
 ---
diff --git a/docs/managed-datahub/release-notes/v_0_1_70.md b/docs/managed-datahub/release-notes/v_0_1_70.md
index 4e779fae4e303c..e80190f16bd2c7 100644
--- a/docs/managed-datahub/release-notes/v_0_1_70.md
+++ b/docs/managed-datahub/release-notes/v_0_1_70.md
@@ -1,6 +1,6 @@
 # v0.1.70
 ---
-This is a scheduled release which contains all changes from OSS DataHub upto commit `70659711a841bcce4bb1e0350027704b3783f6a5`. In addition to all the features added in OSS DataHub below are Managed DataHub specific release notes.
+This is a scheduled release which contains all changes from OSS DataHub upto commit `70659711a841bcce4bb1e0350027704b3783f6a5`. In addition to all the features added in OSS DataHub below are DataHub Cloud specific release notes.
 
 Release Availability Date
 ---
diff --git a/docs/managed-datahub/release-notes/v_0_3_4.md b/docs/managed-datahub/release-notes/v_0_3_4.md
new file mode 100644
index 00000000000000..381fcea816a0be
--- /dev/null
+++ b/docs/managed-datahub/release-notes/v_0_3_4.md
@@ -0,0 +1,39 @@
+# v0.3.4
+---
+
+Release Availability Date
+---
+29-Jul-2024
+
+Recommended CLI/SDK
+---
+- `v0.13.3.4` with release notes at https://github.com/acryldata/datahub/releases/tag/v0.13.3.4
+
+If you are using an older CLI/SDK version, then please upgrade it. This applies for all CLI/SDK usages, if you are using it through your terminal, GitHub Actions, Airflow, in Python SDK somewhere, Java SDK, etc. This is a strong recommendation to upgrade, as we keep on pushing fixes in the CLI, and it helps us support you better.
+
+## Release Changelog
+---
+
+- Product changes
+    - [notifications] You are now able to send test notifications to Slack user or group from settings.
+    - [cross-instance share] Share failures should now correctly display handle URLs.
+    - [siblings] Fixed siblings split feature when used for autocomplete; DataHub now disallows creation of assertions on merged sibling page; Fixed a bug in editing an assertion on a merged lineage node.
+    - [lineage - v2] Minor fixes to lineage counts and column-level-lineage resolution by respecting soft deleted assets in the lineage graph.
+
+
+- Ingestion changes
+    - Added support for SQL parsing in Looker source to more correctly represent column-level-lineage. Please report any edge cases issues to the Acryl team as we will be closely monitoring this integration.
+    - Added cli version in system metadata at the aspect level for tracking purposes.
+    - Added async REST sink capabilities in CLI.
+    - Added documentation on how to cleanup obsolete airflow pipelines and tasks from Datahub
+    - Soft deleted entities using the airflow plugin should now come back once they re-appear.
+    - Added 2 new connectors: Grafana & Azure Blob Storage (ABS)
+    - Glue to s3 lineage should now be generated automatically in the glue source.
+    - Added a snowflake queries source which does lineage, usage, queries, and operations all in one go.
+    - Added dataset profiling to PowerBI.
+    - Added a file source integration (S3 / Local Files), this is to add files as datasets. Not to be confused with the metadata file source that loads MCPs into DataHub.
+ 
+- Platform changes
+    - Added initial support for custom MCP mutator hooks.
+
+- Since `v0.3.3`, these changes from OSS DataHub have been pulled in: [OSS DataHub Changes](https://github.com/datahub-project/datahub/compare/92e9a5823bc14e81f0f21c55a68c493c3bbe87b9...8d874ad1e4bef9d7afbe20fb3cb457566a15c61c).
diff --git a/docs/managed-datahub/release-notes/v_0_3_5.md b/docs/managed-datahub/release-notes/v_0_3_5.md
new file mode 100644
index 00000000000000..468f2bd59a918b
--- /dev/null
+++ b/docs/managed-datahub/release-notes/v_0_3_5.md
@@ -0,0 +1,33 @@
+# v0.3.5
+---
+
+Release Availability Date
+---
+02-Sep-2024
+
+Recommended CLI/SDK
+---
+- `v0.14.0.2` with release notes at https://github.com/acryldata/datahub/releases/tag/v0.14.0.2
+
+If you are using an older CLI/SDK version, then please upgrade it. This applies for all CLI/SDK usages, if you are using it through your terminal, GitHub Actions, Airflow, in Python SDK somewhere, Java SDK, etc. This is a strong recommendation to upgrade, as we keep on pushing fixes in the CLI, and it helps us support you better.
+
+## Release Changelog
+---
+
+- All changes in https://github.com/datahub-project/datahub/releases/tag/v0.14.0.2
+    - Note Breaking Changes: https://datahubproject.io/docs/how/updating-datahub/#0140
+
+- Product changes
+    - Misc fixes and improvements for the Snowflake Tag Propagation Automation (Beta)
+    - Misc fixes and improvements for the Glossary Term Tag Propagation Automation (Beta)
+    - Misc fixes and improvements for the Column Docs Propagation Automation (Beta)
+    - Minor UX improvements on the groups profile page
+    - Add 'Explore All' button to search dropdown permanently
+    - Add toggle to filter out transformations in lineage viz
+    - Misc fixes and minor improvements around the subscriptions and slack integrations experience
+    - The new slack ingestion source enables one-click subscriptions for your users by automatically hydrating users' memberID. New users who sign up will also automatically have their memberIDs hydrated.
+        - Please reach out to the Acryl team to get assistance in setting this up.
+    - Installing or Re-installing the slackbot will now enable the `/datahub` command and ensure your `botToken` is compatible with the new slack ingestion source. You can reach out to the Acryl team for assistance with re-installation.
+
+- Ingestion changes
+    - New configuration for dbt lineage, "merges" sources with their sibling in viz: set `prefer_sql_parser_lineage` and `skip_sources_in_lineage` in ingestion; set flag `HIDE_DBT_SOURCE_IN_LINEAGE=true` in gms
diff --git a/docs/managed-datahub/slack/saas-slack-setup.md b/docs/managed-datahub/slack/saas-slack-setup.md
index 6db6a77c3a1f39..590f57d2c2e70c 100644
--- a/docs/managed-datahub/slack/saas-slack-setup.md
+++ b/docs/managed-datahub/slack/saas-slack-setup.md
@@ -94,7 +94,7 @@ Confirm you see the Basic Information Tab
 ![](https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/integrations/slack/slack_oauth_and_permissions.png)
 
 Here you'll find a “Bot User OAuth Token” which DataHub will need to communicate with your slack through the bot. 
-In the next steps, we'll show you how to configure the Slack Integration inside of Acryl DataHub.
+In the next steps, we'll show you how to configure the Slack Integration inside of DataHub Cloud.
 
 ## Configuring Notifications
 
diff --git a/docs/managed-datahub/slack/saas-slack-troubleshoot.md b/docs/managed-datahub/slack/saas-slack-troubleshoot.md
new file mode 100644
index 00000000000000..2a2fa3ed4ed7f1
--- /dev/null
+++ b/docs/managed-datahub/slack/saas-slack-troubleshoot.md
@@ -0,0 +1,71 @@
+import FeatureAvailability from '@site/src/components/FeatureAvailability';
+
+# Troubleshoot Slack Issues
+
+<FeatureAvailability saasOnly />
+
+This document provides troubleshooting guidance for the Slack integration. For more details on setting up the Slack integration, [click here](./saas-slack-setup.md).
+
+## Prerequisites - Testing the Slack Integration
+First and foremost, we recommend using the 'Send a test notification' feature to verify whether the issue is with the integration setup, slack's systems, or DataHub. The modal will provide a rich description of an error if there is one.
+You can access this feature either by going to the Notifications page in your settings, or a subscription drawer.
+<p align="center">
+  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/saas/slack/setup_7.png"/>
+</p>
+
+## Test notification failed with 'Re-Connect DataHub to Slack'
+There are several reasons why sending a test notification would fail. The description in the modal should give you insights as to what's broken and what you can do to resolve this issue.
+If you're seeing a message that recommends the DataHub admin to re-connect Slack to DataHub, you may want to try the following options:
+
+### Refresh the existing app installation (Recommended)
+:::note
+Whomever originally installed the Slack app will need to perform this.
+If they are unable to do this, you may need to go down the 'Install a new app' path below.
+:::
+1. Get your App Config tokens by following the first few steps outlined in the [installation guide](https://datahubproject.io/docs/managed-datahub/slack/saas-slack-setup/#step-by-step-guide). If it's showing expired tokens, feel free to delete them and create a new set.
+2. Paste them into their respective text inputs, and hit **'Re-connect'**
+<p align="center">
+  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/saas/slack/re_connect_1.png"/>
+</p>
+3. You will be re-directed to a page where you can finalize the app refresh.
+
+### Install a new app
+:::note
+If you choose to install a new app, your team will have to re-add the new bot into any private channels the old one was previously in.
+If you'd like support in getting a list of the private channels that are subscribed to Slack notifications on DataHub, please reach out to your customer success representative.
+:::
+
+1. Get your App Config tokens by following the first few steps outlined in the [installation guide](https://datahubproject.io/docs/managed-datahub/slack/saas-slack-setup/#step-by-step-guide). If it's showing expired tokens, feel free to delete them and create a new set.
+2. Paste them into their respective text inputs, and hit **'create a new installation'**
+<p align="center">
+  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/saas/slack/re_connect_1_1.png"/>
+</p>
+3. You will be re-directed to a page where you can finalize the app installation.
+4. Now to uninstall the old app, visit the **'Manage Apps'** page for your Slack workspace.
+<p align="center">
+  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/saas/slack/re_connect_2.png"/>
+</p>
+5. Find the previously installed DataHub Slack bot in the list of installed apps, and open it.
+6. Open the 'App details' page
+<p align="center">
+  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/saas/slack/re_connect_3.png"/>
+</p>
+6. Then, switch to the Configuration tab
+<p align="center">
+  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/saas/slack/re_connect_4.png"/>
+</p>
+6. Finally, scroll to the bottom to find the remove button.
+<p align="center">
+  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/saas/slack/re_connect_5.png"/>
+</p>
+
+
+## Test notification works, but not receiving notifications
+There are a few reasons why you may not receive notifications when you'd expect.
+
+### Actors do not receive notifications for their actions
+If you've subscribed to an entity, and then performed an action (i.e., raised an incident or added a tag), you will not be notified about your own action.
+
+### There is an issue with DataHub's systems
+If sending a test notification works, and you've verified that none of the above cases apply, then you should contact your DataHub Customer Success rep to help troubleshoot and resolve the issue. 
+
diff --git a/docs/managed-datahub/subscription-and-notification.md b/docs/managed-datahub/subscription-and-notification.md
index 0e456fe415b2c3..c3c31d5fed7e61 100644
--- a/docs/managed-datahub/subscription-and-notification.md
+++ b/docs/managed-datahub/subscription-and-notification.md
@@ -27,6 +27,9 @@ If you want to create and manage group-level Subscriptions for your team, you wi
 - Manage Group Notification Settings
 - Manage Group Subscriptions
 
+And to manage other user's subscriptions:
+- Manage User Subscriptions
+
 ## Using DataHub’s Subscriptions and Notifications Feature
 
 The first step is identifying the assets you want to subscribe to. 
@@ -163,6 +166,6 @@ To modify your subscription, use the dropdown menu next to the Subscribe button
 
 ## Reference
 
-- [DataHub Blog - Simplifying Data Monitoring & Management with Subscriptions and Notifications with Acryl DataHub](https://www.acryldata.io/blog/simplifying-data-monitoring-and-management-with-subscriptions-and-notifications-with-acryl-datahub)
+- [DataHub Blog - Simplifying Data Monitoring & Management with Subscriptions and Notifications with DataHub Cloud](https://www.acryldata.io/blog/simplifying-data-monitoring-and-management-with-subscriptions-and-notifications-with-acryl-datahub)
 - Video Guide - Getting Started with Subscription & Notifications
     <iframe width="560" height="315" src="https://www.loom.com/embed/f02fe71e09494b5e82904c8a47f06ac1?sid=ef041cb7-9c06-4926-8e0c-e948b1dc3af0" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
diff --git a/docs/managed-datahub/welcome-acryl.md b/docs/managed-datahub/welcome-acryl.md
index e292d6bb0ea11c..54222f0dbfe4eb 100644
--- a/docs/managed-datahub/welcome-acryl.md
+++ b/docs/managed-datahub/welcome-acryl.md
@@ -1,7 +1,7 @@
-# Getting Started with Acryl DataHub
+# Getting Started with DataHub Cloud
 
 
-Welcome to the Acryl DataHub! We at Acryl are on a mission to make data reliable by bringing clarity to the who, what, when, & how of your data ecosystem. We're thrilled to be on this journey with you; and cannot wait to see what we build together!
+Welcome to the DataHub Cloud! We at Acryl are on a mission to make data reliable by bringing clarity to the who, what, when, & how of your data ecosystem. We're thrilled to be on this journey with you; and cannot wait to see what we build together!
 
 Close communication is not only welcomed, but highly encouraged. For all questions, concerns, & feedback, please reach out to us directly at help@acryl.io. 
 
@@ -9,7 +9,7 @@ Close communication is not only welcomed, but highly encouraged. For all questio
 
 Before you go further, you'll need to have a DataHub instance provisioned. The Acryl integrations team will provide you the following once it has been deployed:
 
-1. The URL for your Acryl instance (https://your-domain-name.acryl.io)
+1. The URL for your DataHub Cloud instance (https://your-domain-name.acryl.io)
 2. Admin account credentials for logging into the DataHub UI
 
 Once you have these, you're ready to go.
@@ -20,10 +20,10 @@ If you wish to have a private connection to your DataHub instance, Acryl support
 
 ### Logging In
 
-Acryl DataHub currently supports the following means to log into a DataHub instance:
+DataHub Cloud currently supports the following means to log into a DataHub instance:
 
 1. **Admin account**: When your subscriptions starts someone will share with you a invite link to create your admin account. If that has not happened please reach out at help@acryl.io through your official email ID / slack connect setup with our team and our team will share with you the invite url.
-2. **OIDC**: Acryl DataHub also supports OIDC integration with the Identity Provider of your choice (Okta, Google, etc). To set this up, Acryl integrations team will require the following:
+2. **OIDC**: DataHub Cloud also supports OIDC integration with the Identity Provider of your choice (Okta, Google, etc). To set this up, Acryl integrations team will require the following:
 3. _Client ID_ - A unique identifier for your application with the identity provider
 4. _Client Secret_ - A shared secret to use for exchange between you and your identity provider. To send this over securely, we recommend using [onetimesecret.com](https://onetimesecret.com/) to create a link.
 5. _Discovery URL_ - A URL where the OIDC API of your identity provider can be discovered. This should suffixed by `.well-known/openid-configuration`. Sometimes, identity providers will not explicitly include this URL in their setup guides, though this endpoint will exist as per the OIDC specification. For more info see [here](http://openid.net/specs/openid-connect-discovery-1\_0.html).
@@ -38,14 +38,14 @@ _Note that we do not yet support LDAP or SAML authentication. Please let us know
 
 ## Getting Started
 
-Acryl DataHub is first and foremost a metadata Search & Discovery product. As such, the two most important parts of the experience are
+DataHub Cloud is first and foremost a metadata Search & Discovery product. As such, the two most important parts of the experience are
 
 1. Ingesting metadata
 2. Discovering metadata
 
 ### Ingesting Metadata
 
-Acryl DataHub employs a push-based metadata ingestion model. In practice, this means running an Acryl-provided agent inside your organization's infrastructure, and pushing that data out to your DataHub instance in the cloud. One benefit of this approach is that metadata can be aggregated across any number of distributed sources, regardless of form or location.
+DataHub Cloud employs a push-based metadata ingestion model. In practice, this means running an Acryl-provided agent inside your organization's infrastructure, and pushing that data out to your DataHub instance in the cloud. One benefit of this approach is that metadata can be aggregated across any number of distributed sources, regardless of form or location.
 
 This approach comes with another benefit: security. By managing your own instance of the agent, you can keep the secrets and credentials within your walled garden. Skip uploading secrets & keys into a third-party cloud tool. 
 
diff --git a/docs/quick-ingestion-guides/bigquery/setup.md b/docs/quick-ingestion-guides/bigquery/setup.md
index 10351d6572c531..96850f2deb68ed 100644
--- a/docs/quick-ingestion-guides/bigquery/setup.md
+++ b/docs/quick-ingestion-guides/bigquery/setup.md
@@ -38,7 +38,9 @@ Please refer to the BigQuery [Permissions](https://cloud.google.com/iam/docs/per
 You can always add/remove roles to Service Accounts later on. Please refer to the BigQuery [Manage access to projects, folders, and organizations](https://cloud.google.com/iam/docs/granting-changing-revoking-access) guide for more details.
 :::
 
-3. Create and download a [Service Account Key](https://cloud.google.com/iam/docs/creating-managing-service-account-keys). We will use this to set up authentication within DataHub.
+3. To filter projects based on the `project_labels` configuration, first visit [cloudresourcemanager.googleapis.com](https://console.developers.google.com/apis/api/cloudresourcemanager.googleapis.com/overview) and enable the `Cloud Resource Manager API`
+
+4. Create and download a [Service Account Key](https://cloud.google.com/iam/docs/creating-managing-service-account-keys). We will use this to set up authentication within DataHub.
 
 The key file looks like this:
 
diff --git a/docs/quick-ingestion-guides/tableau/setup.md b/docs/quick-ingestion-guides/tableau/setup.md
index b6ccaf2a9cc9e5..81767215d5bcd5 100644
--- a/docs/quick-ingestion-guides/tableau/setup.md
+++ b/docs/quick-ingestion-guides/tableau/setup.md
@@ -51,6 +51,14 @@ In order to configure ingestion from Tableau, you'll first have to enable Tablea
    - Open a command prompt as an admin on the initial node (*where TSM is installed*) in the cluster
    - Run the command: `tsm maintenance metadata-services enable`
 
+3. **Enable Derived Permissions:** This step is required only when the site is using external assets. For more detail, refer to the tableau documentation [Manage Permissions for External Assets](https://help.tableau.com/current/online/en-us/dm_perms_assets.htm).
+
+   Follow the below steps to enable the derived permissions:
+
+   -  Sign in to Tableau Cloud or Tableau Server as an admin.
+   -  From the left navigation pane, click Settings.
+   -  On the General tab, under Automatic Access to Metadata about Databases and Tables, select the `Automatically grant authorized users access to metadata about databases and tables` check box.
+
 
 ## Next Steps
 
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 507be6ba05471a..d132771fb2991b 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -3,11 +3,11 @@ import TabItem from '@theme/TabItem';
 
 # DataHub Quickstart Guide
 
-:::tip Managed DataHub
+:::tip DataHub Cloud
 
 This guide provides instructions on deploying the open source DataHub locally.
 If you're interested in a managed version, [Acryl Data](https://www.acryldata.io/product) provides a fully managed, premium version of DataHub. <br />
-**[Get Started with Managed DataHub](./managed-datahub/welcome-acryl.md)**
+**[Get Started with DataHub Cloud](./managed-datahub/welcome-acryl.md)**
 
 :::
 
diff --git a/docs/townhall-history.md b/docs/townhall-history.md
index 1b38a94725ee72..7a41d1a7dc5ac0 100644
--- a/docs/townhall-history.md
+++ b/docs/townhall-history.md
@@ -101,7 +101,7 @@ November Town Hall (in December!)
 
 **Agenda**
 
-- Conquer Data Governance with Acryl Data’s Metadata Tests - Learn how to tackle Data Governance with incremental, automation-driven governance using Metadata Tests provided in Acryl Data’s managed DataHub offering
+- Conquer Data Governance with Acryl Data’s Metadata Tests - Learn how to tackle Data Governance with incremental, automation-driven governance using Metadata Tests provided in Acryl Data’s DataHub Cloud offering
 - Community Case Study - The Grab Team shares how they are using DataHub for data discoverability, automated classification and governance workflows, data quality observability, and beyond!
 - Upcoming Ingestion Sources - We’ll tell you the ins and outs of our upcoming dbt Cloud and Unity Catalog connectors
 - Sneak Peek! Saved Views - Learn how you can soon use Saved Views to help end-users navigate entities in DataHub with more precision and focus
diff --git a/docs/ui-ingestion.md b/docs/ui-ingestion.md
index c7106013196d4b..521d8db26011cf 100644
--- a/docs/ui-ingestion.md
+++ b/docs/ui-ingestion.md
@@ -338,7 +338,7 @@ for the `datahub-actions` container and running `docker logs <container-id>`.
 There are valid cases for ingesting metadata without the UI-based ingestion scheduler. For example,
 
 - You have written a custom ingestion Source
-- Your data sources are not reachable on the network where DataHub is deployed. Managed DataHub users can use a [remote executor](managed-datahub/operator-guide/setting-up-remote-ingestion-executor.md) for remote UI-based ingestion.
+- Your data sources are not reachable on the network where DataHub is deployed. DataHub Cloud users can use a [remote executor](managed-datahub/operator-guide/setting-up-remote-ingestion-executor.md) for remote UI-based ingestion.
 - Your ingestion source requires context from a local filesystem (e.g. input files)
 - You want to distribute metadata ingestion among multiple producers / environments
 
diff --git a/docs/what-is-datahub/customer-stories.md b/docs/what-is-datahub/customer-stories.md
deleted file mode 100644
index 2745a8aca0d2f2..00000000000000
--- a/docs/what-is-datahub/customer-stories.md
+++ /dev/null
@@ -1,17 +0,0 @@
-import CustomerCardSection from '@site/src/pages/docs/_components/CustomerCardSection';
-
-# Customer Stories
-
-Meet the DataHub users who have shared their stories with us.
-
-:::note Share Your DataHub Journey
-We're excited to hear about your experience with DataHub. Share your story with us!
-<a
-    className='button button--secondary button--md'
-    style= {{ textDecoration: 'none' }}
-    href="/customer-stories-survey">
-Share Your Story
-</a>
-:::
-
-<CustomerCardSection />
diff --git a/docs/what/urn.md b/docs/what/urn.md
index fbead110afe0ac..122b93038d9dec 100644
--- a/docs/what/urn.md
+++ b/docs/what/urn.md
@@ -32,3 +32,13 @@ urn:li:corpuser:jdoe
 urn:li:dataset:(urn:li:dataPlatform:kafka,PageViewEvent,PROD)
 urn:li:dataset:(urn:li:dataPlatform:hdfs,PageViewEvent,EI)
 ```
+
+## Restrictions
+
+There are a few restrictions when creating an urn:
+
+1. Commas are reserved character in URN fields: `,`
+2. Parentheses are reserved characters in URN fields: `( , )`
+3. Colons are reserved characters in URN fields: `:`
+
+Please do not use these characters when creating or generating urns.
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/GraphRetriever.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/GraphRetriever.java
index 9757a10e3f3c28..cedaac25ffee9d 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/aspect/GraphRetriever.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/GraphRetriever.java
@@ -20,7 +20,7 @@ public interface GraphRetriever {
    * @param destinationEntityFilter
    * @param relationshipTypes
    * @param relationshipFilter
-   * @param sortCriterion
+   * @param sortCriteria
    * @param scrollId
    * @param count
    * @param startTimeMillis
@@ -35,7 +35,7 @@ RelatedEntitiesScrollResult scrollRelatedEntities(
       @Nonnull Filter destinationEntityFilter,
       @Nonnull List<String> relationshipTypes,
       @Nonnull RelationshipFilter relationshipFilter,
-      @Nonnull List<SortCriterion> sortCriterion,
+      @Nonnull List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       int count,
       @Nullable Long startTimeMillis,
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/batch/AspectsBatch.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/batch/AspectsBatch.java
index fc4ac90dfabad8..dc7934ad5cc193 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/aspect/batch/AspectsBatch.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/batch/AspectsBatch.java
@@ -199,6 +199,7 @@ default Map<String, Set<String>> getNewUrnAspectsMap(
 
   static <T> Map<String, Map<String, T>> merge(
       @Nonnull Map<String, Map<String, T>> a, @Nonnull Map<String, Map<String, T>> b) {
+
     Map<String, Map<String, T>> mergedMap = new HashMap<>();
     for (Map.Entry<String, Map<String, T>> entry :
         Stream.concat(a.entrySet().stream(), b.entrySet().stream()).collect(Collectors.toList())) {
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/batch/MCLItem.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/batch/MCLItem.java
index 9fd2d6c607342f..09da0a52ff0c30 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/aspect/batch/MCLItem.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/batch/MCLItem.java
@@ -69,4 +69,13 @@ default ChangeType getChangeType() {
   default AuditStamp getAuditStamp() {
     return getMetadataChangeLog().getCreated();
   }
+
+  /**
+   * Change detection for previous and new record template
+   *
+   * @return no change detection
+   */
+  default boolean isNoOp() {
+    return getPreviousRecordTemplate() == getRecordTemplate();
+  }
 }
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/models/graph/Edge.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/models/graph/Edge.java
index ca5e6d01103848..8777be57e1bd8f 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/aspect/models/graph/Edge.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/models/graph/Edge.java
@@ -13,6 +13,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -59,7 +60,7 @@ public Edge(
         null);
   }
 
-  public String toDocId() {
+  public String toDocId(@Nonnull String idHashAlgo) {
     StringBuilder rawDocId = new StringBuilder();
     rawDocId
         .append(getSource().toString())
@@ -73,7 +74,7 @@ public String toDocId() {
 
     try {
       byte[] bytesOfRawDocID = rawDocId.toString().getBytes(StandardCharsets.UTF_8);
-      MessageDigest md = MessageDigest.getInstance("MD5");
+      MessageDigest md = MessageDigest.getInstance(idHashAlgo);
       byte[] thedigest = md.digest(bytesOfRawDocID);
       return Base64.getEncoder().encodeToString(thedigest);
     } catch (NoSuchAlgorithmException e) {
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/models/extractor/FieldExtractor.java b/entity-registry/src/main/java/com/linkedin/metadata/models/extractor/FieldExtractor.java
index 899f66e66ea5ae..bef7782d8f7c9a 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/models/extractor/FieldExtractor.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/models/extractor/FieldExtractor.java
@@ -63,7 +63,7 @@ public static <T extends FieldSpec> Map<T, List<Object>> extractFields(
         } else {
           List<Object> valueList = (List<Object>) value.get();
           // If the field is a nested list of values, flatten it
-          for (int i = 0; i < numArrayWildcards - 1; i++) {
+          for (long i = 0; i < numArrayWildcards - 1; i++) {
             valueList =
                 valueList.stream()
                     .flatMap(v -> ((List<Object>) v).stream())
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/models/registry/ConfigEntityRegistry.java b/entity-registry/src/main/java/com/linkedin/metadata/models/registry/ConfigEntityRegistry.java
index 4238c333615ecf..8dd642f63dd975 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/models/registry/ConfigEntityRegistry.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/models/registry/ConfigEntityRegistry.java
@@ -52,7 +52,7 @@ public class ConfigEntityRegistry implements EntityRegistry {
   private final DataSchemaFactory dataSchemaFactory;
   @Getter private final PluginFactory pluginFactory;
 
-  @Nullable
+  @Getter @Nullable
   private BiFunction<PluginConfiguration, List<ClassLoader>, PluginFactory> pluginFactoryProvider;
 
   private final Map<String, EntitySpec> entityNameToSpec;
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/models/registry/SnapshotEntityRegistry.java b/entity-registry/src/main/java/com/linkedin/metadata/models/registry/SnapshotEntityRegistry.java
index c60f89c510cd7f..16df2d452a619e 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/models/registry/SnapshotEntityRegistry.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/models/registry/SnapshotEntityRegistry.java
@@ -22,6 +22,8 @@
 import com.linkedin.metadata.aspect.patch.template.dataset.UpstreamLineageTemplate;
 import com.linkedin.metadata.aspect.patch.template.form.FormInfoTemplate;
 import com.linkedin.metadata.aspect.patch.template.structuredproperty.StructuredPropertyDefinitionTemplate;
+import com.linkedin.metadata.aspect.plugins.PluginFactory;
+import com.linkedin.metadata.aspect.plugins.config.PluginConfiguration;
 import com.linkedin.metadata.models.AspectSpec;
 import com.linkedin.metadata.models.DefaultEntitySpec;
 import com.linkedin.metadata.models.EntitySpec;
@@ -32,8 +34,11 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import lombok.Getter;
 
 /**
  * Implementation of {@link EntityRegistry} that builds {@link DefaultEntitySpec} objects from the a
@@ -46,6 +51,9 @@ public class SnapshotEntityRegistry implements EntityRegistry {
   private final AspectTemplateEngine _aspectTemplateEngine;
   private final Map<String, AspectSpec> _aspectNameToSpec;
 
+  @Getter @Nullable
+  private BiFunction<PluginConfiguration, List<ClassLoader>, PluginFactory> pluginFactoryProvider;
+
   private static final SnapshotEntityRegistry INSTANCE = new SnapshotEntityRegistry();
 
   public SnapshotEntityRegistry() {
@@ -56,6 +64,19 @@ public SnapshotEntityRegistry() {
     entitySpecs = new ArrayList<>(entityNameToSpec.values());
     _aspectNameToSpec = populateAspectMap(entitySpecs);
     _aspectTemplateEngine = populateTemplateEngine(_aspectNameToSpec);
+    pluginFactoryProvider = null;
+  }
+
+  public SnapshotEntityRegistry(
+      BiFunction<PluginConfiguration, List<ClassLoader>, PluginFactory> pluginFactoryProvider) {
+    entityNameToSpec =
+        new EntitySpecBuilder()
+            .buildEntitySpecs(new Snapshot().schema()).stream()
+                .collect(Collectors.toMap(spec -> spec.getName().toLowerCase(), spec -> spec));
+    entitySpecs = new ArrayList<>(entityNameToSpec.values());
+    _aspectNameToSpec = populateAspectMap(entitySpecs);
+    _aspectTemplateEngine = populateTemplateEngine(_aspectNameToSpec);
+    this.pluginFactoryProvider = pluginFactoryProvider;
   }
 
   public SnapshotEntityRegistry(UnionTemplate snapshot) {
diff --git a/entity-registry/src/test/java/com/linkedin/metadata/aspect/plugins/PluginsTest.java b/entity-registry/src/test/java/com/linkedin/metadata/aspect/plugins/PluginsTest.java
index cecf21849f3aaa..b98df05d721ddb 100644
--- a/entity-registry/src/test/java/com/linkedin/metadata/aspect/plugins/PluginsTest.java
+++ b/entity-registry/src/test/java/com/linkedin/metadata/aspect/plugins/PluginsTest.java
@@ -6,6 +6,7 @@
 import com.datahub.test.TestEntityProfile;
 import com.linkedin.data.schema.annotation.PathSpecBasedSchemaAnnotationVisitor;
 import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.aspect.plugins.config.AspectPluginConfig;
 import com.linkedin.metadata.models.EntitySpec;
 import com.linkedin.metadata.models.EventSpec;
 import com.linkedin.metadata.models.registry.ConfigEntityRegistry;
@@ -262,23 +263,42 @@ public void testUnloadedMerge() throws EntityRegistryException {
     mergedEntityRegistry.apply(configEntityRegistry2);
 
     assertEquals(
-        mergedEntityRegistry.getAllAspectPayloadValidators().stream()
-            .filter(p -> p.getConfig().getSupportedOperations().contains("DELETE"))
+        mergedEntityRegistry
+            .getPluginFactory()
+            .getPluginConfiguration()
+            .getAspectPayloadValidators()
+            .stream()
+            .filter(AspectPluginConfig::isEnabled)
+            .filter(p -> p.getSupportedOperations().contains("DELETE"))
             .count(),
         1);
+
     assertEquals(
-        mergedEntityRegistry.getAllMutationHooks().stream()
-            .filter(p -> p.getConfig().getSupportedOperations().contains("DELETE"))
+        mergedEntityRegistry.getPluginFactory().getPluginConfiguration().getMutationHooks().stream()
+            .filter(AspectPluginConfig::isEnabled)
+            .filter(p -> p.getSupportedOperations().contains("DELETE"))
             .count(),
         1);
+
     assertEquals(
-        mergedEntityRegistry.getAllMCLSideEffects().stream()
-            .filter(p -> p.getConfig().getSupportedOperations().contains("DELETE"))
+        mergedEntityRegistry
+            .getPluginFactory()
+            .getPluginConfiguration()
+            .getMclSideEffects()
+            .stream()
+            .filter(AspectPluginConfig::isEnabled)
+            .filter(p -> p.getSupportedOperations().contains("DELETE"))
             .count(),
         1);
+
     assertEquals(
-        mergedEntityRegistry.getAllMCPSideEffects().stream()
-            .filter(p -> p.getConfig().getSupportedOperations().contains("DELETE"))
+        mergedEntityRegistry
+            .getPluginFactory()
+            .getPluginConfiguration()
+            .getMcpSideEffects()
+            .stream()
+            .filter(AspectPluginConfig::isEnabled)
+            .filter(p -> p.getSupportedOperations().contains("DELETE"))
             .count(),
         1);
   }
diff --git a/li-utils/src/main/java/com/datahub/util/RecordUtils.java b/li-utils/src/main/java/com/datahub/util/RecordUtils.java
index 8183ecc21ee27b..2d0881b6984e46 100644
--- a/li-utils/src/main/java/com/datahub/util/RecordUtils.java
+++ b/li-utils/src/main/java/com/datahub/util/RecordUtils.java
@@ -78,6 +78,14 @@ public static String toJsonString(@Nonnull RecordTemplate recordTemplate) {
     }
   }
 
+  public static String toJsonString(@Nonnull List<? extends RecordTemplate> recordTemplates) {
+    StringBuilder json = new StringBuilder();
+    for (RecordTemplate recordTemplate : recordTemplates) {
+      json.append(toJsonString(recordTemplate));
+    }
+    return json.toString();
+  }
+
   /**
    * Creates a {@link RecordTemplate} object from a serialized JSON string.
    *
@@ -99,6 +107,18 @@ public static <T extends RecordTemplate> T toRecordTemplate(
     return toRecordTemplate(type, dataMap);
   }
 
+  @Nonnull
+  public static DataMap toDataMap(@Nonnull String jsonString) {
+    DataMap dataMap;
+    try {
+      dataMap = DATA_TEMPLATE_CODEC.stringToMap(jsonString);
+    } catch (IOException e) {
+      throw new ModelConversionException("Failed to deserialize DataMap: " + jsonString);
+    }
+
+    return dataMap;
+  }
+
   /**
    * Creates a {@link RecordTemplate} object from a {@link DataMap}.
    *
diff --git a/li-utils/src/main/java/com/linkedin/metadata/Constants.java b/li-utils/src/main/java/com/linkedin/metadata/Constants.java
index 9a7b8287e2c6a7..e085a5876a42b0 100644
--- a/li-utils/src/main/java/com/linkedin/metadata/Constants.java
+++ b/li-utils/src/main/java/com/linkedin/metadata/Constants.java
@@ -27,7 +27,8 @@ public class Constants {
           ".", STRUCTURED_PROPERTY_MAPPING_FIELD, STRUCTURED_PROPERTY_MAPPING_VERSIONED_FIELD, "");
 
   // !!!!!!! IMPORTANT !!!!!!!
-  // This effectively sets the max aspect size to 16 MB. Used in deserialization of messages.
+  // This effectively sets the max aspect size to 16 MB. Used in deserialization
+  // of messages.
   // Without this the limit is
   // whatever Jackson is defaulting to (5 MB currently).
   public static final String MAX_JACKSON_STRING_SIZE = "16000000";
@@ -37,15 +38,18 @@ public class Constants {
   /** System Metadata */
   public static final String DEFAULT_RUN_ID = "no-run-id-provided";
 
-  // Forces indexing for no-ops, enabled for restore indices calls. Only considered in the no-op
+  // Forces indexing for no-ops, enabled for restore indices calls. Only
+  // considered in the no-op
   // case
   public static final String FORCE_INDEXING_KEY = "forceIndexing";
-  // Indicates an event source from an application with hooks that have already been processed and
+  // Indicates an event source from an application with hooks that have already
+  // been processed and
   // should not be reprocessed
   public static final String APP_SOURCE = "appSource";
 
   // App sources
   public static final String UI_SOURCE = "ui";
+  public static final String SYSTEM_UPDATE_SOURCE = "systemUpdate";
 
   /** Entities */
   public static final String CORP_USER_ENTITY_NAME = "corpuser";
@@ -82,6 +86,8 @@ public class Constants {
   public static final String DATAHUB_ROLE_ENTITY_NAME = "dataHubRole";
   public static final String POST_ENTITY_NAME = "post";
   public static final String SCHEMA_FIELD_ENTITY_NAME = "schemaField";
+  public static final String SCHEMA_FIELD_KEY_ASPECT = "schemaFieldKey";
+  public static final String SCHEMA_FIELD_ALIASES_ASPECT = "schemaFieldAliases";
   public static final String DATAHUB_STEP_STATE_ENTITY_NAME = "dataHubStepState";
   public static final String DATAHUB_VIEW_ENTITY_NAME = "dataHubView";
   public static final String QUERY_ENTITY_NAME = "query";
@@ -116,6 +122,7 @@ public class Constants {
   public static final String INPUT_FIELDS_ASPECT_NAME = "inputFields";
   public static final String EMBED_ASPECT_NAME = "embed";
   public static final String INCIDENTS_SUMMARY_ASPECT_NAME = "incidentsSummary";
+  public static final String DOCUMENTATION_ASPECT_NAME = "documentation";
 
   // User
   public static final String CORP_USER_KEY_ASPECT_NAME = "corpUserKey";
diff --git a/metadata-events/mxe-utils-avro/src/main/java/com/linkedin/metadata/EventUtils.java b/metadata-events/mxe-utils-avro/src/main/java/com/linkedin/metadata/EventUtils.java
index 8e92fd70b91dc1..18005dfb7b2a5d 100644
--- a/metadata-events/mxe-utils-avro/src/main/java/com/linkedin/metadata/EventUtils.java
+++ b/metadata-events/mxe-utils-avro/src/main/java/com/linkedin/metadata/EventUtils.java
@@ -81,7 +81,7 @@ public class EventUtils {
   private static final Schema RENAMED_PE_AVRO_SCHEMA =
       com.linkedin.pegasus2avro.mxe.PlatformEvent.SCHEMA$;
 
-  private static final Schema RENAMED_MCP_AVRO_SCHEMA =
+  public static final Schema RENAMED_MCP_AVRO_SCHEMA =
       com.linkedin.pegasus2avro.mxe.MetadataChangeProposal.SCHEMA$;
 
   public static final Schema RENAMED_MCL_AVRO_SCHEMA =
diff --git a/metadata-ingestion-modules/airflow-plugin/setup.py b/metadata-ingestion-modules/airflow-plugin/setup.py
index 6d5aa74b1d96ff..1587b4793fbf1d 100644
--- a/metadata-ingestion-modules/airflow-plugin/setup.py
+++ b/metadata-ingestion-modules/airflow-plugin/setup.py
@@ -16,7 +16,9 @@ def get_long_description():
 
 _version: str = package_metadata["__version__"]
 _self_pin = (
-    f"=={_version}" if not (_version.endswith("dev0") or "docker" in _version) else ""
+    f"=={_version}"
+    if not (_version.endswith(("dev0", "dev1")) or "docker" in _version)
+    else ""
 )
 
 
@@ -53,7 +55,7 @@ def get_long_description():
 mypy_stubs = {
     "types-dataclasses",
     "sqlalchemy-stubs",
-    "types-pkg_resources",
+    "types-setuptools",
     "types-six",
     "types-python-dateutil",
     "types-requests",
@@ -81,7 +83,8 @@ def get_long_description():
     "pytest-cov>=2.8.1",
     "tox",
     "tox-uv",
-    "deepdiff",
+    # Missing numpy requirement in 8.0.0
+    "deepdiff!=8.0.0",
     "tenacity",
     "build",
     "twine",
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_listener.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_listener.py
index c87f7f8fb1a8ee..d3727e41bb378e 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_listener.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_listener.py
@@ -143,6 +143,20 @@ def wrapper(*args, **kwargs):
     return cast(_F, wrapper)
 
 
+def _render_templates(task_instance: "TaskInstance") -> "TaskInstance":
+    # Render templates in a copy of the task instance.
+    # This is necessary to get the correct operator args in the extractors.
+    try:
+        task_instance_copy = copy.deepcopy(task_instance)
+        task_instance_copy.render_templates()
+        return task_instance_copy
+    except Exception as e:
+        logger.info(
+            f"Error rendering templates in DataHub listener. Jinja-templated variables will not be extracted correctly: {e}"
+        )
+        return task_instance
+
+
 class DataHubListener:
     __name__ = "DataHubListener"
 
@@ -360,15 +374,7 @@ def on_task_instance_running(
             f"DataHub listener got notification about task instance start for {task_instance.task_id}"
         )
 
-        # Render templates in a copy of the task instance.
-        # This is necessary to get the correct operator args in the extractors.
-        try:
-            task_instance = copy.deepcopy(task_instance)
-            task_instance.render_templates()
-        except Exception as e:
-            logger.info(
-                f"Error rendering templates in DataHub listener. Jinja-templated variables will not be extracted correctly: {e}"
-            )
+        task_instance = _render_templates(task_instance)
 
         # The type ignore is to placate mypy on Airflow 2.1.x.
         dagrun: "DagRun" = task_instance.dag_run  # type: ignore[attr-defined]
@@ -459,8 +465,17 @@ def on_task_instance_finish(
         self, task_instance: "TaskInstance", status: InstanceRunResult
     ) -> None:
         dagrun: "DagRun" = task_instance.dag_run  # type: ignore[attr-defined]
-        task = self._task_holder.get_task(task_instance) or task_instance.task
+
+        task_instance = _render_templates(task_instance)
+
+        # We must prefer the task attribute, in case modifications to the task's inlets/outlets
+        # were made by the execute() method.
+        if getattr(task_instance, "task", None):
+            task = task_instance.task
+        else:
+            task = self._task_holder.get_task(task_instance)
         assert task is not None
+
         dag: "DAG" = task.dag  # type: ignore[assignment]
 
         datajob = AirflowGenerator.generate_datajob(
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin.py
index 437c42713ea015..137cf97f69280a 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin.py
@@ -4,6 +4,7 @@
 
 from airflow.plugins_manager import AirflowPlugin
 
+from datahub_airflow_plugin import __package_name__
 from datahub_airflow_plugin._airflow_compat import AIRFLOW_PATCHED
 from datahub_airflow_plugin._airflow_shims import (
     HAS_AIRFLOW_LISTENER_API,
@@ -23,7 +24,10 @@
         from openlineage.airflow.utils import try_import_from_string  # noqa: F401
     except ImportError:
         # If v2 plugin dependencies are not installed, we fall back to v1.
-        logger.debug("Falling back to v1 plugin due to missing dependencies.")
+        logger.warning(
+            "Falling back to the v1 DataHub plugin due to missing dependencies. "
+            f"Please install {__package_name__}[plugin-v2] to fix this."
+        )
         _USE_AIRFLOW_LISTENER_INTERFACE = False
 
 
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py
index ace7669bfa998e..db47f37bed562e 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py
@@ -7,7 +7,6 @@
 from airflow.lineage import PIPELINE_OUTLETS
 from airflow.models.baseoperator import BaseOperator
 from airflow.utils.module_loading import import_string
-from cattr import structure
 from datahub.api.entities.dataprocess.dataprocess_instance import InstanceRunResult
 from datahub.telemetry import telemetry
 
@@ -52,6 +51,7 @@ def get_task_inlets_advanced(task: BaseOperator, context: Any) -> Iterable[Any]:
         )
 
         from airflow.lineage import AUTO
+        from cattr import structure
 
         # pick up unique direct upstream task_ids if AUTO is specified
         if AUTO.upper() in task_inlets or AUTO.lower() in task_inlets:
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/integration/dags/custom_operator_dag.py b/metadata-ingestion-modules/airflow-plugin/tests/integration/dags/custom_operator_dag.py
new file mode 100644
index 00000000000000..b31226b7b4ceeb
--- /dev/null
+++ b/metadata-ingestion-modules/airflow-plugin/tests/integration/dags/custom_operator_dag.py
@@ -0,0 +1,74 @@
+import logging
+from datetime import datetime, timedelta
+from typing import Any, List, Tuple
+
+from airflow import DAG
+from airflow.models.baseoperator import BaseOperator
+
+from datahub_airflow_plugin.entities import Dataset
+
+logger = logging.getLogger(__name__)
+
+
+class CustomOperator(BaseOperator):
+    def __init__(self, name, **kwargs):
+        super().__init__(**kwargs)
+        self.name = name
+
+    def execute(self, context):
+        """
+        Other code....
+        """
+        logger.info("executing other code here")
+
+        input_tables = ["mydb.schema.tableA", "mydb.schema.tableB"]
+        output_tables = ["mydb.schema.tableD"]
+
+        inlets, outlets = self._get_sf_lineage(input_tables, output_tables)
+
+        context["ti"].task.inlets = inlets
+        context["ti"].task.outlets = outlets
+
+    @staticmethod
+    def _get_sf_lineage(
+        input_tables: List[str], output_tables: List[str]
+    ) -> Tuple[List[Any], List[Any]]:
+        """
+        Get lineage tables from Snowflake.
+        """
+        inlets: List[Dataset] = []
+        outlets: List[Dataset] = []
+
+        for table in input_tables:
+            inlets.append(Dataset(platform="snowflake", name=table))
+
+        for table in output_tables:
+            outlets.append(Dataset(platform="snowflake", name=table))
+
+        return inlets, outlets
+
+
+default_args = {
+    "owner": "airflow",
+    "depends_on_past": False,
+    "start_date": datetime(2023, 1, 1),
+    "email": ["jdoe@example.com"],
+    "email_on_failure": False,
+    "execution_timeout": timedelta(minutes=5),
+}
+
+
+with DAG(
+    "custom_operator_dag",
+    default_args=default_args,
+    description="An example dag with custom operator",
+    schedule_interval=None,
+    tags=["example_tag"],
+    catchup=False,
+    default_view="tree",
+) as dag:
+    custom_task = CustomOperator(
+        task_id="custom_task_id",
+        name="custom_name",
+        dag=dag,
+    )
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v1_basic_iolets.json b/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v1_basic_iolets.json
index ca0d9d04c82a9e..95f793ba695380 100644
--- a/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v1_basic_iolets.json
+++ b/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v1_basic_iolets.json
@@ -22,6 +22,17 @@
         }
     }
 },
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(airflow,basic_iolets,prod)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    }
+},
 {
     "entityType": "dataFlow",
     "entityUrn": "urn:li:dataFlow:(airflow,basic_iolets,prod)",
@@ -85,6 +96,17 @@
         }
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,basic_iolets,prod),run_data_task)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    }
+},
 {
     "entityType": "dataJob",
     "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,basic_iolets,prod),run_data_task)",
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v1_simple_dag.json b/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v1_simple_dag.json
index f13e9bd3dac078..191ea72e9f048f 100644
--- a/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v1_simple_dag.json
+++ b/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v1_simple_dag.json
@@ -23,6 +23,17 @@
         }
     }
 },
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(airflow,simple_dag,prod)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    }
+},
 {
     "entityType": "dataFlow",
     "entityUrn": "urn:li:dataFlow:(airflow,simple_dag,prod)",
@@ -86,6 +97,17 @@
         }
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,simple_dag,prod),task_1)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    }
+},
 {
     "entityType": "dataJob",
     "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,simple_dag,prod),task_1)",
@@ -540,6 +562,17 @@
         }
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,simple_dag,prod),run_another_data_task)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    }
+},
 {
     "entityType": "dataJob",
     "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,simple_dag,prod),run_another_data_task)",
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v2_custom_operator_dag.json b/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v2_custom_operator_dag.json
new file mode 100644
index 00000000000000..b81466930ed41a
--- /dev/null
+++ b/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v2_custom_operator_dag.json
@@ -0,0 +1,365 @@
+[
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(airflow,custom_operator_dag,prod)",
+    "changeType": "UPSERT",
+    "aspectName": "dataFlowInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "_access_control": "None",
+                "catchup": "False",
+                "description": "'An example dag with custom operator'",
+                "doc_md": "None",
+                "fileloc": "<fileloc>",
+                "is_paused_upon_creation": "None",
+                "start_date": "None",
+                "tags": "['example_tag']",
+                "timezone": "Timezone('UTC')"
+            },
+            "externalUrl": "http://airflow.example.com/tree?dag_id=custom_operator_dag",
+            "name": "custom_operator_dag",
+            "description": "An example dag with custom operator"
+        }
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(airflow,custom_operator_dag,prod)",
+    "changeType": "UPSERT",
+    "aspectName": "ownership",
+    "aspect": {
+        "json": {
+            "owners": [
+                {
+                    "owner": "urn:li:corpuser:airflow",
+                    "type": "DEVELOPER",
+                    "source": {
+                        "type": "SERVICE"
+                    }
+                }
+            ],
+            "ownerTypes": {},
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:airflow"
+            }
+        }
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(airflow,custom_operator_dag,prod)",
+    "changeType": "UPSERT",
+    "aspectName": "globalTags",
+    "aspect": {
+        "json": {
+            "tags": [
+                {
+                    "tag": "urn:li:tag:example_tag"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(airflow,custom_operator_dag,prod)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    }
+},
+{
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:example_tag",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(airflow,custom_operator_dag,prod)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "custom_operator_dag"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "dataJobInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "depends_on_past": "False",
+                "email": "['jdoe@example.com']",
+                "label": "'custom_task_id'",
+                "execution_timeout": "datetime.timedelta(seconds=300)",
+                "sla": "None",
+                "task_id": "'custom_task_id'",
+                "trigger_rule": "<TriggerRule.ALL_SUCCESS: 'all_success'>",
+                "wait_for_downstream": "False",
+                "downstream_task_ids": "[]",
+                "inlets": "[]",
+                "outlets": "[]",
+                "openlineage_run_facet_unknownSourceAttribute": "{\"_producer\": \"https://github.com/OpenLineage/OpenLineage/tree/1.18.0/integration/airflow\", \"_schemaURL\": \"https://openlineage.io/spec/2-0-2/OpenLineage.json#/$defs/BaseFacet\", \"unknownItems\": [{\"name\": \"CustomOperator\", \"properties\": {\"depends_on_past\": false, \"downstream_task_ids\": \"[]\", \"execution_timeout\": \"<<non-serializable: timedelta>>\", \"executor_config\": {}, \"ignore_first_depends_on_past\": true, \"is_setup\": false, \"is_teardown\": false, \"mapped\": false, \"operator_class\": \"custom_operator.CustomOperator\", \"owner\": \"airflow\", \"priority_weight\": 1, \"queue\": \"default\", \"retries\": 0, \"retry_exponential_backoff\": false, \"task_id\": \"custom_task_id\", \"trigger_rule\": \"all_success\", \"upstream_task_ids\": \"[]\", \"wait_for_downstream\": false, \"wait_for_past_depends_before_skipping\": false, \"weight_rule\": \"downstream\"}, \"type\": \"operator\"}]}"
+            },
+            "externalUrl": "http://airflow.example.com/taskinstance/list/?flt1_dag_id_equals=custom_operator_dag&_flt_3_task_id=custom_task_id",
+            "name": "custom_task_id",
+            "type": {
+                "string": "COMMAND"
+            }
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "dataJobInputOutput",
+    "aspect": {
+        "json": {
+            "inputDatasets": [],
+            "outputDatasets": [],
+            "inputDatajobs": [],
+            "fineGrainedLineages": []
+        }
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:07a4aaeffa3875a24cccd1fec6fc7c8c",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "run_id": "manual_run_test",
+                "duration": "<duration>",
+                "start_date": "<start_date>",
+                "end_date": "<end_date>",
+                "execution_date": "2023-09-27 21:34:38+00:00",
+                "try_number": "0",
+                "max_tries": "0",
+                "external_executor_id": "None",
+                "state": "running",
+                "operator": "CustomOperator",
+                "priority_weight": "1",
+                "log_url": "http://airflow.example.com/log?execution_date=2023-09-27T21%3A34%3A38%2B00%3A00&task_id=custom_task_id&dag_id=custom_operator_dag&map_index=-1",
+                "orchestrator": "airflow",
+                "dag_id": "custom_operator_dag",
+                "task_id": "custom_task_id"
+            },
+            "externalUrl": "http://airflow.example.com/log?execution_date=2023-09-27T21%3A34%3A38%2B00%3A00&task_id=custom_task_id&dag_id=custom_operator_dag&map_index=-1",
+            "name": "custom_operator_dag_custom_task_id_manual_run_test",
+            "type": "BATCH_AD_HOC",
+            "created": {
+                "time": 1722943444074,
+                "actor": "urn:li:corpuser:datahub"
+            }
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "ownership",
+    "aspect": {
+        "json": {
+            "owners": [
+                {
+                    "owner": "urn:li:corpuser:airflow",
+                    "type": "DEVELOPER",
+                    "source": {
+                        "type": "SERVICE"
+                    }
+                }
+            ],
+            "ownerTypes": {},
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:airflow"
+            }
+        }
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:07a4aaeffa3875a24cccd1fec6fc7c8c",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRelationships",
+    "aspect": {
+        "json": {
+            "parentTemplate": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+            "upstreamInstances": []
+        }
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:07a4aaeffa3875a24cccd1fec6fc7c8c",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1722943444074,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "STARTED",
+            "attempt": 1
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableA,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetKey",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake",
+            "name": "mydb.schema.tableA",
+            "origin": "PROD"
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "dataJobInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "depends_on_past": "False",
+                "email": "['jdoe@example.com']",
+                "label": "'custom_task_id'",
+                "execution_timeout": "datetime.timedelta(seconds=300)",
+                "sla": "None",
+                "task_id": "'custom_task_id'",
+                "trigger_rule": "<TriggerRule.ALL_SUCCESS: 'all_success'>",
+                "wait_for_downstream": "False",
+                "downstream_task_ids": "[]",
+                "inlets": "[Dataset(platform='snowflake', name='mydb.schema.tableA', env='PROD', platform_instance=None), Dataset(platform='snowflake', name='mydb.schema.tableB', env='PROD', platform_instance=None)]",
+                "outlets": "[Dataset(platform='snowflake', name='mydb.schema.tableD', env='PROD', platform_instance=None)]",
+                "openlineage_run_facet_unknownSourceAttribute": "{\"_producer\": \"https://github.com/OpenLineage/OpenLineage/tree/1.18.0/integration/airflow\", \"_schemaURL\": \"https://openlineage.io/spec/2-0-2/OpenLineage.json#/$defs/BaseFacet\", \"unknownItems\": [{\"name\": \"CustomOperator\", \"properties\": {\"depends_on_past\": false, \"downstream_task_ids\": \"[]\", \"execution_timeout\": \"<<non-serializable: timedelta>>\", \"executor_config\": {}, \"ignore_first_depends_on_past\": true, \"is_setup\": false, \"is_teardown\": false, \"mapped\": false, \"operator_class\": \"custom_operator.CustomOperator\", \"owner\": \"airflow\", \"priority_weight\": 1, \"queue\": \"default\", \"retries\": 0, \"retry_exponential_backoff\": false, \"task_id\": \"custom_task_id\", \"trigger_rule\": \"all_success\", \"upstream_task_ids\": \"[]\", \"wait_for_downstream\": false, \"wait_for_past_depends_before_skipping\": false, \"weight_rule\": \"downstream\"}, \"type\": \"operator\"}]}"
+            },
+            "externalUrl": "http://airflow.example.com/taskinstance/list/?flt1_dag_id_equals=custom_operator_dag&_flt_3_task_id=custom_task_id",
+            "name": "custom_task_id",
+            "type": {
+                "string": "COMMAND"
+            }
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableD,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetKey",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake",
+            "name": "mydb.schema.tableD",
+            "origin": "PROD"
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "globalTags",
+    "aspect": {
+        "json": {
+            "tags": [
+                {
+                    "tag": "urn:li:tag:example_tag"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "dataJobInputOutput",
+    "aspect": {
+        "json": {
+            "inputDatasets": [
+                "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableA,PROD)",
+                "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableB,PROD)"
+            ],
+            "outputDatasets": [
+                "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableD,PROD)"
+            ],
+            "inputDatajobs": [],
+            "fineGrainedLineages": []
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableB,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetKey",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake",
+            "name": "mydb.schema.tableB",
+            "origin": "PROD"
+        }
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:07a4aaeffa3875a24cccd1fec6fc7c8c",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1722943444263,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResultType": "airflow"
+            }
+        }
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v2_custom_operator_dag_no_dag_listener.json b/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v2_custom_operator_dag_no_dag_listener.json
new file mode 100644
index 00000000000000..019122600aedbc
--- /dev/null
+++ b/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v2_custom_operator_dag_no_dag_listener.json
@@ -0,0 +1,404 @@
+[
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(airflow,custom_operator_dag,prod)",
+    "changeType": "UPSERT",
+    "aspectName": "dataFlowInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "_access_control": "None",
+                "catchup": "False",
+                "description": "'An example dag with custom operator'",
+                "doc_md": "None",
+                "fileloc": "<fileloc>",
+                "is_paused_upon_creation": "None",
+                "start_date": "None",
+                "tags": "['example_tag']",
+                "timezone": "Timezone('UTC')"
+            },
+            "externalUrl": "http://airflow.example.com/tree?dag_id=custom_operator_dag",
+            "name": "custom_operator_dag",
+            "description": "An example dag with custom operator"
+        }
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(airflow,custom_operator_dag,prod)",
+    "changeType": "UPSERT",
+    "aspectName": "ownership",
+    "aspect": {
+        "json": {
+            "owners": [
+                {
+                    "owner": "urn:li:corpuser:airflow",
+                    "type": "DEVELOPER",
+                    "source": {
+                        "type": "SERVICE"
+                    }
+                }
+            ],
+            "ownerTypes": {},
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:airflow"
+            }
+        }
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(airflow,custom_operator_dag,prod)",
+    "changeType": "UPSERT",
+    "aspectName": "globalTags",
+    "aspect": {
+        "json": {
+            "tags": [
+                {
+                    "tag": "urn:li:tag:example_tag"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(airflow,custom_operator_dag,prod)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    }
+},
+{
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:example_tag",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(airflow,custom_operator_dag,prod)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "custom_operator_dag"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "dataJobInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "depends_on_past": "False",
+                "email": "['jdoe@example.com']",
+                "label": "'custom_task_id'",
+                "execution_timeout": "datetime.timedelta(seconds=300)",
+                "sla": "None",
+                "task_id": "'custom_task_id'",
+                "trigger_rule": "<TriggerRule.ALL_SUCCESS: 'all_success'>",
+                "wait_for_downstream": "False",
+                "downstream_task_ids": "[]",
+                "inlets": "[]",
+                "outlets": "[]",
+                "openlineage_run_facet_unknownSourceAttribute": "{\"_producer\": \"https://github.com/OpenLineage/OpenLineage/tree/1.18.0/integration/airflow\", \"_schemaURL\": \"https://openlineage.io/spec/2-0-2/OpenLineage.json#/$defs/BaseFacet\", \"unknownItems\": [{\"name\": \"CustomOperator\", \"properties\": {\"depends_on_past\": false, \"downstream_task_ids\": \"[]\", \"execution_timeout\": \"<<non-serializable: timedelta>>\", \"executor_config\": {}, \"ignore_first_depends_on_past\": true, \"mapped\": false, \"operator_class\": \"custom_operator.CustomOperator\", \"owner\": \"airflow\", \"priority_weight\": 1, \"queue\": \"default\", \"retries\": 0, \"retry_exponential_backoff\": false, \"task_id\": \"custom_task_id\", \"trigger_rule\": \"all_success\", \"upstream_task_ids\": \"[]\", \"wait_for_downstream\": false, \"weight_rule\": \"downstream\"}, \"type\": \"operator\"}]}"
+            },
+            "externalUrl": "http://airflow.example.com/taskinstance/list/?flt1_dag_id_equals=custom_operator_dag&_flt_3_task_id=custom_task_id",
+            "name": "custom_task_id",
+            "type": {
+                "string": "COMMAND"
+            }
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "dataJobInputOutput",
+    "aspect": {
+        "json": {
+            "inputDatasets": [],
+            "outputDatasets": [],
+            "inputDatajobs": [],
+            "fineGrainedLineages": []
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "ownership",
+    "aspect": {
+        "json": {
+            "owners": [
+                {
+                    "owner": "urn:li:corpuser:airflow",
+                    "type": "DEVELOPER",
+                    "source": {
+                        "type": "SERVICE"
+                    }
+                }
+            ],
+            "ownerTypes": {},
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:airflow"
+            }
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "globalTags",
+    "aspect": {
+        "json": {
+            "tags": [
+                {
+                    "tag": "urn:li:tag:example_tag"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:07a4aaeffa3875a24cccd1fec6fc7c8c",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "run_id": "manual_run_test",
+                "duration": "<duration>",
+                "start_date": "<start_date>",
+                "end_date": "<end_date>",
+                "execution_date": "2023-09-27 21:34:38+00:00",
+                "try_number": "0",
+                "max_tries": "0",
+                "external_executor_id": "None",
+                "state": "running",
+                "operator": "CustomOperator",
+                "priority_weight": "1",
+                "log_url": "http://airflow.example.com/log?execution_date=2023-09-27T21%3A34%3A38%2B00%3A00&task_id=custom_task_id&dag_id=custom_operator_dag&map_index=-1",
+                "orchestrator": "airflow",
+                "dag_id": "custom_operator_dag",
+                "task_id": "custom_task_id"
+            },
+            "externalUrl": "http://airflow.example.com/log?execution_date=2023-09-27T21%3A34%3A38%2B00%3A00&task_id=custom_task_id&dag_id=custom_operator_dag&map_index=-1",
+            "name": "custom_operator_dag_custom_task_id_manual_run_test",
+            "type": "BATCH_AD_HOC",
+            "created": {
+                "time": 1723716446564,
+                "actor": "urn:li:corpuser:datahub"
+            }
+        }
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:07a4aaeffa3875a24cccd1fec6fc7c8c",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRelationships",
+    "aspect": {
+        "json": {
+            "parentTemplate": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+            "upstreamInstances": []
+        }
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:07a4aaeffa3875a24cccd1fec6fc7c8c",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1723716446564,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "STARTED",
+            "attempt": 1
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "dataJobInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "depends_on_past": "False",
+                "email": "['jdoe@example.com']",
+                "label": "'custom_task_id'",
+                "execution_timeout": "datetime.timedelta(seconds=300)",
+                "sla": "None",
+                "task_id": "'custom_task_id'",
+                "trigger_rule": "<TriggerRule.ALL_SUCCESS: 'all_success'>",
+                "wait_for_downstream": "False",
+                "downstream_task_ids": "[]",
+                "inlets": "[Dataset(platform='snowflake', name='mydb.schema.tableA', env='PROD', platform_instance=None), Dataset(platform='snowflake', name='mydb.schema.tableB', env='PROD', platform_instance=None)]",
+                "outlets": "[Dataset(platform='snowflake', name='mydb.schema.tableD', env='PROD', platform_instance=None)]",
+                "openlineage_run_facet_unknownSourceAttribute": "{\"_producer\": \"https://github.com/OpenLineage/OpenLineage/tree/1.18.0/integration/airflow\", \"_schemaURL\": \"https://openlineage.io/spec/2-0-2/OpenLineage.json#/$defs/BaseFacet\", \"unknownItems\": [{\"name\": \"CustomOperator\", \"properties\": {\"depends_on_past\": false, \"downstream_task_ids\": \"[]\", \"execution_timeout\": \"<<non-serializable: timedelta>>\", \"executor_config\": {}, \"ignore_first_depends_on_past\": true, \"mapped\": false, \"operator_class\": \"custom_operator.CustomOperator\", \"owner\": \"airflow\", \"priority_weight\": 1, \"queue\": \"default\", \"retries\": 0, \"retry_exponential_backoff\": false, \"task_id\": \"custom_task_id\", \"trigger_rule\": \"all_success\", \"upstream_task_ids\": \"[]\", \"wait_for_downstream\": false, \"weight_rule\": \"downstream\"}, \"type\": \"operator\"}]}"
+            },
+            "externalUrl": "http://airflow.example.com/taskinstance/list/?flt1_dag_id_equals=custom_operator_dag&_flt_3_task_id=custom_task_id",
+            "name": "custom_task_id",
+            "type": {
+                "string": "COMMAND"
+            }
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "dataJobInputOutput",
+    "aspect": {
+        "json": {
+            "inputDatasets": [
+                "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableA,PROD)",
+                "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableB,PROD)"
+            ],
+            "outputDatasets": [
+                "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableD,PROD)"
+            ],
+            "inputDatajobs": [],
+            "fineGrainedLineages": []
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableA,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetKey",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake",
+            "name": "mydb.schema.tableA",
+            "origin": "PROD"
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableB,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetKey",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake",
+            "name": "mydb.schema.tableB",
+            "origin": "PROD"
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableD,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetKey",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake",
+            "name": "mydb.schema.tableD",
+            "origin": "PROD"
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "ownership",
+    "aspect": {
+        "json": {
+            "owners": [
+                {
+                    "owner": "urn:li:corpuser:airflow",
+                    "type": "DEVELOPER",
+                    "source": {
+                        "type": "SERVICE"
+                    }
+                }
+            ],
+            "ownerTypes": {},
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:airflow"
+            }
+        }
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,custom_operator_dag,prod),custom_task_id)",
+    "changeType": "UPSERT",
+    "aspectName": "globalTags",
+    "aspect": {
+        "json": {
+            "tags": [
+                {
+                    "tag": "urn:li:tag:example_tag"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:07a4aaeffa3875a24cccd1fec6fc7c8c",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1723716446701,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResultType": "airflow"
+            }
+        }
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v2_sqlite_operator.json b/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v2_sqlite_operator.json
index e7902d165051b1..4bc34b7b0d3ce5 100644
--- a/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v2_sqlite_operator.json
+++ b/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v2_sqlite_operator.json
@@ -350,8 +350,8 @@
         "json": {
             "timestampMillis": 1717179743558,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "STARTED",
             "attempt": 1
@@ -367,8 +367,8 @@
         "json": {
             "timestampMillis": 1717179743932,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "actor": "urn:li:corpuser:airflow",
             "operationType": "CREATE",
@@ -552,8 +552,8 @@
         "json": {
             "timestampMillis": 1717179743960,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "COMPLETE",
             "result": {
@@ -742,8 +742,8 @@
         "json": {
             "timestampMillis": 1717179748679,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "STARTED",
             "attempt": 1
@@ -759,8 +759,8 @@
         "json": {
             "timestampMillis": 1717179749258,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "actor": "urn:li:corpuser:airflow",
             "operationType": "CREATE",
@@ -875,8 +875,8 @@
         "json": {
             "timestampMillis": 1717179749324,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "COMPLETE",
             "result": {
@@ -1161,8 +1161,8 @@
         "json": {
             "timestampMillis": 1717179757397,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "STARTED",
             "attempt": 1
@@ -1178,8 +1178,8 @@
         "json": {
             "timestampMillis": 1717179758424,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "actor": "urn:li:corpuser:airflow",
             "operationType": "CREATE",
@@ -1420,8 +1420,8 @@
         "json": {
             "timestampMillis": 1717179758496,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "COMPLETE",
             "result": {
@@ -1483,10 +1483,10 @@
     "aspectName": "dataJobInputOutput",
     "aspect": {
         "json": {
-            "inputDatasets": [
+            "inputDatasets": [],
+            "outputDatasets": [
                 "urn:li:dataset:(urn:li:dataPlatform:sqlite,public.costs,PROD)"
             ],
-            "outputDatasets": [],
             "inputDatajobs": [
                 "urn:li:dataJob:(urn:li:dataFlow:(airflow,sqlite_operator,prod),transform_cost_table)"
             ],
@@ -1555,6 +1555,19 @@
         }
     }
 },
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:07285de22276959612189d51336cc21a",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceOutput",
+    "aspect": {
+        "json": {
+            "outputs": [
+                "urn:li:dataset:(urn:li:dataPlatform:sqlite,public.costs,PROD)"
+            ]
+        }
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sqlite,public.processed_costs,PROD)",
@@ -1640,19 +1653,6 @@
         }
     }
 },
-{
-    "entityType": "dataProcessInstance",
-    "entityUrn": "urn:li:dataProcessInstance:07285de22276959612189d51336cc21a",
-    "changeType": "UPSERT",
-    "aspectName": "dataProcessInstanceInput",
-    "aspect": {
-        "json": {
-            "inputs": [
-                "urn:li:dataset:(urn:li:dataPlatform:sqlite,public.costs,PROD)"
-            ]
-        }
-    }
-},
 {
     "entityType": "dataProcessInstance",
     "entityUrn": "urn:li:dataProcessInstance:07285de22276959612189d51336cc21a",
@@ -1662,8 +1662,8 @@
         "json": {
             "timestampMillis": 1718733767964,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "STARTED",
             "attempt": 1
@@ -1679,8 +1679,8 @@
         "json": {
             "timestampMillis": 1718733768638,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "COMPLETE",
             "result": {
@@ -1697,10 +1697,10 @@
     "aspectName": "dataJobInputOutput",
     "aspect": {
         "json": {
-            "inputDatasets": [
+            "inputDatasets": [],
+            "outputDatasets": [
                 "urn:li:dataset:(urn:li:dataPlatform:sqlite,public.processed_costs,PROD)"
             ],
-            "outputDatasets": [],
             "inputDatajobs": [
                 "urn:li:dataJob:(urn:li:dataFlow:(airflow,sqlite_operator,prod),transform_cost_table)"
             ],
@@ -1809,19 +1809,6 @@
         }
     }
 },
-{
-    "entityType": "dataProcessInstance",
-    "entityUrn": "urn:li:dataProcessInstance:bab908abccf3cd6607b50fdaf3003372",
-    "changeType": "UPSERT",
-    "aspectName": "dataProcessInstanceInput",
-    "aspect": {
-        "json": {
-            "inputs": [
-                "urn:li:dataset:(urn:li:dataPlatform:sqlite,public.processed_costs,PROD)"
-            ]
-        }
-    }
-},
 {
     "entityType": "dataProcessInstance",
     "entityUrn": "urn:li:dataProcessInstance:bab908abccf3cd6607b50fdaf3003372",
@@ -1843,8 +1830,8 @@
         "json": {
             "timestampMillis": 1718733773354,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "STARTED",
             "attempt": 1
@@ -1860,8 +1847,8 @@
         "json": {
             "timestampMillis": 1718733774147,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "COMPLETE",
             "result": {
@@ -1870,5 +1857,18 @@
             }
         }
     }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:bab908abccf3cd6607b50fdaf3003372",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceOutput",
+    "aspect": {
+        "json": {
+            "outputs": [
+                "urn:li:dataset:(urn:li:dataPlatform:sqlite,public.processed_costs,PROD)"
+            ]
+        }
+    }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v2_sqlite_operator_no_dag_listener.json b/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v2_sqlite_operator_no_dag_listener.json
index a9af068e2e4e93..99bda0e0f2569a 100644
--- a/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v2_sqlite_operator_no_dag_listener.json
+++ b/metadata-ingestion-modules/airflow-plugin/tests/integration/goldens/v2_sqlite_operator_no_dag_listener.json
@@ -336,8 +336,8 @@
         "json": {
             "timestampMillis": 1717180072004,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "STARTED",
             "attempt": 1
@@ -382,8 +382,8 @@
         "json": {
             "timestampMillis": 1719864194882,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "actor": "urn:li:corpuser:airflow",
             "operationType": "CREATE",
@@ -435,8 +435,8 @@
         "json": {
             "timestampMillis": 1717180072275,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "COMPLETE",
             "result": {
@@ -641,8 +641,8 @@
         "json": {
             "timestampMillis": 1717180078196,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "STARTED",
             "attempt": 1
@@ -722,8 +722,8 @@
         "json": {
             "timestampMillis": 1717180078619,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "COMPLETE",
             "result": {
@@ -1000,8 +1000,8 @@
         "json": {
             "timestampMillis": 1717180084642,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "STARTED",
             "attempt": 1
@@ -1081,8 +1081,8 @@
         "json": {
             "timestampMillis": 1717180085266,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "COMPLETE",
             "result": {
@@ -1186,10 +1186,10 @@
     "aspectName": "dataJobInputOutput",
     "aspect": {
         "json": {
-            "inputDatasets": [
+            "inputDatasets": [],
+            "outputDatasets": [
                 "urn:li:dataset:(urn:li:dataPlatform:sqlite,public.costs,PROD)"
             ],
-            "outputDatasets": [],
             "inputDatajobs": [
                 "urn:li:dataJob:(urn:li:dataFlow:(airflow,sqlite_operator,prod),transform_cost_table)"
             ],
@@ -1287,8 +1287,8 @@
         "json": {
             "timestampMillis": 1717180091148,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "STARTED",
             "attempt": 1
@@ -1368,8 +1368,8 @@
         "json": {
             "timestampMillis": 1717180091923,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "COMPLETE",
             "result": {
@@ -1499,10 +1499,10 @@
     "aspectName": "dataJobInputOutput",
     "aspect": {
         "json": {
-            "inputDatasets": [
+            "inputDatasets": [],
+            "outputDatasets": [
                 "urn:li:dataset:(urn:li:dataPlatform:sqlite,public.processed_costs,PROD)"
             ],
-            "outputDatasets": [],
             "inputDatajobs": [
                 "urn:li:dataJob:(urn:li:dataFlow:(airflow,sqlite_operator,prod),transform_cost_table)"
             ],
@@ -1613,8 +1613,8 @@
         "json": {
             "timestampMillis": 1717180096108,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "STARTED",
             "attempt": 1
@@ -1630,8 +1630,8 @@
         "json": {
             "timestampMillis": 1719864203487,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "actor": "urn:li:corpuser:airflow",
             "operationType": "CREATE",
@@ -1712,8 +1712,8 @@
         "json": {
             "timestampMillis": 1717180096993,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "status": "COMPLETE",
             "result": {
@@ -1727,10 +1727,10 @@
     "entityType": "dataProcessInstance",
     "entityUrn": "urn:li:dataProcessInstance:bab908abccf3cd6607b50fdaf3003372",
     "changeType": "UPSERT",
-    "aspectName": "dataProcessInstanceInput",
+    "aspectName": "dataProcessInstanceOutput",
     "aspect": {
         "json": {
-            "inputs": [
+            "outputs": [
                 "urn:li:dataset:(urn:li:dataPlatform:sqlite,public.processed_costs,PROD)"
             ]
         }
@@ -1740,10 +1740,10 @@
     "entityType": "dataProcessInstance",
     "entityUrn": "urn:li:dataProcessInstance:07285de22276959612189d51336cc21a",
     "changeType": "UPSERT",
-    "aspectName": "dataProcessInstanceInput",
+    "aspectName": "dataProcessInstanceOutput",
     "aspect": {
         "json": {
-            "inputs": [
+            "outputs": [
                 "urn:li:dataset:(urn:li:dataPlatform:sqlite,public.costs,PROD)"
             ]
         }
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py b/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py
index 9ea822edeef81f..2b8d4c47f62246 100644
--- a/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py
+++ b/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py
@@ -110,7 +110,9 @@ def _wait_for_dag_finish(
 
 @contextlib.contextmanager
 def _run_airflow(
-    tmp_path: pathlib.Path, dags_folder: pathlib.Path, is_v1: bool
+    tmp_path: pathlib.Path,
+    dags_folder: pathlib.Path,
+    is_v1: bool,
 ) -> Iterator[AirflowInstance]:
     airflow_home = tmp_path / "airflow_home"
     print(f"Using airflow home: {airflow_home}")
@@ -272,6 +274,7 @@ class DagTestCase:
     DagTestCase("basic_iolets"),
     DagTestCase("snowflake_operator", success=False, v2_only=True),
     DagTestCase("sqlite_operator", v2_only=True),
+    DagTestCase("custom_operator_dag", v2_only=True),
 ]
 
 
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/unit/test_airflow.py b/metadata-ingestion-modules/airflow-plugin/tests/unit/test_airflow.py
index 36696d48cdaf72..79620f81a437b0 100644
--- a/metadata-ingestion-modules/airflow-plugin/tests/unit/test_airflow.py
+++ b/metadata-ingestion-modules/airflow-plugin/tests/unit/test_airflow.py
@@ -316,7 +316,7 @@ def test_lineage_backend(mock_emit, inlets, outlets, capture_executions):
         assert all(map(lambda let: isinstance(let, Dataset), op2.outlets))
 
         # Check that the right things were emitted.
-        assert mock_emitter.emit.call_count == 17 if capture_executions else 9
+        assert mock_emitter.emit.call_count == 19 if capture_executions else 11
 
         # TODO: Replace this with a golden file-based comparison.
         assert mock_emitter.method_calls[0].args[0].aspectName == "dataFlowInfo"
@@ -325,127 +325,139 @@ def test_lineage_backend(mock_emit, inlets, outlets, capture_executions):
             == "urn:li:dataFlow:(airflow,test_lineage_is_sent_to_backend,prod)"
         )
 
-        assert mock_emitter.method_calls[1].args[0].aspectName == "ownership"
+        assert mock_emitter.method_calls[1].args[0].aspectName == "status"
         assert (
             mock_emitter.method_calls[1].args[0].entityUrn
             == "urn:li:dataFlow:(airflow,test_lineage_is_sent_to_backend,prod)"
         )
 
-        assert mock_emitter.method_calls[2].args[0].aspectName == "globalTags"
+        assert mock_emitter.method_calls[2].args[0].aspectName == "ownership"
         assert (
             mock_emitter.method_calls[2].args[0].entityUrn
             == "urn:li:dataFlow:(airflow,test_lineage_is_sent_to_backend,prod)"
         )
 
-        assert mock_emitter.method_calls[3].args[0].aspectName == "dataJobInfo"
+        assert mock_emitter.method_calls[3].args[0].aspectName == "globalTags"
         assert (
             mock_emitter.method_calls[3].args[0].entityUrn
-            == "urn:li:dataJob:(urn:li:dataFlow:(airflow,test_lineage_is_sent_to_backend,prod),task2)"
+            == "urn:li:dataFlow:(airflow,test_lineage_is_sent_to_backend,prod)"
         )
 
-        assert mock_emitter.method_calls[4].args[0].aspectName == "dataJobInputOutput"
+        assert mock_emitter.method_calls[4].args[0].aspectName == "dataJobInfo"
         assert (
             mock_emitter.method_calls[4].args[0].entityUrn
             == "urn:li:dataJob:(urn:li:dataFlow:(airflow,test_lineage_is_sent_to_backend,prod),task2)"
         )
+
+        assert mock_emitter.method_calls[5].args[0].aspectName == "status"
         assert (
-            mock_emitter.method_calls[4].args[0].aspect.inputDatajobs[0]
+            mock_emitter.method_calls[5].args[0].entityUrn
+            == "urn:li:dataJob:(urn:li:dataFlow:(airflow,test_lineage_is_sent_to_backend,prod),task2)"
+        )
+
+        assert mock_emitter.method_calls[6].args[0].aspectName == "dataJobInputOutput"
+        assert (
+            mock_emitter.method_calls[6].args[0].entityUrn
+            == "urn:li:dataJob:(urn:li:dataFlow:(airflow,test_lineage_is_sent_to_backend,prod),task2)"
+        )
+        assert (
+            mock_emitter.method_calls[6].args[0].aspect.inputDatajobs[0]
             == "urn:li:dataJob:(urn:li:dataFlow:(airflow,test_lineage_is_sent_to_backend,prod),task1_upstream)"
         )
         assert (
-            mock_emitter.method_calls[4].args[0].aspect.inputDatajobs[1]
+            mock_emitter.method_calls[6].args[0].aspect.inputDatajobs[1]
             == "urn:li:dataJob:(urn:li:dataFlow:(airflow,testDag,PROD),testTask)"
         )
         assert (
-            mock_emitter.method_calls[4].args[0].aspect.inputDatasets[0]
+            mock_emitter.method_calls[6].args[0].aspect.inputDatasets[0]
             == "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableConsumed,PROD)"
         )
         assert (
-            mock_emitter.method_calls[4].args[0].aspect.outputDatasets[0]
+            mock_emitter.method_calls[6].args[0].aspect.outputDatasets[0]
             == "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableProduced,PROD)"
         )
 
-        assert mock_emitter.method_calls[5].args[0].aspectName == "datasetKey"
+        assert mock_emitter.method_calls[7].args[0].aspectName == "datasetKey"
         assert (
-            mock_emitter.method_calls[5].args[0].entityUrn
+            mock_emitter.method_calls[7].args[0].entityUrn
             == "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableConsumed,PROD)"
         )
 
-        assert mock_emitter.method_calls[6].args[0].aspectName == "datasetKey"
+        assert mock_emitter.method_calls[8].args[0].aspectName == "datasetKey"
         assert (
-            mock_emitter.method_calls[6].args[0].entityUrn
+            mock_emitter.method_calls[8].args[0].entityUrn
             == "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableProduced,PROD)"
         )
 
-        assert mock_emitter.method_calls[7].args[0].aspectName == "ownership"
+        assert mock_emitter.method_calls[9].args[0].aspectName == "ownership"
         assert (
-            mock_emitter.method_calls[7].args[0].entityUrn
+            mock_emitter.method_calls[9].args[0].entityUrn
             == "urn:li:dataJob:(urn:li:dataFlow:(airflow,test_lineage_is_sent_to_backend,prod),task2)"
         )
 
-        assert mock_emitter.method_calls[8].args[0].aspectName == "globalTags"
+        assert mock_emitter.method_calls[10].args[0].aspectName == "globalTags"
         assert (
-            mock_emitter.method_calls[8].args[0].entityUrn
+            mock_emitter.method_calls[10].args[0].entityUrn
             == "urn:li:dataJob:(urn:li:dataFlow:(airflow,test_lineage_is_sent_to_backend,prod),task2)"
         )
 
         if capture_executions:
             assert (
-                mock_emitter.method_calls[9].args[0].aspectName
+                mock_emitter.method_calls[11].args[0].aspectName
                 == "dataProcessInstanceProperties"
             )
             assert (
-                mock_emitter.method_calls[9].args[0].entityUrn
+                mock_emitter.method_calls[11].args[0].entityUrn
                 == "urn:li:dataProcessInstance:5e274228107f44cc2dd7c9782168cc29"
             )
 
             assert (
-                mock_emitter.method_calls[10].args[0].aspectName
+                mock_emitter.method_calls[12].args[0].aspectName
                 == "dataProcessInstanceRelationships"
             )
             assert (
-                mock_emitter.method_calls[10].args[0].entityUrn
+                mock_emitter.method_calls[12].args[0].entityUrn
                 == "urn:li:dataProcessInstance:5e274228107f44cc2dd7c9782168cc29"
             )
             assert (
-                mock_emitter.method_calls[11].args[0].aspectName
+                mock_emitter.method_calls[13].args[0].aspectName
                 == "dataProcessInstanceInput"
             )
             assert (
-                mock_emitter.method_calls[11].args[0].entityUrn
+                mock_emitter.method_calls[13].args[0].entityUrn
                 == "urn:li:dataProcessInstance:5e274228107f44cc2dd7c9782168cc29"
             )
             assert (
-                mock_emitter.method_calls[12].args[0].aspectName
+                mock_emitter.method_calls[14].args[0].aspectName
                 == "dataProcessInstanceOutput"
             )
             assert (
-                mock_emitter.method_calls[12].args[0].entityUrn
+                mock_emitter.method_calls[14].args[0].entityUrn
                 == "urn:li:dataProcessInstance:5e274228107f44cc2dd7c9782168cc29"
             )
-            assert mock_emitter.method_calls[13].args[0].aspectName == "datasetKey"
+            assert mock_emitter.method_calls[15].args[0].aspectName == "datasetKey"
             assert (
-                mock_emitter.method_calls[13].args[0].entityUrn
+                mock_emitter.method_calls[15].args[0].entityUrn
                 == "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableConsumed,PROD)"
             )
-            assert mock_emitter.method_calls[14].args[0].aspectName == "datasetKey"
+            assert mock_emitter.method_calls[16].args[0].aspectName == "datasetKey"
             assert (
-                mock_emitter.method_calls[14].args[0].entityUrn
+                mock_emitter.method_calls[16].args[0].entityUrn
                 == "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableProduced,PROD)"
             )
             assert (
-                mock_emitter.method_calls[15].args[0].aspectName
+                mock_emitter.method_calls[17].args[0].aspectName
                 == "dataProcessInstanceRunEvent"
             )
             assert (
-                mock_emitter.method_calls[15].args[0].entityUrn
+                mock_emitter.method_calls[17].args[0].entityUrn
                 == "urn:li:dataProcessInstance:5e274228107f44cc2dd7c9782168cc29"
             )
             assert (
-                mock_emitter.method_calls[16].args[0].aspectName
+                mock_emitter.method_calls[18].args[0].aspectName
                 == "dataProcessInstanceRunEvent"
             )
             assert (
-                mock_emitter.method_calls[16].args[0].entityUrn
+                mock_emitter.method_calls[18].args[0].entityUrn
                 == "urn:li:dataProcessInstance:5e274228107f44cc2dd7c9782168cc29"
             )
diff --git a/metadata-ingestion-modules/airflow-plugin/tox.ini b/metadata-ingestion-modules/airflow-plugin/tox.ini
index 4d66dbc860aa9f..9e0a30df6fcbde 100644
--- a/metadata-ingestion-modules/airflow-plugin/tox.ini
+++ b/metadata-ingestion-modules/airflow-plugin/tox.ini
@@ -23,7 +23,9 @@ deps =
 
     # Respect the Airflow constraints files.
     # We can't make ourselves work with the constraints of Airflow < 2.3.
-    py310-airflow24: -c https://raw.githubusercontent.com/apache/airflow/constraints-2.4.3/constraints-3.10.txt
+    # The Airflow 2.4 constraints file requires a version of the sqlite provider whose
+    # hook type is missing the `conn_name_attr` property.
+    ; py310-airflow24: -c https://raw.githubusercontent.com/apache/airflow/constraints-2.4.3/constraints-3.10.txt
     py310-airflow26: -c https://raw.githubusercontent.com/apache/airflow/constraints-2.6.3/constraints-3.10.txt
     py310-airflow27: -c https://raw.githubusercontent.com/apache/airflow/constraints-2.7.3/constraints-3.10.txt
     py310-airflow28: -c https://raw.githubusercontent.com/apache/airflow/constraints-2.8.1/constraints-3.10.txt
diff --git a/metadata-ingestion-modules/dagster-plugin/build.gradle b/metadata-ingestion-modules/dagster-plugin/build.gradle
index 6cb7b9295549a7..74ca7cedea3a52 100644
--- a/metadata-ingestion-modules/dagster-plugin/build.gradle
+++ b/metadata-ingestion-modules/dagster-plugin/build.gradle
@@ -33,7 +33,7 @@ task installPackage(type: Exec, dependsOn: [environmentSetup, ':metadata-ingesti
   outputs.file(sentinel_file)
   commandLine 'bash', '-c',
       "source ${venv_name}/bin/activate && set -x && " +
-          "uv pip install -e . ${extra_pip_requirements} && " +
+          "${pip_install_command} -e . ${extra_pip_requirements} && " +
           "touch ${sentinel_file}"
 }
 
@@ -45,15 +45,11 @@ task installDev(type: Exec, dependsOn: [install]) {
   outputs.file(sentinel_file)
   commandLine 'bash', '-c',
       "source ${venv_name}/bin/activate && set -x && " +
-      "uv pip install -e .[dev] ${extra_pip_requirements} && " +
+      "${pip_install_command} -e .[dev] ${extra_pip_requirements} && " +
       "touch ${sentinel_file}"
 }
 
 task lint(type: Exec, dependsOn: installDev) {
-  /*
-    The find/sed combo below is a temporary work-around for the following mypy issue with airflow 2.2.0:
-   "venv/lib/python3.8/site-packages/airflow/_vendor/connexion/spec.py:169: error: invalid syntax".
-   */
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
     "black --check --diff src/ tests/ examples/ && " +
@@ -77,7 +73,7 @@ task installDevTest(type: Exec, dependsOn: [installDev]) {
   outputs.file(sentinel_file)
   commandLine 'bash', '-c',
       "source ${venv_name}/bin/activate && set -x && " +
-      "uv pip install -e .[dev,integration-tests] ${extra_pip_requirements} && " +
+      "${pip_install_command} -e .[dev,integration-tests] ${extra_pip_requirements} && " +
       "touch ${sentinel_file}"
 }
 
@@ -105,10 +101,6 @@ task testQuick(type: Exec, dependsOn: installDevTest) {
 }
 
 
-task testFull(type: Exec, dependsOn: [testQuick, installDevTest]) {
-  commandLine 'bash', '-x', '-c',
-    "source ${venv_name}/bin/activate && pytest -m 'not slow_integration' -vv --continue-on-collection-errors --junit-xml=junit.full.xml"
-}
 task buildWheel(type: Exec, dependsOn: [environmentSetup]) {
   commandLine 'bash', '-c', "source ${venv_name}/bin/activate && " +
   'uv pip install build && RELEASE_VERSION="\${RELEASE_VERSION:-0.0.0.dev1}" RELEASE_SKIP_INSTALL=1 RELEASE_SKIP_UPLOAD=1 ./scripts/release.sh'
diff --git a/metadata-ingestion-modules/dagster-plugin/examples/iris.py b/metadata-ingestion-modules/dagster-plugin/examples/iris.py
new file mode 100644
index 00000000000000..f12112a782ea74
--- /dev/null
+++ b/metadata-ingestion-modules/dagster-plugin/examples/iris.py
@@ -0,0 +1,112 @@
+import pandas as pd
+from dagster import MaterializeResult, MetadataValue, asset
+from dagster_aws.redshift import RedshiftClientResource
+from dagster_snowflake import SnowflakeResource
+
+
+@asset(
+    metadata={"schema": "public"},
+    key_prefix=["prod", "snowflake", "test_db", "public"],
+    group_name="iris",
+    io_manager_key="snowflake_io_manager",
+)
+def iris_dataset() -> pd.DataFrame:
+    return pd.read_csv(
+        "https://docs.dagster.io/assets/iris.csv",
+        names=[
+            "sepal_length_cm",
+            "sepal_width_cm",
+            "petal_length_cm",
+            "petal_width_cm",
+            "species",
+        ],
+    )
+
+
+@asset(
+    metadata={"schema": "public"},
+    key_prefix=["prod", "snowflake", "test_db", "public"],
+    group_name="iris",
+    io_manager_key="snowflake_io_manager",
+)
+def iris_cleaned(iris_dataset: pd.DataFrame) -> pd.DataFrame:
+    return iris_dataset.dropna().drop_duplicates()
+
+
+@asset(
+    metadata={"schema": "public"},
+    key_prefix=["prod", "snowflake", "test_db", "public"],
+    group_name="iris",
+    deps=[iris_dataset],
+)
+def iris_setosa(snowflake: SnowflakeResource) -> MaterializeResult:
+    query = """
+        create or replace table TEST_DB.public.iris_setosa as (
+            SELECT *
+            FROM TEST_DB.public.iris_cleaned
+            WHERE species = 'Iris-setosa'
+        );
+    """
+
+    with snowflake.get_connection() as connection:
+        with connection.cursor() as cursor:
+            cursor.execute(query)
+
+    return MaterializeResult(
+        metadata={
+            "Query": MetadataValue.text(query),
+        }
+    )
+
+
+@asset(
+    key_prefix=[
+        "prod",
+        "snowflake",
+        "db_name",
+        "schema_name",
+    ],  # the fqdn asset name to be able identify platform and make sure asset is unique
+    group_name="iris",
+    deps=[iris_dataset],
+)
+def my_asset_table_a(snowflake: SnowflakeResource) -> MaterializeResult:
+    query = """
+        create or replace table db_name.schema_name.my_asset_table_a as (
+            SELECT *
+            FROM db_name.schema_name.my_asset_table_b
+        );
+    """
+
+    with snowflake.get_connection() as connection:
+        with connection.cursor() as cursor:
+            cursor.execute(query)
+
+    return MaterializeResult(  # Adding query to metadata to use it getting lineage from it with sql parser
+        metadata={
+            "Query": MetadataValue.text(query),
+        }
+    )
+
+
+@asset(
+    key_prefix=[
+        "prod",
+        "redshift",
+        "dev",
+        "public",
+        "blood_storage_count",
+    ],  # the fqdn asset name to be able identify platform and make sure asset is unique
+    group_name="blood_storage",
+)
+def blood_storage_cleaned(redshift: RedshiftClientResource) -> MaterializeResult:
+    query = """
+        select count(*) from public.blood_storage;
+    """
+    client = redshift.get_client()
+    client.execute_query(query)
+
+    return MaterializeResult(  # Adding query to metadata to use it getting lineage from it with sql parser
+        metadata={
+            "Query": MetadataValue.text(query),
+        }
+    )
diff --git a/metadata-ingestion-modules/dagster-plugin/setup.py b/metadata-ingestion-modules/dagster-plugin/setup.py
index 60b960e653eb2b..50450ddd5917af 100644
--- a/metadata-ingestion-modules/dagster-plugin/setup.py
+++ b/metadata-ingestion-modules/dagster-plugin/setup.py
@@ -15,9 +15,17 @@ def get_long_description():
 
 rest_common = {"requests", "requests_file"}
 
+sqlglot_lib = {
+    # Using an Acryl fork of sqlglot.
+    # https://github.com/tobymao/sqlglot/compare/main...hsheth2:sqlglot:main?expand=1
+    "acryl-sqlglot[rs]==24.0.1.dev7",
+}
+
 _version: str = package_metadata["__version__"]
 _self_pin = (
-    f"=={_version}" if not (_version.endswith("dev0") or "docker" in _version) else ""
+    f"=={_version}"
+    if not (_version.endswith(("dev0", "dev1")) or "docker" in _version)
+    else ""
 )
 
 base_requirements = {
@@ -26,14 +34,15 @@ def get_long_description():
     "dagit >= 1.3.3",
     *rest_common,
     # Ignoring the dependency below because it causes issues with the vercel built wheel install
-    #f"acryl-datahub[datahub-rest]{_self_pin}",
+    # f"acryl-datahub[datahub-rest]{_self_pin}",
     "acryl-datahub[datahub-rest]",
+    *sqlglot_lib,
 }
 
 mypy_stubs = {
     "types-dataclasses",
     "sqlalchemy-stubs",
-    "types-pkg_resources",
+    "types-setuptools",
     "types-six",
     "types-python-dateutil",
     "types-requests",
@@ -51,6 +60,9 @@ def get_long_description():
 base_dev_requirements = {
     *base_requirements,
     *mypy_stubs,
+    "dagster-aws >= 0.11.0",
+    "dagster-snowflake >= 0.11.0",
+    "dagster-snowflake-pandas >= 0.11.0",
     "black==22.12.0",
     "coverage>=5.1",
     "flake8>=6.0.0",
@@ -65,7 +77,8 @@ def get_long_description():
     "pytest-asyncio>=0.16.0",
     "pytest-cov>=2.8.1",
     "tox",
-    "deepdiff",
+    # Missing numpy requirement in 8.0.0
+    "deepdiff!=8.0.0",
     "requests-mock",
     "freezegun",
     "jsonpickle",
diff --git a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py
index c00160dfb03199..df9d0fc423fcfa 100644
--- a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py
+++ b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py
@@ -4,7 +4,13 @@
 from urllib.parse import urlsplit
 
 import pydantic
-from dagster import DagsterRunStatus, PathMetadataValue, RunStatusSensorContext
+from dagster import (
+    DagsterRunStatus,
+    MultiAssetSensorEvaluationContext,
+    PathMetadataValue,
+    RunStatusSensorContext,
+    TableSchemaMetadataValue,
+)
 from dagster._core.execution.stats import RunStepKeyStatsSnapshot, StepEventStatus
 from dagster._core.snap import JobSnapshot
 from dagster._core.snap.node import OpDefSnap
@@ -19,14 +25,48 @@
 from datahub.emitter.mce_builder import (
     make_data_platform_urn,
     make_dataplatform_instance_urn,
+    make_tag_urn,
 )
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.graph.client import DatahubClientConfig, DataHubGraph
-from datahub.metadata.schema_classes import DataPlatformInstanceClass, SubTypesClass
+from datahub.metadata._schema_classes import (
+    BrowsePathEntryClass,
+    BrowsePathsV2Class,
+    GlobalTagsClass,
+    TagAssociationClass,
+)
+from datahub.metadata.com.linkedin.pegasus2avro.schema import (
+    ArrayType,
+    BooleanType,
+    BytesType,
+    DateType,
+    MySqlDDL,
+    NullType,
+    NumberType,
+    RecordType,
+    SchemaField,
+    SchemaFieldDataType,
+    SchemaMetadata,
+    StringType,
+    TimeType,
+)
+from datahub.metadata.schema_classes import (
+    DataPlatformInstanceClass,
+    DatasetKeyClass,
+    DatasetLineageTypeClass,
+    SubTypesClass,
+    UpstreamClass,
+)
+from datahub.specific.dataset import DatasetPatchBuilder
+from datahub.utilities.urns._urn_base import Urn
 from datahub.utilities.urns.data_flow_urn import DataFlowUrn
 from datahub.utilities.urns.data_job_urn import DataJobUrn
 from datahub.utilities.urns.dataset_urn import DatasetUrn
 
+ASSET_SUBTYPE = "Asset"
+
+DAGSTER_PLATFORM = "dagster"
+
 
 class Constant:
     """
@@ -68,10 +108,48 @@ class Constant:
     STEP_KEY = "step_key"
     ATTEMPTS = "attempts"
 
+    SNOWFLAKE_FIELD_TYPE_MAPPINGS = {
+        "DATE": DateType,
+        "BIGINT": NumberType,
+        "BINARY": BytesType,
+        # 'BIT': BIT,
+        "BOOLEAN": BooleanType,
+        "CHAR": NullType,
+        "CHARACTER": NullType,
+        "DATETIME": TimeType,
+        "DEC": NumberType,
+        "DECIMAL": NumberType,
+        "DOUBLE": NumberType,
+        "FIXED": NumberType,
+        "FLOAT": NumberType,
+        "FLOAT64": NumberType,
+        "INT": NumberType,
+        "INTEGER": NumberType,
+        "NUMBER": NumberType,
+        # 'OBJECT': ?
+        "REAL": NumberType,
+        "BYTEINT": NumberType,
+        "SMALLINT": NumberType,
+        "STRING": StringType,
+        "TEXT": StringType,
+        "TIME": TimeType,
+        "TIMESTAMP": TimeType,
+        "TIMESTAMP_TZ": TimeType,
+        "TIMESTAMP_LTZ": TimeType,
+        "TIMESTAMP_NTZ": TimeType,
+        "TINYINT": NumberType,
+        "VARBINARY": BytesType,
+        "VARCHAR": StringType,
+        "VARIANT": RecordType,
+        "OBJECT": NullType,
+        "ARRAY": ArrayType,
+        "GEOGRAPHY": NullType,
+    }
+
 
 class DatasetLineage(NamedTuple):
-    inputs: Set[str]
-    outputs: Set[str]
+    inputs: Set[DatasetUrn]
+    outputs: Set[DatasetUrn]
 
 
 class DatahubDagsterSourceConfig(DatasetSourceConfigMixin):
@@ -95,6 +173,16 @@ class DatahubDagsterSourceConfig(DatasetSourceConfigMixin):
         description="Whether to capture and try to parse input and output from HANDLED_OUTPUT, LOADED_INPUT event. (currently only filepathvalue metadata supported",
     )
 
+    connect_ops_to_ops: bool = pydantic.Field(
+        default=False,
+        description="Whether to connect ops to ops based on the order of execution",
+    )
+
+    enable_asset_query_metadata_parsing: bool = pydantic.Field(
+        default=True,
+        description="Whether to enable parsing query from asset metadata",
+    )
+
     asset_lineage_extractor: Optional[
         Callable[
             [RunStatusSensorContext, "DagsterGenerator", DataHubGraph],
@@ -105,6 +193,31 @@ class DatahubDagsterSourceConfig(DatasetSourceConfigMixin):
         description="Custom asset lineage extractor function. See details at [https://datahubproject.io/docs/lineage/dagster/#define-your-custom-logic-to-capture-asset-lineage-information]",
     )
 
+    capture_dataset_from_asset_key: Optional[bool] = pydantic.Field(
+        default=True,
+        description="Whether to capture dataset from asset key",
+    )
+
+    asset_keys_to_dataset_urn_converter: Optional[
+        Callable[
+            [Sequence[str]],
+            DatasetUrn,
+        ]
+    ] = pydantic.Field(
+        default=None,
+        description="Custom asset key to urn converter function. See details at [https://datahubproject.io/docs/lineage/dagster/#define-your-custom-logic-to-capture-asset-lineage-information]",
+    )
+
+    materialize_dependencies: Optional[bool] = pydantic.Field(
+        default=False,
+        description="Whether to materialize asset dependency in DataHub. It emits a datasetKey for each dependencies. Default is False.",
+    )
+
+    debug_mode: Optional[bool] = pydantic.Field(
+        default=False,
+        description="Whether to enable debug mode",
+    )
+
 
 def _str_urn_to_dataset_urn(urns: List[str]) -> List[DatasetUrn]:
     return [DatasetUrn.create_from_string(urn) for urn in urns]
@@ -132,6 +245,8 @@ def job_url_generator(dagster_url: str, dagster_environment: DagsterEnvironment)
 
 
 class DagsterGenerator:
+    asset_group_name_cache: Dict[str, str] = {}
+
     def __init__(
         self,
         logger: Logger,
@@ -142,6 +257,60 @@ def __init__(
         self.config = config
         self.dagster_environment = dagster_environment
 
+    def dataset_urn_from_asset(self, asset_key: Sequence[str]) -> DatasetUrn:
+        """
+        Generate dataset urn from asset key
+        """
+        return DatasetUrn(
+            #  A key/name can only contain letters, numbers, and _ in Dagster
+            platform="dagster",
+            env=self.config.env,
+            name=".".join(asset_key),
+        )
+
+    def asset_keys_to_dataset_urn_converter(
+        self, asset_key: Sequence[str]
+    ) -> Optional[DatasetUrn]:
+        """
+        Convert asset key to dataset urn
+
+        By default we assume the following asset key structure:
+        key_prefix=["prod", "snowflake", "db_name", "schema_name"]
+        """
+        if self.config.asset_keys_to_dataset_urn_converter:
+            return self.config.asset_keys_to_dataset_urn_converter(asset_key)
+
+        if len(asset_key) >= 3:
+            return DatasetUrn(
+                platform=asset_key[1],
+                env=asset_key[0],
+                name=".".join(asset_key[2:]),
+            )
+        else:
+            return None
+
+    def update_asset_group_name_cache(
+        self, asset_context: MultiAssetSensorEvaluationContext
+    ) -> None:
+        """
+        Update asset group name cache
+        """
+        for _, asset_def in asset_context.assets_defs_by_key.items():
+            if asset_def:
+                for key, group_name in asset_def.group_names_by_key.items():
+                    asset_urn = self.dataset_urn_from_asset(key.path)
+                    DagsterGenerator.asset_group_name_cache[
+                        asset_urn.urn()
+                    ] = group_name
+                    if self.config.debug_mode:
+                        self.logger.debug(
+                            f"Asset group name cache updated: {asset_urn.urn()} -> {group_name}"
+                        )
+        if self.config.debug_mode:
+            self.logger.debug(
+                f"Asset group name cache: {DagsterGenerator.asset_group_name_cache}"
+            )
+
     def path_metadata_resolver(self, value: PathMetadataValue) -> Optional[DatasetUrn]:
         """
         Resolve path metadata to dataset urn
@@ -222,13 +391,15 @@ def generate_datajob(
         """
         Generates a Datajob object from an Dagster op snapshot
         :param job_snapshot: JobSnapshot - Job snapshot object
+        :param step_deps: Dict[str, List] - step dependencies
         :param op_def_snap: OpDefSnap - Op def snapshot object
         :param env: str
         :param platform_instance: Optional[str]
         :param output_datasets: dict[str, Set[DatasetUrn]] - output datasets for each op
+        :param input_datasets: dict[str, Set[DatasetUrn]] - input datasets for each op
         :return: DataJob - Data generated datajob
         """
-
+        self.logger.info(f"Generating datajob for Op Def Snap: {op_def_snap}")
         if self.dagster_environment.is_cloud:
             flow_id = f"{self.dagster_environment.branch}/{self.dagster_environment.module}/{job_snapshot.name}"
             job_id = f"{self.dagster_environment.branch}/{self.dagster_environment.module}/{op_def_snap.name}"
@@ -254,6 +425,7 @@ def generate_datajob(
         datajob.description = op_def_snap.description
         datajob.tags = set(op_def_snap.tags.keys())
 
+        inlets: Set[DatasetUrn] = set()
         # Add upstream dependencies for this op
         for upstream_op_name in step_deps[op_def_snap.name]:
             if self.dagster_environment.is_cloud:
@@ -266,13 +438,17 @@ def generate_datajob(
                 data_flow_urn=str(dataflow_urn),
                 job_id=upstream_job_id,
             )
-            datajob.upstream_urns.extend([upstream_op_urn])
+            if self.config.connect_ops_to_ops:
+                datajob.upstream_urns.extend([upstream_op_urn])
+            inlets.update(output_datasets.get(upstream_op_name, []))
         job_property_bag: Dict[str, str] = {}
         if input_datasets:
             self.logger.info(
                 f"Input datasets for {op_def_snap.name} are { list(input_datasets.get(op_def_snap.name, []))}"
             )
-            datajob.inlets = list(input_datasets.get(op_def_snap.name, []))
+            inlets.update(input_datasets.get(op_def_snap.name, []))
+
+        datajob.inlets = list(inlets)
 
         if output_datasets:
             self.logger.info(
@@ -298,7 +474,10 @@ def generate_datajob(
             job_property_bag[f"output_{output_def_snap.name}"] = str(
                 output_def_snap._asdict()
             )
-            if Constant.DATAHUB_OUTPUTS in output_def_snap.metadata:
+            if (
+                Constant.DATAHUB_OUTPUTS in output_def_snap.metadata
+                and self.config.connect_ops_to_ops
+            ):
                 datajob.outlets.extend(
                     _str_urn_to_dataset_urn(
                         output_def_snap.metadata[Constant.DATAHUB_OUTPUTS].value  # type: ignore
@@ -448,13 +627,77 @@ def emit_op_run(
                 result_type=Constant.ORCHESTRATOR,
             )
 
-    def dataset_urn_from_asset(self, asset_key: Sequence[str]) -> DatasetUrn:
+    def convert_table_schema_to_schema_metadata(
+        self, table_schema: TableSchemaMetadataValue, parent_urn: DatasetUrn
+    ) -> MetadataChangeProposalWrapper:
         """
-        Generate dataset urn from asset key
+        Convert TableSchemaMetadataValue to SchemaSpecification
         """
-        return DatasetUrn(
-            platform="dagster", env=self.config.env, name="/".join(asset_key)
+        self.logger.info(f"Converting table schema to schema metadata: {table_schema}")
+        fields = []
+        for column in table_schema.schema.columns:
+            fields.append(
+                SchemaField(
+                    fieldPath=column.name,
+                    nativeDataType=column.type,
+                    type=SchemaFieldDataType(
+                        Constant.SNOWFLAKE_FIELD_TYPE_MAPPINGS.get(
+                            column.type.upper(), NullType
+                        )()
+                    ),
+                    nullable=column.constraints.nullable,
+                    description=column.description,
+                )
+            )
+        self.logger.info(f"Fields: {fields}")
+        schema_metadata = SchemaMetadata(
+            schemaName="",
+            platform=parent_urn.platform,
+            version=0,
+            hash="",
+            platformSchema=MySqlDDL(tableSchema=""),
+            fields=fields,
         )
+        return MetadataChangeProposalWrapper(
+            entityUrn=parent_urn.urn(), aspect=schema_metadata
+        )
+
+    def generate_asset_group_tag(
+        self, graph: DataHubGraph, asset_urn: DatasetUrn, target_urn: Optional[Urn]
+    ) -> Optional[MetadataChangeProposalWrapper]:
+        if not target_urn:
+            target_urn = asset_urn
+        self.logger.info(
+            f"Getting {asset_urn.urn()} from Asset Cache: {DagsterGenerator.asset_group_name_cache}"
+        )
+        group_name = DagsterGenerator.asset_group_name_cache.get(asset_urn.urn())
+        if group_name:
+            current_tags: Optional[GlobalTagsClass] = graph.get_aspect(
+                entity_urn=target_urn.urn(),
+                aspect_type=GlobalTagsClass,
+            )
+
+            tag_to_add = make_tag_urn(f"asset_group:{group_name}")
+            tag_association_to_add = TagAssociationClass(
+                tag=make_tag_urn(f"asset_group:{group_name}")
+            )
+            need_write = False
+            if current_tags:
+                if tag_to_add not in [x.tag for x in current_tags.tags]:
+                    current_tags.tags.append(tag_association_to_add)
+                    need_write = True
+            else:
+                current_tags = GlobalTagsClass(tags=[tag_association_to_add])
+                need_write = True
+
+            if need_write:
+                mcp = MetadataChangeProposalWrapper(
+                    entityUrn=target_urn.urn(), aspect=current_tags
+                )
+                self.logger.info(f"tag_mcp: {mcp}")
+                return mcp
+
+        return None
 
     def emit_asset(
         self,
@@ -462,7 +705,11 @@ def emit_asset(
         asset_key: Sequence[str],
         description: Optional[str],
         properties: Optional[Dict[str, str]],
-    ) -> str:
+        downstreams: Optional[Set[str]] = None,
+        upstreams: Optional[Set[str]] = None,
+        schema: Optional[TableSchemaMetadataValue] = None,
+        materialize_dependencies: Optional[bool] = False,
+    ) -> DatasetUrn:
         """
         Emit asset to datahub
         """
@@ -470,11 +717,11 @@ def emit_asset(
         dataset = Dataset(
             id=None,
             urn=dataset_urn.urn(),
-            platform="dagster",
+            platform=DAGSTER_PLATFORM,
             name=asset_key[-1],
             schema=None,
             downstreams=None,
-            subtype="Asset",
+            subtype=ASSET_SUBTYPE,
             subtypes=None,
             description=description,
             env=self.config.env,
@@ -483,9 +730,15 @@ def emit_asset(
         for mcp in dataset.generate_mcp():
             graph.emit_mcp(mcp)
 
+        if schema:
+            mcp = self.convert_table_schema_to_schema_metadata(
+                table_schema=schema, parent_urn=dataset_urn
+            )
+            graph.emit_mcp(mcp)
+
         mcp = MetadataChangeProposalWrapper(
             entityUrn=dataset_urn.urn(),
-            aspect=SubTypesClass(typeNames=["Asset"]),
+            aspect=SubTypesClass(typeNames=[ASSET_SUBTYPE]),
         )
         graph.emit_mcp(mcp)
 
@@ -495,10 +748,90 @@ def emit_asset(
                 aspect=DataPlatformInstanceClass(
                     instance=make_dataplatform_instance_urn(
                         instance=self.config.platform_instance,
-                        platform="dagster",
+                        platform=DAGSTER_PLATFORM,
                     ),
-                    platform=make_data_platform_urn("dagster"),
+                    platform=make_data_platform_urn(DAGSTER_PLATFORM),
                 ),
             )
             graph.emit_mcp(mcp)
-        return dataset_urn.urn()
+
+        tag_mcp = self.generate_asset_group_tag(
+            graph, asset_urn=dataset_urn, target_urn=dataset_urn
+        )
+        if tag_mcp:
+            graph.emit_mcp(tag_mcp)
+
+        if downstreams:
+            for downstream in downstreams:
+                if materialize_dependencies:
+                    mcp = MetadataChangeProposalWrapper(
+                        entityUrn=downstream,
+                        aspect=DatasetKeyClass(
+                            name=DatasetUrn.create_from_string(downstream).name,
+                            platform=DatasetUrn.create_from_string(downstream).platform,
+                            origin=DatasetUrn.create_from_string(downstream).env,
+                        ),
+                    )
+                    self.logger.info(f"mcp: {mcp}")
+                    graph.emit_mcp(mcp)
+
+                patch_builder = DatasetPatchBuilder(downstream)
+                patch_builder.add_upstream_lineage(
+                    UpstreamClass(
+                        dataset=dataset_urn.urn(),
+                        type=DatasetLineageTypeClass.TRANSFORMED,
+                    )
+                )
+                for patch_event in patch_builder.build():
+                    graph.emit_mcp(patch_event)
+
+        if upstreams:
+            for upstream in upstreams:
+                mcp = MetadataChangeProposalWrapper(
+                    entityUrn=upstream,
+                    aspect=DatasetKeyClass(
+                        name=DatasetUrn.create_from_string(upstream).name,
+                        platform=DatasetUrn.create_from_string(upstream).platform,
+                        origin=DatasetUrn.create_from_string(upstream).env,
+                    ),
+                )
+                self.logger.info(f"mcp: {mcp}")
+                graph.emit_mcp(mcp)
+
+                patch_builder = DatasetPatchBuilder(dataset_urn.urn())
+                patch_builder.add_upstream_lineage(
+                    UpstreamClass(
+                        dataset=upstream,
+                        type=DatasetLineageTypeClass.TRANSFORMED,
+                    )
+                )
+                for patch_event in patch_builder.build():
+                    graph.emit_mcp(patch_event)
+
+        self.logger.info(f"asset_key: {asset_key}")
+        self.generate_browse_path(asset_key=asset_key, urn=dataset_urn, graph=graph)
+        return dataset_urn
+
+    def generate_browse_path(
+        self, asset_key: Sequence[str], urn: Urn, graph: DataHubGraph
+    ) -> None:
+        """
+        Generate browse path from asset key
+        """
+        asset_group_name = DagsterGenerator.asset_group_name_cache.get(
+            self.dataset_urn_from_asset(asset_key).urn()
+        )
+        browsePaths: List[BrowsePathEntryClass] = []
+        if asset_group_name:
+            browsePaths.append(BrowsePathEntryClass(asset_group_name))
+
+        for key in asset_key[:-1]:
+            browsePaths.append(BrowsePathEntryClass(key))
+
+        mcp = MetadataChangeProposalWrapper(
+            entityUrn=urn.urn(),
+            aspect=BrowsePathsV2Class(
+                path=browsePaths,
+            ),
+        )
+        graph.emit_mcp(mcp)
diff --git a/metadata-ingestion/src/datahub/ingestion/source_config/usage/__init__.py b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/modules/__init__.py
similarity index 100%
rename from metadata-ingestion/src/datahub/ingestion/source_config/usage/__init__.py
rename to metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/modules/__init__.py
diff --git a/docs-website/src/pages/docs/_components/CustomerCardSection/customercardsection.module.scss b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/modules/snowflake_pandas/__init__.py
similarity index 100%
rename from docs-website/src/pages/docs/_components/CustomerCardSection/customercardsection.module.scss
rename to metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/modules/snowflake_pandas/__init__.py
diff --git a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/modules/snowflake_pandas/datahub_snowflake_pandas_io_manager.py b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/modules/snowflake_pandas/datahub_snowflake_pandas_io_manager.py
new file mode 100644
index 00000000000000..8a3c3d3a46f048
--- /dev/null
+++ b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/modules/snowflake_pandas/datahub_snowflake_pandas_io_manager.py
@@ -0,0 +1,33 @@
+from typing import Optional
+
+from dagster._core.storage.db_io_manager import DbIOManager
+from dagster_snowflake.snowflake_io_manager import SnowflakeDbClient
+from dagster_snowflake_pandas import SnowflakePandasIOManager
+from pydantic import Field
+
+from datahub_dagster_plugin.modules.storage.datahub_db_io_manager import (
+    DataHubDbIoManager,
+)
+
+
+class DataHubSnowflakePandasIOManager(SnowflakePandasIOManager):
+    datahub_env: Optional[str] = Field(
+        default=None,
+        description="The DataHub env where the materialized assets belongs to.",
+    )
+    datahub_base_url: Optional[str] = Field(
+        default=None,
+        description="The DataHub base url for generated DataHub url in asset metadata.",
+    )
+
+    def create_io_manager(self, context) -> DbIOManager:  # type: ignore[no-untyped-def]
+        return DataHubDbIoManager(
+            db_client=SnowflakeDbClient(),
+            io_manager_name="DataHubSnowflakeIOManager",
+            database=self.database,
+            schema=self.schema_,
+            type_handlers=self.type_handlers(),
+            default_load_type=self.default_load_type(),
+            datahub_env=self.datahub_env,
+            datahub_base_url=self.datahub_base_url,
+        )
diff --git a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/modules/storage/__init__.py b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/modules/storage/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/modules/storage/datahub_db_io_manager.py b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/modules/storage/datahub_db_io_manager.py
new file mode 100644
index 00000000000000..f77e68f1b9cd21
--- /dev/null
+++ b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/modules/storage/datahub_db_io_manager.py
@@ -0,0 +1,79 @@
+from typing import Dict, Optional, Sequence, Type
+
+from dagster import MetadataValue, OutputContext
+from dagster._core.storage.db_io_manager import DbClient, DbIOManager, DbTypeHandler
+
+imported_db_clients = {}
+
+try:
+    from dagster_snowflake.snowflake_io_manager import SnowflakeDbClient
+
+    imported_db_clients["snowflake"] = SnowflakeDbClient
+except ImportError:
+    pass
+
+try:
+    from dagster_snowflake.snowflake_io_manager import SnowflakeDbClient
+
+    imported_db_clients["snowflake"] = SnowflakeDbClient
+except ImportError:
+    pass
+
+
+class DataHubDbIoManager(DbIOManager):
+    def __init__(
+        self,
+        *,
+        type_handlers: Sequence[DbTypeHandler],
+        db_client: DbClient,
+        database: str,
+        schema: Optional[str] = None,
+        io_manager_name: Optional[str] = None,
+        default_load_type: Optional[Type] = None,
+        datahub_env: Optional[str] = "PROD",
+        datahub_base_url: Optional[str] = None,
+    ):
+        super().__init__(
+            type_handlers=type_handlers,
+            db_client=db_client,
+            database=database,
+            schema=schema,
+            io_manager_name=io_manager_name,
+            default_load_type=default_load_type,
+        )
+        self.datahub_env = datahub_env if datahub_env else "PROD"
+        self.datahub_base_url = datahub_base_url
+
+    def handle_output(self, context: OutputContext, obj: object) -> None:
+        super().handle_output(context, obj=obj)
+        # Custom logic here
+
+        table_slice = self._get_table_slice(context, context)
+        platform: Optional[str] = None
+
+        for db_client in imported_db_clients:
+            if isinstance(self._db_client, imported_db_clients[db_client]):
+                platform = db_client
+                break
+
+        if not platform:
+            context.log.debug(
+                "Unable to get platform from db_client or it is not supported"
+            )
+            return
+
+        if table_slice.database:
+            urn = f"urn:li:dataset:(urn:li:dataPlatform:{platform},{table_slice.database.lower()}.{table_slice.schema.lower()}.{table_slice.table.lower()},{self.datahub_env})"
+        else:
+            urn = f"urn:li:dataset:(urn:li:dataPlatform:{platform},{table_slice.schema.lower()}.{table_slice.table.lower()},{self.datahub_env})"
+
+        metadata: Dict = {
+            "datahub_urn": urn,
+        }
+
+        if self.datahub_base_url:
+            metadata["datahub_url"] = MetadataValue.url(
+                f"{self.datahub_base_url}/dataset/{urn}"
+            )
+
+        context.add_output_metadata(metadata)
diff --git a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/sensors/datahub_sensors.py b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/sensors/datahub_sensors.py
index 181ecc7b5c5cd8..4633014222d054 100644
--- a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/sensors/datahub_sensors.py
+++ b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/sensors/datahub_sensors.py
@@ -1,27 +1,50 @@
 import os
 import traceback
-from typing import Dict, List, Optional, Sequence, Set, Tuple
+from collections import defaultdict
+from types import ModuleType
+from typing import Dict, List, NamedTuple, Optional, Sequence, Set, Tuple, Union
 
 from dagster import (
+    AssetSelection,
+    CodeLocationSelector,
     DagsterRunStatus,
     EventLogEntry,
+    GraphDefinition,
+    JobDefinition,
+    JobSelector,
+    MultiAssetSensorEvaluationContext,
+    RepositorySelector,
     RunStatusSensorContext,
     SensorDefinition,
     SkipReason,
+    TextMetadataValue,
+    load_assets_from_modules,
+    multi_asset_sensor,
     run_status_sensor,
     sensor,
 )
 from dagster._core.definitions.asset_selection import CoercibleToAssetSelection
+from dagster._core.definitions.multi_asset_sensor_definition import (
+    AssetMaterializationFunctionReturn,
+)
 from dagster._core.definitions.sensor_definition import (
     DefaultSensorStatus,
     RawSensorEvaluationFunctionReturn,
 )
 from dagster._core.definitions.target import ExecutableDefinition
+from dagster._core.definitions.unresolved_asset_job_definition import (
+    UnresolvedAssetJobDefinition,
+)
 from dagster._core.events import DagsterEventType, HandledOutputData, LoadedInputData
 from dagster._core.execution.stats import RunStepKeyStatsSnapshot
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.graph.client import DataHubGraph
 from datahub.metadata.schema_classes import SubTypesClass
+from datahub.sql_parsing.sqlglot_lineage import (
+    SqlParsingResult,
+    create_lineage_sql_parsed_result,
+)
+from datahub.utilities.urns.dataset_urn import DatasetUrn
 
 from datahub_dagster_plugin.client.dagster_generator import (
     DagsterEnvironment,
@@ -30,6 +53,11 @@
 )
 
 
+class Lineage(NamedTuple):
+    upstreams: List[str]
+    downstreams: List[str]
+
+
 def make_datahub_sensor(
     config: DatahubDagsterSourceConfig,
     name: Optional[str] = None,
@@ -40,6 +68,31 @@ def make_datahub_sensor(
     default_status: DefaultSensorStatus = DefaultSensorStatus.STOPPED,
     asset_selection: Optional[CoercibleToAssetSelection] = None,
     required_resource_keys: Optional[Set[str]] = None,
+    monitored_jobs: Optional[
+        Sequence[
+            Union[
+                JobDefinition,
+                GraphDefinition,
+                UnresolvedAssetJobDefinition,
+                RepositorySelector,
+                JobSelector,
+                CodeLocationSelector,
+            ]
+        ]
+    ] = None,
+    job_selection: Optional[
+        Sequence[
+            Union[
+                JobDefinition,
+                GraphDefinition,
+                UnresolvedAssetJobDefinition,
+                RepositorySelector,
+                JobSelector,
+                CodeLocationSelector,
+            ]
+        ]
+    ] = None,
+    monitor_all_code_locations: Optional[bool] = None,
 ) -> SensorDefinition:
     """Create a sensor on job status change emit lineage to DataHub.
 
@@ -79,7 +132,13 @@ def datahub_sensor(context):
         """
         Sensor which instigate all run status sensors and trigger them based upon run status
         """
-        for each in DatahubSensors(config).sensors:
+        for each in DatahubSensors(
+            config,
+            minimum_interval_seconds=minimum_interval_seconds,
+            monitored_jobs=monitored_jobs,
+            job_selection=job_selection,
+            monitor_all_code_locations=monitor_all_code_locations,
+        ).sensors:
             each.evaluate_tick(context)
         return SkipReason("Trigger run status sensors if any new runs present...")
 
@@ -87,7 +146,36 @@ def datahub_sensor(context):
 
 
 class DatahubSensors:
-    def __init__(self, config: Optional[DatahubDagsterSourceConfig] = None):
+    def __init__(
+        self,
+        config: Optional[DatahubDagsterSourceConfig] = None,
+        minimum_interval_seconds: Optional[int] = None,
+        monitored_jobs: Optional[
+            Sequence[
+                Union[
+                    JobDefinition,
+                    GraphDefinition,
+                    UnresolvedAssetJobDefinition,
+                    "RepositorySelector",
+                    "JobSelector",
+                    "CodeLocationSelector",
+                ]
+            ]
+        ] = None,
+        job_selection: Optional[
+            Sequence[
+                Union[
+                    JobDefinition,
+                    GraphDefinition,
+                    UnresolvedAssetJobDefinition,
+                    "RepositorySelector",
+                    "JobSelector",
+                    "CodeLocationSelector",
+                ]
+            ]
+        ] = None,
+        monitor_all_code_locations: Optional[bool] = None,
+    ):
         """
         Set dagster source configurations and initialize datahub emitter and dagster run status sensors
         """
@@ -100,30 +188,56 @@ def __init__(self, config: Optional[DatahubDagsterSourceConfig] = None):
         )
 
         self.graph.test_connection()
+
         self.sensors: List[SensorDefinition] = []
         self.sensors.append(
             run_status_sensor(
-                name="datahub_success_sensor", run_status=DagsterRunStatus.SUCCESS
+                name="datahub_success_sensor",
+                run_status=DagsterRunStatus.SUCCESS,
+                minimum_interval_seconds=minimum_interval_seconds,
+                monitored_jobs=monitored_jobs,
+                job_selection=job_selection,
+                monitor_all_code_locations=monitor_all_code_locations,
             )(self._emit_metadata)
         )
 
         self.sensors.append(
             run_status_sensor(
-                name="datahub_failure_sensor", run_status=DagsterRunStatus.FAILURE
+                name="datahub_failure_sensor",
+                run_status=DagsterRunStatus.FAILURE,
+                minimum_interval_seconds=minimum_interval_seconds,
+                monitored_jobs=monitored_jobs,
+                job_selection=job_selection,
+                monitor_all_code_locations=monitor_all_code_locations,
             )(self._emit_metadata)
         )
 
         self.sensors.append(
             run_status_sensor(
-                name="datahub_canceled_sensor", run_status=DagsterRunStatus.CANCELED
+                name="datahub_canceled_sensor",
+                run_status=DagsterRunStatus.CANCELED,
+                minimum_interval_seconds=minimum_interval_seconds,
+                monitored_jobs=monitored_jobs,
+                job_selection=job_selection,
+                monitor_all_code_locations=monitor_all_code_locations,
             )(self._emit_metadata)
         )
 
+        self.sensors.append(
+            multi_asset_sensor(
+                name="datahub_multi_asset_sensor",
+                monitored_assets=AssetSelection.all(),
+            )(self._emit_asset_metadata)
+        )
+
     def get_dagster_environment(
-        self, context: RunStatusSensorContext
+        self, context: Optional[RunStatusSensorContext] = None
     ) -> Optional[DagsterEnvironment]:
+        module: Optional[str] = None
+        repository: Optional[str] = None
         if (
-            context.dagster_run.job_code_origin
+            context
+            and context.dagster_run.job_code_origin
             and context.dagster_run.job_code_origin.repository_origin
             and context.dagster_run.job_code_origin.repository_origin.code_pointer
         ):
@@ -144,37 +258,67 @@ def get_dagster_environment(
                 context.log.error("Unable to get Module")
                 return None
 
-            dagster_environment = DagsterEnvironment(
-                is_cloud=os.getenv("DAGSTER_CLOUD_IS_BRANCH_DEPLOYMENT", None)
-                is not None,
-                is_branch_deployment=(
-                    True
-                    if os.getenv("DAGSTER_CLOUD_IS_BRANCH_DEPLOYMENT", False) == 1
-                    else False
-                ),
-                branch=os.getenv("DAGSTER_CLOUD_DEPLOYMENT_NAME", "prod"),
-                module=module,
-                repository=repository,
+        dagster_environment = DagsterEnvironment(
+            is_cloud=os.getenv("DAGSTER_CLOUD_IS_BRANCH_DEPLOYMENT", None) is not None,
+            is_branch_deployment=(
+                True
+                if os.getenv("DAGSTER_CLOUD_IS_BRANCH_DEPLOYMENT", False) == 1
+                else False
+            ),
+            branch=os.getenv("DAGSTER_CLOUD_DEPLOYMENT_NAME", "prod"),
+            module=module,
+            repository=repository,
+        )
+        return dagster_environment
+
+    def parse_sql(
+        self,
+        context: RunStatusSensorContext,
+        sql_query: str,
+        env: str,
+        platform: str,
+        default_db: Optional[str] = None,
+        platform_instance: Optional[str] = None,
+    ) -> Optional[Lineage]:
+        """
+        Parse SQL to get table name and columns
+        """
+        sql_parsing_result: SqlParsingResult = create_lineage_sql_parsed_result(
+            query=sql_query,
+            graph=self.graph,
+            platform=platform,
+            platform_instance=platform_instance,
+            env=env,
+            default_db=default_db,
+        )
+
+        if not sql_parsing_result.debug_info.table_error:
+            context.log.info(
+                f"SQL Parsing Result: {sql_parsing_result} for query: {sql_query}"
+            )
+            return Lineage(
+                upstreams=sql_parsing_result.in_tables,
+                downstreams=sql_parsing_result.out_tables,
             )
-            return dagster_environment
         else:
-            context.log.error("Unable to get Dagster Environment...")
-            return None
+            context.log.error(
+                f"Error in parsing sql: {sql_parsing_result.debug_info.table_error} for query: {sql_query}"
+            )
+        return None
 
-    def process_asset_logs(
+    def process_asset_materialization(
         self,
-        dagster_generator: DagsterGenerator,
         log: EventLogEntry,
-        dataset_inputs: Dict[str, set],
-        dataset_outputs: Dict[str, set],
+        context: RunStatusSensorContext,
+        dagster_generator: DagsterGenerator,
+        dataset_inputs: Dict[str, Set[DatasetUrn]],
+        dataset_outputs: Dict[str, Set[DatasetUrn]],
     ) -> None:
-
-        if not log.dagster_event or not log.step_key:
-            return
-
-        if log.dagster_event.event_type == DagsterEventType.ASSET_MATERIALIZATION:
-            if log.step_key not in dataset_outputs:
-                dataset_outputs[log.step_key] = set()
+        if (
+            log.dagster_event
+            and log.dagster_event.event_type == DagsterEventType.ASSET_MATERIALIZATION
+        ):
+            assert log.step_key
 
             materialization = log.asset_materialization
             if not materialization:
@@ -184,50 +328,159 @@ def process_asset_logs(
                 key: str(value) for (key, value) in materialization.metadata.items()
             }
             asset_key = materialization.asset_key.path
-            dataset_urn = dagster_generator.emit_asset(
-                self.graph, asset_key, materialization.description, properties
-            )
-            dataset_outputs[log.step_key].add(dataset_urn)
 
-        elif log.dagster_event.event_type == DagsterEventType.ASSET_OBSERVATION:
-            if log.step_key not in dataset_inputs:
-                dataset_inputs[log.step_key] = set()
-            asset_observation = log.asset_observation
-            if not asset_observation:
-                return
+            asset_downstream_urn: Optional[DatasetUrn] = None
+            # If DataHub Urn is set then we prefer that as downstream urn
+            if materialization.metadata.get("datahub_urn") and isinstance(
+                materialization.metadata.get("datahub_urn"), TextMetadataValue
+            ):
+                try:
+                    asset_downstream_urn = DatasetUrn.from_string(
+                        str(materialization.metadata["datahub_urn"].text)
+                    )
+                    context.log.info(
+                        f"asset_downstream_urn from metadata datahub_urn: {asset_downstream_urn}"
+                    )
+                except Exception as e:
+                    context.log.error(f"Error in parsing datahub_urn: {e}")
 
-            properties = {
-                key: str(value)
-                for (key, value) in asset_observation.metadata.items()  # type: ignore
-            }
-            asset_key = asset_observation.asset_key.path  # type: ignore
-            dataset_urn = dagster_generator.emit_asset(
-                self.graph,
-                asset_key,
-                asset_observation.description,
-                properties,  # type: ignore
+            if not asset_downstream_urn:
+                asset_downstream_urn = (
+                    dagster_generator.asset_keys_to_dataset_urn_converter(asset_key)
+                )
+                context.log.info(
+                    f"asset_downstream_urn from asset keys: {asset_downstream_urn}"
+                )
+
+            if asset_downstream_urn:
+                context.log.info(f"asset_downstream_urn: {asset_downstream_urn}")
+
+                downstreams = {asset_downstream_urn.urn()}
+                context.log.info(f"downstreams: {downstreams}")
+                upstreams: Set[str] = set()
+                if self.config.enable_asset_query_metadata_parsing:
+                    try:
+                        if (
+                            materialization
+                            and materialization.metadata
+                            and materialization.metadata.get("Query")
+                            and isinstance(
+                                materialization.metadata.get("Query"), TextMetadataValue
+                            )
+                        ):
+                            query_metadata = materialization.metadata.get("Query")
+                            assert query_metadata
+                            lineage = self.parse_sql(
+                                context=context,
+                                sql_query=str(query_metadata.text),
+                                env=asset_downstream_urn.env,
+                                platform=asset_downstream_urn.platform.replace(
+                                    "urn:li:dataPlatform:", ""
+                                ),
+                            )
+                            # To make sure we don't process select queries check if downstream is present
+                            if lineage and lineage.downstreams:
+                                downstreams = downstreams.union(
+                                    set(lineage.downstreams)
+                                )
+                                upstreams = upstreams.union(set(lineage.upstreams))
+                                context.log.info(
+                                    f"Upstreams: {upstreams} Downstreams: {downstreams}"
+                                )
+                            else:
+                                context.log.info(
+                                    f"Lineage not found for {query_metadata.text}"
+                                )
+                        else:
+                            context.log.info("Query not found in metadata")
+                    except Exception as e:
+                        context.log.info(f"Error in processing asset logs: {e}")
+
+                # Emitting asset with upstreams and downstreams
+                dataset_urn = dagster_generator.emit_asset(
+                    self.graph,
+                    asset_key,
+                    materialization.description,
+                    properties,
+                    downstreams=downstreams,
+                    upstreams=upstreams,
+                    materialize_dependencies=self.config.materialize_dependencies,
+                )
+
+                dataset_outputs[log.step_key].add(dataset_urn)
+
+    def process_asset_observation(
+        self,
+        log: EventLogEntry,
+        context: RunStatusSensorContext,
+        dagster_generator: DagsterGenerator,
+        dataset_inputs: Dict[str, set],
+        dataset_outputs: Dict[str, set],
+    ) -> None:
+        asset_observation = log.asset_observation
+        if not asset_observation:
+            return
+
+        assert log.step_key
+
+        properties = {
+            key: str(value)
+            for (key, value) in asset_observation.metadata.items()  # type: ignore
+        }
+        asset_key = asset_observation.asset_key.path  # type: ignore
+        dataset_urn = dagster_generator.emit_asset(
+            self.graph,
+            asset_key,
+            asset_observation.description,
+            properties,  # type: ignore
+        )
+        dataset_inputs[log.step_key].add(dataset_urn)
+
+    def process_asset_logs(
+        self,
+        context: RunStatusSensorContext,
+        dagster_generator: DagsterGenerator,
+        log: EventLogEntry,
+        dataset_inputs: Dict[str, Set[DatasetUrn]],
+        dataset_outputs: Dict[str, Set[DatasetUrn]],
+    ) -> None:
+        context.log.info("Processing Asset Logs")
+        if not log.dagster_event or not log.step_key:
+            return
+
+        if log.dagster_event.event_type == DagsterEventType.ASSET_MATERIALIZATION:
+            self.process_asset_materialization(
+                log=log,
+                context=context,
+                dagster_generator=dagster_generator,
+                dataset_inputs=dataset_inputs,
+                dataset_outputs=dataset_outputs,
+            )
+        elif log.dagster_event.event_type == DagsterEventType.ASSET_OBSERVATION:
+            self.process_asset_observation(
+                log=log,
+                context=context,
+                dagster_generator=dagster_generator,
+                dataset_inputs=dataset_inputs,
+                dataset_outputs=dataset_outputs,
             )
-            dataset_inputs[log.step_key].add(dataset_urn)
 
     def process_handle_input_output(
         self,
         context: RunStatusSensorContext,
         log: EventLogEntry,
         dagster_generator: DagsterGenerator,
-        dataset_inputs: Dict[str, set],
-        dataset_outputs: Dict[str, set],
+        dataset_inputs: Dict[str, Set[DatasetUrn]],
+        dataset_outputs: Dict[str, Set[DatasetUrn]],
     ) -> None:
         if not log.dagster_event or not log.step_key:
             return
 
+        event_specific_data = log.dagster_event.event_specific_data
         if (
             self.config.capture_input_output
             and log.dagster_event.event_type == DagsterEventType.HANDLED_OUTPUT
         ):
-            if log.step_key not in dataset_outputs:
-                dataset_outputs[log.step_key] = set()
-
-            event_specific_data = log.dagster_event.event_specific_data
             if isinstance(event_specific_data, HandledOutputData):
                 context.log.debug(
                     f"Output Path: {event_specific_data.metadata.get('path')}"
@@ -244,9 +497,6 @@ def process_handle_input_output(
             self.config.capture_input_output
             and log.dagster_event.event_type == DagsterEventType.LOADED_INPUT
         ):
-            if log.step_key not in dataset_inputs:
-                dataset_inputs[log.step_key] = set()
-            event_specific_data = log.dagster_event.event_specific_data
             if isinstance(event_specific_data, LoadedInputData):
                 context.log.debug(
                     f"Input Path: {event_specific_data.metadata.get('path')}"
@@ -262,9 +512,9 @@ def process_handle_input_output(
 
     def process_dagster_logs(
         self, context: RunStatusSensorContext, dagster_generator: DagsterGenerator
-    ) -> Tuple[Dict[str, set], Dict[str, set]]:
-        dataset_outputs: Dict[str, set] = {}
-        dataset_inputs: Dict[str, set] = {}
+    ) -> Tuple[Dict[str, Set[DatasetUrn]], Dict[str, Set[DatasetUrn]]]:
+        dataset_outputs: Dict[str, Set[DatasetUrn]] = defaultdict(lambda: set())
+        dataset_inputs: Dict[str, Set[DatasetUrn]] = defaultdict(lambda: set())
 
         logs = context.instance.all_logs(
             context.dagster_run.run_id,
@@ -273,6 +523,7 @@ def process_dagster_logs(
                 DagsterEventType.ASSET_OBSERVATION,
                 DagsterEventType.HANDLED_OUTPUT,
                 DagsterEventType.LOADED_INPUT,
+                DagsterEventType.RESOURCE_INIT_SUCCESS,
             },
         )
 
@@ -281,6 +532,9 @@ def process_dagster_logs(
                 continue
             context.log.debug(f"Log: {log.step_key} - {log.dagster_event}")
             context.log.debug(f"Event Type: {log.dagster_event.event_type}")
+            context.log.info(f"Log: {log.step_key} - {log.dagster_event}")
+            context.log.info(f"Event Type: {log.dagster_event.event_type}")
+
             if self.config.capture_input_output:
                 self.process_handle_input_output(
                     context=context,
@@ -292,6 +546,7 @@ def process_dagster_logs(
 
             if self.config.capture_asset_materialization:
                 self.process_asset_logs(
+                    context=context,
                     dagster_generator=dagster_generator,
                     log=log,
                     dataset_inputs=dataset_inputs,
@@ -312,6 +567,25 @@ def merge_dicts(dict1: Dict[str, Set], dict2: Dict[str, Set]) -> Dict[str, Set]:
                 dict1[key] = value
         return dict1
 
+    def _emit_asset_metadata(
+        self, context: MultiAssetSensorEvaluationContext
+    ) -> AssetMaterializationFunctionReturn:
+        dagster_environment = self.get_dagster_environment()
+        context.log.debug(f"dagster enivronment: {dagster_environment}")
+        if not dagster_environment:
+            return SkipReason("Unable to get Dagster Environment from DataHub Sensor")
+
+        dagster_generator = DagsterGenerator(
+            logger=context.log,
+            config=self.config,
+            dagster_environment=dagster_environment,
+        )
+
+        context.log.info("Emitting asset metadata...")
+        dagster_generator.update_asset_group_name_cache(context)
+
+        return SkipReason("Asset metadata processed")
+
     def _emit_metadata(
         self, context: RunStatusSensorContext
     ) -> RawSensorEvaluationFunctionReturn:
@@ -320,7 +594,24 @@ def _emit_metadata(
         """
         try:
             context.log.info("Emitting metadata...")
-
+            assets = load_assets_from_modules([ModuleType(name="dagster_jobs")])
+            context.log.info(f"Assets: {assets}")
+            context.log.info(f"Job Name: {context.dagster_run.job_name}")
+            context.log.info(f"Code Origin: {context.dagster_run.job_code_origin}")
+            context.log.info(f"Resource: {context.resources.original_resource_dict}")
+            context.log.info(f"Asset Key: {context.dagster_event.asset_key}")
+
+            context.log.info(f"Step Key: {context.dagster_event.step_key}")
+            context.log.info(
+                f"Event Specific Data: {context.dagster_event.event_specific_data}"
+            )
+            context.log.info(f"Tags: {context.dagster_run.tags}")
+            context.log.info(
+                f"Run Stats: {context.instance.get_run_stats(context.dagster_run.run_id)}"
+            )
+            context.log.info(
+                f"Run Stats: {context.instance.get_run_record_by_id(context.dagster_run.run_id)}"
+            )
             assert context.dagster_run.job_snapshot_id
             assert context.dagster_run.execution_plan_snapshot_id
 
@@ -343,8 +634,8 @@ def _emit_metadata(
                 snapshot_id=context.dagster_run.job_snapshot_id
             )
 
-            dataset_inputs: Dict[str, Set] = {}
-            dataset_outputs: Dict[str, Set] = {}
+            dataset_inputs: Dict[str, Set[DatasetUrn]] = {}
+            dataset_outputs: Dict[str, Set[DatasetUrn]] = {}
 
             if self.config.asset_lineage_extractor:
                 asset_lineages = self.config.asset_lineage_extractor(
@@ -377,7 +668,11 @@ def _emit_metadata(
                 env=self.config.env,
                 platform_instance=self.config.platform_instance,
             )
+
             dataflow.emit(self.graph)
+            if self.config.debug_mode:
+                for mcp in dataflow.generate_mcp():
+                    context.log.debug(f"Emitted MCP: {mcp}")
 
             # Emit dagster job run which get mapped with datahub data process instance entity
             dagster_generator.emit_job_run(
@@ -413,9 +708,13 @@ def _emit_metadata(
                     output_datasets=dataset_outputs,
                     input_datasets=dataset_inputs,
                 )
-                context.log.info(f"Generated Datajob: {datajob}")
+
                 datajob.emit(self.graph)
 
+                if self.config.debug_mode:
+                    for mcp in datajob.generate_mcp():
+                        context.log.debug(f"Emitted MCP: {mcp}")
+
                 self.graph.emit_mcp(
                     mcp=MetadataChangeProposalWrapper(
                         entityUrn=str(datajob.urn),
@@ -430,7 +729,7 @@ def _emit_metadata(
                     datajob=datajob,
                     run_step_stats=run_step_stats[op_def_snap.name],
                 )
-
+            context.log.info("Metadata emitted to DataHub successfully")
             return SkipReason("Pipeline metadata is emitted to DataHub")
         except Exception as e:
             context.log.error(
diff --git a/metadata-ingestion-modules/gx-plugin/.gitignore b/metadata-ingestion-modules/gx-plugin/.gitignore
new file mode 100644
index 00000000000000..8c01744589e35e
--- /dev/null
+++ b/metadata-ingestion-modules/gx-plugin/.gitignore
@@ -0,0 +1,143 @@
+.envrc
+src/datahub_gx_plugin/__init__.py.bak
+.vscode/
+output
+pvenv36/
+bq_credentials.json
+/tmp
+*.bak
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# Generated classes
+src/datahub/metadata/
+wheels/
+junit.quick.xml
diff --git a/metadata-ingestion-modules/gx-plugin/README.md b/metadata-ingestion-modules/gx-plugin/README.md
new file mode 100644
index 00000000000000..1ffd87a955432d
--- /dev/null
+++ b/metadata-ingestion-modules/gx-plugin/README.md
@@ -0,0 +1,4 @@
+# Datahub GX Plugin
+
+See the DataHub GX docs for details.
+
diff --git a/metadata-ingestion-modules/gx-plugin/build.gradle b/metadata-ingestion-modules/gx-plugin/build.gradle
new file mode 100644
index 00000000000000..f1adbc6676e5bc
--- /dev/null
+++ b/metadata-ingestion-modules/gx-plugin/build.gradle
@@ -0,0 +1,123 @@
+plugins {
+    id 'base'
+}
+
+ext {
+  python_executable = 'python3'
+  venv_name = 'venv'
+}
+
+if (!project.hasProperty("extra_pip_requirements")) {
+    ext.extra_pip_requirements = ""
+}
+
+def pip_install_command = "VIRTUAL_ENV=${venv_name} ${venv_name}/bin/uv pip install -e ../../metadata-ingestion"
+
+task checkPythonVersion(type: Exec) {
+  commandLine python_executable, '-c', 'import sys; assert sys.version_info >= (3, 8)'
+}
+
+task environmentSetup(type: Exec, dependsOn: checkPythonVersion) {
+  def sentinel_file = "${venv_name}/.venv_environment_sentinel"
+  inputs.file file('setup.py')
+  outputs.file(sentinel_file)
+  commandLine 'bash', '-c',
+      "${python_executable} -m venv ${venv_name} && " +
+      "${venv_name}/bin/python -m pip install --upgrade pip uv wheel 'setuptools>=63.0.0' && " +
+      "touch ${sentinel_file}"
+}
+
+task installPackage(type: Exec, dependsOn: [environmentSetup, ':metadata-ingestion:codegen']) {
+  def sentinel_file = "${venv_name}/.build_install_package_sentinel"
+  inputs.file file('setup.py')
+  outputs.file(sentinel_file)
+  commandLine 'bash', '-c',
+      "source ${venv_name}/bin/activate && set -x && " +
+          "${pip_install_command} -e . ${extra_pip_requirements} && " +
+          "touch ${sentinel_file}"
+}
+
+task install(dependsOn: [installPackage])
+
+task installDev(type: Exec, dependsOn: [install]) {
+  def sentinel_file = "${venv_name}/.build_install_dev_sentinel"
+  inputs.file file('setup.py')
+  outputs.file(sentinel_file)
+  commandLine 'bash', '-c',
+      "source ${venv_name}/bin/activate && set -x && " +
+      "${pip_install_command} -e .[dev] ${extra_pip_requirements} && " +
+      "touch ${sentinel_file}"
+}
+
+task lint(type: Exec, dependsOn: installDev) {
+  commandLine 'bash', '-c',
+    "source ${venv_name}/bin/activate && set -x && " +
+    "black --check --diff src/ tests/ && " +
+    "isort --check --diff src/ tests/ && " +
+    "flake8 --count --statistics src/ tests/ && " +
+    "mypy --show-traceback --show-error-codes src/ tests/"
+}
+task lintFix(type: Exec, dependsOn: installDev) {
+  commandLine 'bash', '-x', '-c',
+    "source ${venv_name}/bin/activate && " +
+    "black src/ tests/ && " +
+    "isort src/ tests/ && " +
+    "flake8 src/ tests/ && " +
+    "mypy src/ tests/"
+}
+
+task installDevTest(type: Exec, dependsOn: [installDev]) {
+  def sentinel_file = "${venv_name}/.build_install_dev_test_sentinel"
+  inputs.file file('setup.py')
+  outputs.dir("${venv_name}")
+  outputs.file(sentinel_file)
+  commandLine 'bash', '-c',
+      "source ${venv_name}/bin/activate && set -x && " +
+      "${pip_install_command} -e .[dev,integration-tests] ${extra_pip_requirements} && " +
+      "touch ${sentinel_file}"
+}
+
+def testFile = hasProperty('testFile') ? testFile : 'unknown'
+task testSingle(dependsOn: [installDevTest]) {
+  doLast {
+  if (testFile != 'unknown')  {
+  exec {
+    commandLine 'bash', '-x', '-c',
+     "source ${venv_name}/bin/activate && pytest ${testFile}"
+    }
+  } else {
+   throw new GradleException("No file provided. Use -PtestFile=<test_file>")
+    }
+  }
+}
+
+task testQuick(type: Exec, dependsOn: installDevTest) {
+  // We can't enforce the coverage requirements if we run a subset of the tests.
+  inputs.files(project.fileTree(dir: "src/", include: "**/*.py"))
+  inputs.files(project.fileTree(dir: "tests/"))
+  outputs.dir("${venv_name}")
+  commandLine 'bash', '-x', '-c',
+    "source ${venv_name}/bin/activate && pytest -vv --continue-on-collection-errors --junit-xml=junit.quick.xml"
+}
+
+
+task buildWheel(type: Exec, dependsOn: [environmentSetup]) {
+  commandLine 'bash', '-c', "source ${venv_name}/bin/activate && " +
+  'uv pip install build && RELEASE_VERSION="\${RELEASE_VERSION:-0.0.0.dev1}" RELEASE_SKIP_INSTALL=1 RELEASE_SKIP_UPLOAD=1 ./scripts/release.sh'
+}
+
+task cleanPythonCache(type: Exec) {
+  commandLine 'bash', '-c',
+    "find src -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete -o -type d -empty -delete"
+}
+
+build.dependsOn install
+check.dependsOn lint
+check.dependsOn testQuick
+
+clean {
+  delete venv_name
+  delete 'build'
+  delete 'dist'
+}
+clean.dependsOn cleanPythonCache
diff --git a/metadata-ingestion-modules/gx-plugin/pyproject.toml b/metadata-ingestion-modules/gx-plugin/pyproject.toml
new file mode 100644
index 00000000000000..fba81486b9f677
--- /dev/null
+++ b/metadata-ingestion-modules/gx-plugin/pyproject.toml
@@ -0,0 +1,19 @@
+[build-system]
+build-backend = "setuptools.build_meta"
+requires = ["setuptools>=54.0.0", "wheel", "pip>=21.0.0"]
+
+[tool.black]
+extend-exclude = '''
+# A regex preceded with ^/ will apply only to files and directories
+# in the root of the project.
+^/tmp
+'''
+include = '\.pyi?$'
+
+[tool.isort]
+indent = '    '
+profile = 'black'
+sections = 'FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER'
+
+[tool.pyright]
+extraPaths = ['tests']
\ No newline at end of file
diff --git a/metadata-ingestion-modules/gx-plugin/scripts/release.sh b/metadata-ingestion-modules/gx-plugin/scripts/release.sh
new file mode 100755
index 00000000000000..058add495821cb
--- /dev/null
+++ b/metadata-ingestion-modules/gx-plugin/scripts/release.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -euxo pipefail
+
+if [[ ! ${RELEASE_SKIP_TEST:-} ]] && [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
+	../../gradlew build  # also runs tests
+elif [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
+	../../gradlew install
+fi
+
+MODULE=datahub_gx_plugin
+
+# Check packaging constraint.
+python -c 'import setuptools; where="./src"; assert setuptools.find_packages(where) == setuptools.find_namespace_packages(where), "you seem to be missing or have extra __init__.py files"'
+if [[ ${RELEASE_VERSION:-} ]]; then
+    # Replace version with RELEASE_VERSION env variable
+    sed -i.bak "s/__version__ = \"1\!0.0.0.dev0\"/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/${MODULE}/__init__.py
+else
+    vim src/${MODULE}/__init__.py
+fi
+
+rm -rf build dist || true
+python -m build
+if [[ ! ${RELEASE_SKIP_UPLOAD:-} ]]; then
+    python -m twine upload 'dist/*'
+fi
+mv src/${MODULE}/__init__.py.bak src/${MODULE}/__init__.py
diff --git a/metadata-ingestion-modules/gx-plugin/setup.cfg b/metadata-ingestion-modules/gx-plugin/setup.cfg
new file mode 100644
index 00000000000000..bbdd85f0fdc4ed
--- /dev/null
+++ b/metadata-ingestion-modules/gx-plugin/setup.cfg
@@ -0,0 +1,71 @@
+[flake8]
+max-complexity = 15
+ignore =
+    # Ignore: line length issues, since black's formatter will take care of them.
+    E501,
+    # Ignore: 1 blank line required before class docstring.
+    D203,
+    # See https://stackoverflow.com/a/57074416.
+    W503,
+    # See https://github.com/psf/black/issues/315.
+    E203
+exclude =
+    .git,
+    venv,
+    .tox,
+    __pycache__
+per-file-ignores =
+    # imported but unused
+    __init__.py: F401
+ban-relative-imports = true
+
+[mypy]
+plugins =
+    pydantic.mypy
+exclude = ^(venv|build|dist)/
+ignore_missing_imports = yes
+strict_optional = yes
+check_untyped_defs = yes
+disallow_incomplete_defs = yes
+disallow_untyped_decorators = yes
+warn_unused_configs = yes
+# eventually we'd like to enable these
+disallow_untyped_defs = no
+
+# try to be a bit more strict in certain areas of the codebase
+[mypy-datahub.*]
+ignore_missing_imports = no
+[mypy-tests.*]
+ignore_missing_imports = no
+
+[tool:pytest]
+asyncio_mode = auto
+addopts = --cov=src --cov-report term-missing --cov-config setup.cfg --strict-markers
+markers =
+    integration: marks all integration tests, across all batches (deselect with '-m "not integration"')
+testpaths = 
+    tests/unit
+    tests/integration
+
+[coverage:run]
+# Because of some quirks in the way setup.cfg, coverage.py, pytest-cov,
+# and tox interact, we should not uncomment the following line.
+# See https://pytest-cov.readthedocs.io/en/latest/config.html and
+# https://coverage.readthedocs.io/en/coverage-5.0/config.html.
+# We also have some additional pytest/cov config options in tox.ini.
+# source = src
+
+[coverage:paths]
+# This is necessary for tox-based coverage to be counted properly.
+source =
+   src
+   */site-packages
+
+[coverage:report]
+# The fail_under value ensures that at least some coverage data is collected.
+# We override its value in the tox config.
+show_missing = true
+exclude_lines =
+    pragma: no cover
+    @abstract
+    if TYPE_CHECKING:
diff --git a/metadata-ingestion-modules/gx-plugin/setup.py b/metadata-ingestion-modules/gx-plugin/setup.py
new file mode 100644
index 00000000000000..48b9d2d170d8cc
--- /dev/null
+++ b/metadata-ingestion-modules/gx-plugin/setup.py
@@ -0,0 +1,158 @@
+import os
+import pathlib
+
+import setuptools
+
+package_metadata: dict = {}
+with open("./src/datahub_gx_plugin/__init__.py") as fp:
+    exec(fp.read(), package_metadata)
+
+
+def get_long_description():
+    root = os.path.dirname(__file__)
+    return pathlib.Path(os.path.join(root, "README.md")).read_text()
+
+
+rest_common = {"requests", "requests_file"}
+
+# TODO: Can we move away from sqllineage and use sqlglot ??
+sqllineage_lib = {
+    "sqllineage==1.3.8",
+    # We don't have a direct dependency on sqlparse but it is a dependency of sqllineage.
+    # There have previously been issues from not pinning sqlparse, so it's best to pin it.
+    # Related: https://github.com/reata/sqllineage/issues/361 and https://github.com/reata/sqllineage/pull/360
+    "sqlparse==0.4.4",
+}
+
+_version: str = package_metadata["__version__"]
+_self_pin = (
+    f"=={_version}"
+    if not (_version.endswith(("dev0", "dev1")) or "docker" in _version)
+    else ""
+)
+
+base_requirements = {
+    # Actual dependencies.
+    # This is temporary lower bound that we're open to loosening/tightening as requirements show up
+    "sqlalchemy>=1.4.39, <2",
+    # GE added handling for higher version of jinja2 in version 0.15.12
+    # https://github.com/great-expectations/great_expectations/pull/5382/files
+    # TODO: support GX 0.18.0
+    "great-expectations>=0.15.12, <0.18.0",
+    # datahub does not depend on traitlets directly but great expectations does.
+    # https://github.com/ipython/traitlets/issues/741
+    "traitlets<5.2.2",
+    *rest_common,
+    *sqllineage_lib,
+    f"acryl-datahub[datahub-rest]{_self_pin}",
+}
+
+mypy_stubs = {
+    "types-dataclasses",
+    "sqlalchemy-stubs",
+    "types-setuptools",
+    "types-six",
+    "types-python-dateutil",
+    "types-requests",
+    "types-toml",
+    "types-PyYAML",
+    "types-freezegun",
+    "types-cachetools",
+    # versions 0.1.13 and 0.1.14 seem to have issues
+    "types-click==0.1.12",
+    "types-tabulate",
+    # avrogen package requires this
+    "types-pytz",
+}
+
+base_dev_requirements = {
+    *base_requirements,
+    *mypy_stubs,
+    "black==22.12.0",
+    "coverage>=5.1",
+    "flake8>=6.0.0",
+    "flake8-tidy-imports>=4.3.0",
+    "flake8-bugbear==23.3.12",
+    "isort>=5.7.0",
+    "mypy>=1.4.0",
+    # pydantic 1.8.2 is incompatible with mypy 0.910.
+    # See https://github.com/samuelcolvin/pydantic/pull/3175#issuecomment-995382910.
+    "pydantic>=1.10.0,!=1.10.3",
+    "pytest>=6.2.2",
+    "pytest-asyncio>=0.16.0",
+    "pytest-cov>=2.8.1",
+    "tox",
+    # Missing numpy requirement in 8.0.0
+    "deepdiff!=8.0.0",
+    "requests-mock",
+    "freezegun",
+    "jsonpickle",
+    "build",
+    "twine",
+    "packaging",
+}
+
+dev_requirements = {
+    *base_dev_requirements,
+}
+
+integration_test_requirements = {
+    *dev_requirements,
+    "psycopg2-binary",
+    "pyspark",
+    f"acryl-datahub[testing-utils]{_self_pin}",
+    "pytest-docker>=1.1.0",
+}
+
+entry_points = {
+    "gx.plugins": "acryl-datahub-gx-plugin = datahub_gx_plugin.action:DataHubValidationAction"
+}
+
+
+setuptools.setup(
+    # Package metadata.
+    name=package_metadata["__package_name__"],
+    version=package_metadata["__version__"],
+    url="https://datahubproject.io/",
+    project_urls={
+        "Documentation": "https://datahubproject.io/docs/",
+        "Source": "https://github.com/datahub-project/datahub",
+        "Changelog": "https://github.com/datahub-project/datahub/releases",
+    },
+    license="Apache License 2.0",
+    description="Datahub GX plugin to capture executions and send to Datahub",
+    long_description=get_long_description(),
+    long_description_content_type="text/markdown",
+    classifiers=[
+        "Development Status :: 5 - Production/Stable",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3 :: Only",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Intended Audience :: Developers",
+        "Intended Audience :: Information Technology",
+        "Intended Audience :: System Administrators",
+        "License :: OSI Approved",
+        "License :: OSI Approved :: Apache Software License",
+        "Operating System :: Unix",
+        "Operating System :: POSIX :: Linux",
+        "Environment :: Console",
+        "Environment :: MacOS X",
+        "Topic :: Software Development",
+    ],
+    # Package info.
+    zip_safe=False,
+    python_requires=">=3.8",
+    package_dir={"": "src"},
+    packages=setuptools.find_namespace_packages(where="./src"),
+    entry_points=entry_points,
+    # Dependencies.
+    install_requires=list(base_requirements),
+    extras_require={
+        "ignore": [],  # This is a dummy extra to allow for trailing commas in the list.
+        "dev": list(dev_requirements),
+        "integration-tests": list(integration_test_requirements),
+    },
+)
diff --git a/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/__init__.py b/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/__init__.py
new file mode 100644
index 00000000000000..a7689be82a5d99
--- /dev/null
+++ b/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/__init__.py
@@ -0,0 +1,21 @@
+# Published at https://pypi.org/project/acryl-datahub/.
+__package_name__ = "acryl-datahub-gx-plugin"
+__version__ = "1!0.0.0.dev0"
+
+
+def is_dev_mode() -> bool:
+    return __version__.endswith("dev0")
+
+
+def nice_version_name() -> str:
+    if is_dev_mode():
+        return "unavailable (installed in develop mode)"
+    return __version__
+
+
+def get_provider_info():
+    return {
+        "package-name": f"{__package_name__}",
+        "name": f"{__package_name__}",
+        "description": "Datahub metadata collector plugin",
+    }
diff --git a/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/action.py b/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/action.py
new file mode 100644
index 00000000000000..76e43cf8c2c3db
--- /dev/null
+++ b/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/action.py
@@ -0,0 +1,871 @@
+import json
+import logging
+import sys
+import time
+from dataclasses import dataclass
+from datetime import timezone
+from decimal import Decimal
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
+
+import datahub.emitter.mce_builder as builder
+from datahub.cli.env_utils import get_boolean_env_variable
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.emitter.rest_emitter import DatahubRestEmitter
+from datahub.emitter.serialization_helper import pre_json_transform
+from datahub.ingestion.source.sql.sqlalchemy_uri_mapper import (
+    get_platform_from_sqlalchemy_uri,
+)
+from datahub.metadata.com.linkedin.pegasus2avro.assertion import (
+    AssertionInfo,
+    AssertionResult,
+    AssertionResultType,
+    AssertionRunEvent,
+    AssertionRunStatus,
+    AssertionStdAggregation,
+    AssertionStdOperator,
+    AssertionStdParameter,
+    AssertionStdParameters,
+    AssertionStdParameterType,
+    AssertionType,
+    BatchSpec,
+    DatasetAssertionInfo,
+    DatasetAssertionScope,
+)
+from datahub.metadata.com.linkedin.pegasus2avro.common import DataPlatformInstance
+from datahub.metadata.schema_classes import PartitionSpecClass, PartitionTypeClass
+from datahub.utilities._markupsafe_compat import MARKUPSAFE_PATCHED
+from datahub.utilities.sql_parser import DefaultSQLParser
+from great_expectations.checkpoint.actions import ValidationAction
+from great_expectations.core.batch import Batch
+from great_expectations.core.batch_spec import (
+    RuntimeDataBatchSpec,
+    RuntimeQueryBatchSpec,
+    SqlAlchemyDatasourceBatchSpec,
+)
+from great_expectations.core.expectation_validation_result import (
+    ExpectationSuiteValidationResult,
+)
+from great_expectations.data_asset.data_asset import DataAsset
+from great_expectations.data_context import AbstractDataContext
+from great_expectations.data_context.types.resource_identifiers import (
+    ExpectationSuiteIdentifier,
+    ValidationResultIdentifier,
+)
+from great_expectations.execution_engine import PandasExecutionEngine
+from great_expectations.execution_engine.sqlalchemy_execution_engine import (
+    SqlAlchemyExecutionEngine,
+)
+from great_expectations.validator.validator import Validator
+from sqlalchemy.engine.base import Connection, Engine
+from sqlalchemy.engine.url import make_url
+
+if TYPE_CHECKING:
+    from great_expectations.data_context.types.resource_identifiers import (
+        GXCloudIdentifier,
+    )
+
+assert MARKUPSAFE_PATCHED
+logger = logging.getLogger(__name__)
+if get_boolean_env_variable("DATAHUB_DEBUG", False):
+    handler = logging.StreamHandler(stream=sys.stdout)
+    logger.addHandler(handler)
+    logger.setLevel(logging.DEBUG)
+
+GE_PLATFORM_NAME = "great-expectations"
+
+
+class DataHubValidationAction(ValidationAction):
+    def __init__(
+        self,
+        data_context: AbstractDataContext,
+        server_url: str,
+        env: str = builder.DEFAULT_ENV,
+        platform_alias: Optional[str] = None,
+        platform_instance_map: Optional[Dict[str, str]] = None,
+        graceful_exceptions: bool = True,
+        token: Optional[str] = None,
+        timeout_sec: Optional[float] = None,
+        retry_status_codes: Optional[List[int]] = None,
+        retry_max_times: Optional[int] = None,
+        extra_headers: Optional[Dict[str, str]] = None,
+        exclude_dbname: Optional[bool] = None,
+        parse_table_names_from_sql: bool = False,
+        convert_urns_to_lowercase: bool = False,
+        name: str = "DataHubValidationAction",
+    ):
+
+        super().__init__(data_context)
+        self.server_url = server_url
+        self.env = env
+        self.platform_alias = platform_alias
+        self.platform_instance_map = platform_instance_map
+        self.graceful_exceptions = graceful_exceptions
+        self.token = token
+        self.timeout_sec = timeout_sec
+        self.retry_status_codes = retry_status_codes
+        self.retry_max_times = retry_max_times
+        self.extra_headers = extra_headers
+        self.exclude_dbname = exclude_dbname
+        self.parse_table_names_from_sql = parse_table_names_from_sql
+        self.convert_urns_to_lowercase = convert_urns_to_lowercase
+
+    def _run(
+        self,
+        validation_result_suite: ExpectationSuiteValidationResult,
+        validation_result_suite_identifier: Union[
+            ValidationResultIdentifier, "GXCloudIdentifier"
+        ],
+        data_asset: Union[Validator, DataAsset, Batch],
+        payload: Optional[Any] = None,
+        expectation_suite_identifier: Optional[ExpectationSuiteIdentifier] = None,
+        checkpoint_identifier: Optional[Any] = None,
+    ) -> Dict:
+        datasets = []
+        try:
+            emitter = DatahubRestEmitter(
+                gms_server=self.server_url,
+                token=self.token,
+                read_timeout_sec=self.timeout_sec,
+                connect_timeout_sec=self.timeout_sec,
+                retry_status_codes=self.retry_status_codes,
+                retry_max_times=self.retry_max_times,
+                extra_headers=self.extra_headers,
+            )
+
+            expectation_suite_name = validation_result_suite.meta.get(
+                "expectation_suite_name"
+            )
+            run_id = validation_result_suite.meta.get("run_id")
+            if hasattr(data_asset, "active_batch_id"):
+                batch_identifier = data_asset.active_batch_id
+            else:
+                batch_identifier = data_asset.batch_id
+
+            if isinstance(
+                validation_result_suite_identifier, ValidationResultIdentifier
+            ):
+                expectation_suite_name = (
+                    validation_result_suite_identifier.expectation_suite_identifier.expectation_suite_name
+                )
+                run_id = validation_result_suite_identifier.run_id
+                batch_identifier = validation_result_suite_identifier.batch_identifier
+
+            # Returns datasets and corresponding batch requests
+            datasets = self.get_dataset_partitions(batch_identifier, data_asset)
+
+            if len(datasets) == 0 or datasets[0]["dataset_urn"] is None:
+                warn("Metadata not sent to datahub. No datasets found.")
+                return {"datahub_notification_result": "none required"}
+
+            # Returns assertion info and assertion results
+            assertions = self.get_assertions_with_results(
+                validation_result_suite,
+                expectation_suite_name,
+                run_id,
+                payload,
+                datasets,
+            )
+
+            logger.info("Sending metadata to datahub ...")
+            logger.info("Dataset URN - {urn}".format(urn=datasets[0]["dataset_urn"]))
+
+            for assertion in assertions:
+                logger.info(
+                    "Assertion URN - {urn}".format(urn=assertion["assertionUrn"])
+                )
+
+                # Construct a MetadataChangeProposalWrapper object.
+                assertion_info_mcp = MetadataChangeProposalWrapper(
+                    entityUrn=assertion["assertionUrn"],
+                    aspect=assertion["assertionInfo"],
+                )
+                emitter.emit_mcp(assertion_info_mcp)
+
+                # Construct a MetadataChangeProposalWrapper object.
+                assertion_platform_mcp = MetadataChangeProposalWrapper(
+                    entityUrn=assertion["assertionUrn"],
+                    aspect=assertion["assertionPlatform"],
+                )
+                emitter.emit_mcp(assertion_platform_mcp)
+
+                for assertionResult in assertion["assertionResults"]:
+                    dataset_assertionResult_mcp = MetadataChangeProposalWrapper(
+                        entityUrn=assertionResult.assertionUrn,
+                        aspect=assertionResult,
+                    )
+
+                    # Emit Result! (timeseries aspect)
+                    emitter.emit_mcp(dataset_assertionResult_mcp)
+            logger.info("Metadata sent to datahub.")
+            result = "DataHub notification succeeded"
+        except Exception as e:
+            result = "DataHub notification failed"
+            if self.graceful_exceptions:
+                logger.error(e)
+                logger.info("Suppressing error because graceful_exceptions is set")
+            else:
+                raise
+
+        return {"datahub_notification_result": result}
+
+    def get_assertions_with_results(
+        self,
+        validation_result_suite,
+        expectation_suite_name,
+        run_id,
+        payload,
+        datasets,
+    ):
+        dataPlatformInstance = DataPlatformInstance(
+            platform=builder.make_data_platform_urn(GE_PLATFORM_NAME)
+        )
+        docs_link = None
+        if payload:
+            # process the payload
+            for action_names in payload.keys():
+                if payload[action_names]["class"] == "UpdateDataDocsAction":
+                    data_docs_pages = payload[action_names]
+                    for docs_link_key, docs_link_val in data_docs_pages.items():
+                        if "file://" not in docs_link_val and docs_link_key != "class":
+                            docs_link = docs_link_val
+
+        assertions_with_results = []
+        for result in validation_result_suite.results:
+            expectation_config = result["expectation_config"]
+            expectation_type = expectation_config["expectation_type"]
+            success = bool(result["success"])
+            kwargs = {
+                k: v for k, v in expectation_config["kwargs"].items() if k != "batch_id"
+            }
+
+            result = result["result"]
+            assertion_datasets = [d["dataset_urn"] for d in datasets]
+            if len(datasets) == 1 and "column" in kwargs:
+                assertion_fields = [
+                    builder.make_schema_field_urn(
+                        datasets[0]["dataset_urn"], kwargs["column"]
+                    )
+                ]
+            else:
+                assertion_fields = None  # type:ignore
+
+            # Be careful what fields to consider for creating assertion urn.
+            # Any change in fields below would lead to a new assertion
+            # FIXME - Currently, when using evaluation parameters, new assertion is
+            # created when runtime resolved kwargs are different,
+            # possibly for each validation run
+            assertionUrn = builder.make_assertion_urn(
+                builder.datahub_guid(
+                    pre_json_transform(
+                        {
+                            "platform": GE_PLATFORM_NAME,
+                            "nativeType": expectation_type,
+                            "nativeParameters": kwargs,
+                            "dataset": assertion_datasets[0],
+                            "fields": assertion_fields,
+                        }
+                    )
+                )
+            )
+            logger.debug(
+                "GE expectation_suite_name - {name}, expectation_type - {type}, Assertion URN - {urn}".format(
+                    name=expectation_suite_name, type=expectation_type, urn=assertionUrn
+                )
+            )
+            assertionInfo: AssertionInfo = self.get_assertion_info(
+                expectation_type,
+                kwargs,
+                assertion_datasets[0],
+                assertion_fields,
+                expectation_suite_name,
+            )
+
+            # TODO: Understand why their run time is incorrect.
+            run_time = run_id.run_time.astimezone(timezone.utc)
+            evaluation_parameters = (
+                {
+                    k: convert_to_string(v)
+                    for k, v in validation_result_suite.evaluation_parameters.items()
+                    if k and v
+                }
+                if validation_result_suite.evaluation_parameters
+                else None
+            )
+
+            nativeResults = {
+                k: convert_to_string(v)
+                for k, v in result.items()
+                if (
+                    k
+                    in [
+                        "observed_value",
+                        "partial_unexpected_list",
+                        "partial_unexpected_counts",
+                        "details",
+                    ]
+                    and v
+                )
+            }
+
+            actualAggValue = (
+                result.get("observed_value")
+                if isinstance(result.get("observed_value"), (int, float))
+                else None
+            )
+
+            ds = datasets[0]
+            # https://docs.greatexpectations.io/docs/reference/expectations/result_format/
+            assertionResult = AssertionRunEvent(
+                timestampMillis=int(round(time.time() * 1000)),
+                assertionUrn=assertionUrn,
+                asserteeUrn=ds["dataset_urn"],
+                runId=run_time.strftime("%Y-%m-%dT%H:%M:%SZ"),
+                result=AssertionResult(
+                    type=(
+                        AssertionResultType.SUCCESS
+                        if success
+                        else AssertionResultType.FAILURE
+                    ),
+                    rowCount=parse_int_or_default(result.get("element_count")),
+                    missingCount=parse_int_or_default(result.get("missing_count")),
+                    unexpectedCount=parse_int_or_default(
+                        result.get("unexpected_count")
+                    ),
+                    actualAggValue=actualAggValue,
+                    externalUrl=docs_link,
+                    nativeResults=nativeResults,
+                ),
+                batchSpec=ds["batchSpec"],
+                status=AssertionRunStatus.COMPLETE,
+                runtimeContext=evaluation_parameters,
+            )
+            if ds.get("partitionSpec") is not None:
+                assertionResult.partitionSpec = ds.get("partitionSpec")
+            assertionResults = [assertionResult]
+            assertions_with_results.append(
+                {
+                    "assertionUrn": assertionUrn,
+                    "assertionInfo": assertionInfo,
+                    "assertionPlatform": dataPlatformInstance,
+                    "assertionResults": assertionResults,
+                }
+            )
+        return assertions_with_results
+
+    def get_assertion_info(
+        self, expectation_type, kwargs, dataset, fields, expectation_suite_name
+    ):
+        # TODO - can we find exact type of min and max value
+        def get_min_max(kwargs, type=AssertionStdParameterType.UNKNOWN):
+            return AssertionStdParameters(
+                minValue=AssertionStdParameter(
+                    value=convert_to_string(kwargs.get("min_value")),
+                    type=type,
+                ),
+                maxValue=AssertionStdParameter(
+                    value=convert_to_string(kwargs.get("max_value")),
+                    type=type,
+                ),
+            )
+
+        known_expectations: Dict[str, DataHubStdAssertion] = {
+            # column aggregate expectations
+            "expect_column_min_to_be_between": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_COLUMN,
+                operator=AssertionStdOperator.BETWEEN,
+                aggregation=AssertionStdAggregation.MIN,
+                parameters=get_min_max(kwargs),
+            ),
+            "expect_column_max_to_be_between": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_COLUMN,
+                operator=AssertionStdOperator.BETWEEN,
+                aggregation=AssertionStdAggregation.MAX,
+                parameters=get_min_max(kwargs),
+            ),
+            "expect_column_median_to_be_between": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_COLUMN,
+                operator=AssertionStdOperator.BETWEEN,
+                aggregation=AssertionStdAggregation.MEDIAN,
+                parameters=get_min_max(kwargs),
+            ),
+            "expect_column_stdev_to_be_between": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_COLUMN,
+                operator=AssertionStdOperator.BETWEEN,
+                aggregation=AssertionStdAggregation.STDDEV,
+                parameters=get_min_max(kwargs, AssertionStdParameterType.NUMBER),
+            ),
+            "expect_column_mean_to_be_between": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_COLUMN,
+                operator=AssertionStdOperator.BETWEEN,
+                aggregation=AssertionStdAggregation.MEAN,
+                parameters=get_min_max(kwargs, AssertionStdParameterType.NUMBER),
+            ),
+            "expect_column_unique_value_count_to_be_between": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_COLUMN,
+                operator=AssertionStdOperator.BETWEEN,
+                aggregation=AssertionStdAggregation.UNIQUE_COUNT,
+                parameters=get_min_max(kwargs, AssertionStdParameterType.NUMBER),
+            ),
+            "expect_column_proportion_of_unique_values_to_be_between": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_COLUMN,
+                operator=AssertionStdOperator.BETWEEN,
+                aggregation=AssertionStdAggregation.UNIQUE_PROPOTION,
+                parameters=get_min_max(kwargs, AssertionStdParameterType.NUMBER),
+            ),
+            "expect_column_sum_to_be_between": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_COLUMN,
+                operator=AssertionStdOperator.BETWEEN,
+                aggregation=AssertionStdAggregation.SUM,
+                parameters=get_min_max(kwargs, AssertionStdParameterType.NUMBER),
+            ),
+            "expect_column_quantile_values_to_be_between": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_COLUMN,
+                operator=AssertionStdOperator.BETWEEN,
+                aggregation=AssertionStdAggregation._NATIVE_,
+            ),
+            # column map expectations
+            "expect_column_values_to_not_be_null": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_COLUMN,
+                operator=AssertionStdOperator.NOT_NULL,
+                aggregation=AssertionStdAggregation.IDENTITY,
+            ),
+            "expect_column_values_to_be_in_set": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_COLUMN,
+                operator=AssertionStdOperator.IN,
+                aggregation=AssertionStdAggregation.IDENTITY,
+                parameters=AssertionStdParameters(
+                    value=AssertionStdParameter(
+                        value=convert_to_string(kwargs.get("value_set")),
+                        type=AssertionStdParameterType.SET,
+                    )
+                ),
+            ),
+            "expect_column_values_to_be_between": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_COLUMN,
+                operator=AssertionStdOperator.BETWEEN,
+                aggregation=AssertionStdAggregation.IDENTITY,
+                parameters=get_min_max(kwargs),
+            ),
+            "expect_column_values_to_match_regex": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_COLUMN,
+                operator=AssertionStdOperator.REGEX_MATCH,
+                aggregation=AssertionStdAggregation.IDENTITY,
+                parameters=AssertionStdParameters(
+                    value=AssertionStdParameter(
+                        value=kwargs.get("regex"),
+                        type=AssertionStdParameterType.STRING,
+                    )
+                ),
+            ),
+            "expect_column_values_to_match_regex_list": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_COLUMN,
+                operator=AssertionStdOperator.REGEX_MATCH,
+                aggregation=AssertionStdAggregation.IDENTITY,
+                parameters=AssertionStdParameters(
+                    value=AssertionStdParameter(
+                        value=convert_to_string(kwargs.get("regex_list")),
+                        type=AssertionStdParameterType.LIST,
+                    )
+                ),
+            ),
+            "expect_table_columns_to_match_ordered_list": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_SCHEMA,
+                operator=AssertionStdOperator.EQUAL_TO,
+                aggregation=AssertionStdAggregation.COLUMNS,
+                parameters=AssertionStdParameters(
+                    value=AssertionStdParameter(
+                        value=convert_to_string(kwargs.get("column_list")),
+                        type=AssertionStdParameterType.LIST,
+                    )
+                ),
+            ),
+            "expect_table_columns_to_match_set": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_SCHEMA,
+                operator=AssertionStdOperator.EQUAL_TO,
+                aggregation=AssertionStdAggregation.COLUMNS,
+                parameters=AssertionStdParameters(
+                    value=AssertionStdParameter(
+                        value=convert_to_string(kwargs.get("column_set")),
+                        type=AssertionStdParameterType.SET,
+                    )
+                ),
+            ),
+            "expect_table_column_count_to_be_between": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_SCHEMA,
+                operator=AssertionStdOperator.BETWEEN,
+                aggregation=AssertionStdAggregation.COLUMN_COUNT,
+                parameters=get_min_max(kwargs, AssertionStdParameterType.NUMBER),
+            ),
+            "expect_table_column_count_to_equal": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_SCHEMA,
+                operator=AssertionStdOperator.EQUAL_TO,
+                aggregation=AssertionStdAggregation.COLUMN_COUNT,
+                parameters=AssertionStdParameters(
+                    value=AssertionStdParameter(
+                        value=convert_to_string(kwargs.get("value")),
+                        type=AssertionStdParameterType.NUMBER,
+                    )
+                ),
+            ),
+            "expect_column_to_exist": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_SCHEMA,
+                operator=AssertionStdOperator._NATIVE_,
+                aggregation=AssertionStdAggregation._NATIVE_,
+            ),
+            "expect_table_row_count_to_equal": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_ROWS,
+                operator=AssertionStdOperator.EQUAL_TO,
+                aggregation=AssertionStdAggregation.ROW_COUNT,
+                parameters=AssertionStdParameters(
+                    value=AssertionStdParameter(
+                        value=convert_to_string(kwargs.get("value")),
+                        type=AssertionStdParameterType.NUMBER,
+                    )
+                ),
+            ),
+            "expect_table_row_count_to_be_between": DataHubStdAssertion(
+                scope=DatasetAssertionScope.DATASET_ROWS,
+                operator=AssertionStdOperator.BETWEEN,
+                aggregation=AssertionStdAggregation.ROW_COUNT,
+                parameters=get_min_max(kwargs, AssertionStdParameterType.NUMBER),
+            ),
+        }
+
+        datasetAssertionInfo = DatasetAssertionInfo(
+            dataset=dataset,
+            fields=fields,
+            operator=AssertionStdOperator._NATIVE_,
+            aggregation=AssertionStdAggregation._NATIVE_,
+            nativeType=expectation_type,
+            nativeParameters={k: convert_to_string(v) for k, v in kwargs.items()},
+            scope=DatasetAssertionScope.DATASET_ROWS,
+        )
+
+        if expectation_type in known_expectations.keys():
+            assertion = known_expectations[expectation_type]
+            datasetAssertionInfo.scope = assertion.scope
+            datasetAssertionInfo.aggregation = assertion.aggregation
+            datasetAssertionInfo.operator = assertion.operator
+            datasetAssertionInfo.parameters = assertion.parameters
+
+        # Heuristically mapping other expectations
+        else:
+            if "column" in kwargs and expectation_type.startswith(
+                "expect_column_value"
+            ):
+                datasetAssertionInfo.scope = DatasetAssertionScope.DATASET_COLUMN
+                datasetAssertionInfo.aggregation = AssertionStdAggregation.IDENTITY
+            elif "column" in kwargs:
+                datasetAssertionInfo.scope = DatasetAssertionScope.DATASET_COLUMN
+                datasetAssertionInfo.aggregation = AssertionStdAggregation._NATIVE_
+
+        return AssertionInfo(
+            type=AssertionType.DATASET,
+            datasetAssertion=datasetAssertionInfo,
+            customProperties={"expectation_suite_name": expectation_suite_name},
+        )
+
+    def get_dataset_partitions(self, batch_identifier, data_asset):
+        dataset_partitions = []
+
+        logger.debug("Finding datasets being validated")
+
+        # for now, we support only v3-api and sqlalchemy execution engine and Pandas engine
+        is_sql_alchemy = isinstance(data_asset, Validator) and (
+            isinstance(data_asset.execution_engine, SqlAlchemyExecutionEngine)
+        )
+        is_pandas = isinstance(data_asset.execution_engine, PandasExecutionEngine)
+        if is_sql_alchemy or is_pandas:
+            ge_batch_spec = data_asset.active_batch_spec
+            partitionSpec = None
+            batchSpecProperties = {
+                "data_asset_name": str(
+                    data_asset.active_batch_definition.data_asset_name
+                ),
+                "datasource_name": str(
+                    data_asset.active_batch_definition.datasource_name
+                ),
+            }
+            sqlalchemy_uri = None
+            if is_sql_alchemy and isinstance(
+                data_asset.execution_engine.engine, Engine
+            ):
+                sqlalchemy_uri = data_asset.execution_engine.engine.url
+            # For snowflake sqlalchemy_execution_engine.engine is actually instance of Connection
+            elif is_sql_alchemy and isinstance(
+                data_asset.execution_engine.engine, Connection
+            ):
+                sqlalchemy_uri = data_asset.execution_engine.engine.engine.url
+
+            if isinstance(ge_batch_spec, SqlAlchemyDatasourceBatchSpec):
+                # e.g. ConfiguredAssetSqlDataConnector with splitter_method or sampling_method
+                schema_name = ge_batch_spec.get("schema_name")
+                table_name = ge_batch_spec.get("table_name")
+
+                dataset_urn = make_dataset_urn_from_sqlalchemy_uri(
+                    sqlalchemy_uri,
+                    schema_name,
+                    table_name,
+                    self.env,
+                    self.get_platform_instance(
+                        data_asset.active_batch_definition.datasource_name
+                    ),
+                    self.exclude_dbname,
+                    self.platform_alias,
+                    self.convert_urns_to_lowercase,
+                )
+                batchSpec = BatchSpec(
+                    nativeBatchId=batch_identifier,
+                    customProperties=batchSpecProperties,
+                )
+
+                splitter_method = ge_batch_spec.get("splitter_method")
+                if (
+                    splitter_method is not None
+                    and splitter_method != "_split_on_whole_table"
+                ):
+                    batch_identifiers = ge_batch_spec.get("batch_identifiers", {})
+                    partitionSpec = PartitionSpecClass(
+                        partition=convert_to_string(batch_identifiers)
+                    )
+                sampling_method = ge_batch_spec.get("sampling_method", "")
+                if sampling_method == "_sample_using_limit":
+                    batchSpec.limit = ge_batch_spec["sampling_kwargs"]["n"]
+
+                dataset_partitions.append(
+                    {
+                        "dataset_urn": dataset_urn,
+                        "partitionSpec": partitionSpec,
+                        "batchSpec": batchSpec,
+                    }
+                )
+            elif isinstance(ge_batch_spec, RuntimeQueryBatchSpec):
+                if not self.parse_table_names_from_sql:
+                    warn(
+                        "Enable parse_table_names_from_sql in DatahubValidationAction config\
+                            to try to parse the tables being asserted from SQL query"
+                    )
+                    return []
+                query = data_asset.batches[
+                    batch_identifier
+                ].batch_request.runtime_parameters["query"]
+                partitionSpec = PartitionSpecClass(
+                    type=PartitionTypeClass.QUERY,
+                    partition=f"Query_{builder.datahub_guid(pre_json_transform(query))}",
+                )
+
+                batchSpec = BatchSpec(
+                    nativeBatchId=batch_identifier,
+                    query=query,
+                    customProperties=batchSpecProperties,
+                )
+                try:
+                    tables = DefaultSQLParser(query).get_tables()
+                except Exception as e:
+                    logger.warning(f"Sql parser failed on {query} with {e}")
+                    tables = []
+
+                if len(set(tables)) != 1:
+                    warn(
+                        "DataHubValidationAction does not support cross dataset assertions."
+                    )
+                    return []
+                for table in tables:
+                    dataset_urn = make_dataset_urn_from_sqlalchemy_uri(
+                        sqlalchemy_uri,
+                        None,
+                        table,
+                        self.env,
+                        self.get_platform_instance(
+                            data_asset.active_batch_definition.datasource_name
+                        ),
+                        self.exclude_dbname,
+                        self.platform_alias,
+                        self.convert_urns_to_lowercase,
+                    )
+                    dataset_partitions.append(
+                        {
+                            "dataset_urn": dataset_urn,
+                            "partitionSpec": partitionSpec,
+                            "batchSpec": batchSpec,
+                        }
+                    )
+            elif isinstance(ge_batch_spec, RuntimeDataBatchSpec):
+                data_platform = self.get_platform_instance(
+                    data_asset.active_batch_definition.datasource_name
+                )
+                dataset_urn = builder.make_dataset_urn_with_platform_instance(
+                    platform=(
+                        data_platform
+                        if self.platform_alias is None
+                        else self.platform_alias
+                    ),
+                    name=data_asset.active_batch_definition.datasource_name,
+                    platform_instance="",
+                    env=self.env,
+                )
+                batchSpec = BatchSpec(
+                    nativeBatchId=batch_identifier,
+                    query="",
+                    customProperties=batchSpecProperties,
+                )
+                dataset_partitions.append(
+                    {
+                        "dataset_urn": dataset_urn,
+                        "partitionSpec": partitionSpec,
+                        "batchSpec": batchSpec,
+                    }
+                )
+            else:
+                warn(
+                    "DataHubValidationAction does not recognize this GE batch spec type- {batch_spec_type}.".format(
+                        batch_spec_type=type(ge_batch_spec)
+                    )
+                )
+        else:
+            # TODO - v2-spec - SqlAlchemyDataset support
+            warn(
+                "DataHubValidationAction does not recognize this GE data asset type - {asset_type}. This is either using v2-api or execution engine other than sqlalchemy.".format(
+                    asset_type=type(data_asset)
+                )
+            )
+
+        return dataset_partitions
+
+    def get_platform_instance(self, datasource_name):
+        if self.platform_instance_map and datasource_name in self.platform_instance_map:
+            return self.platform_instance_map[datasource_name]
+        else:
+            warn(
+                f"Datasource {datasource_name} is not present in platform_instance_map"
+            )
+        return None
+
+
+def parse_int_or_default(value, default_value=None):
+    if value is None:
+        return default_value
+    else:
+        return int(value)
+
+
+def make_dataset_urn_from_sqlalchemy_uri(
+    sqlalchemy_uri,
+    schema_name,
+    table_name,
+    env,
+    platform_instance=None,
+    exclude_dbname=None,
+    platform_alias=None,
+    convert_urns_to_lowercase=False,
+):
+    data_platform = get_platform_from_sqlalchemy_uri(str(sqlalchemy_uri))
+    url_instance = make_url(sqlalchemy_uri)
+
+    if schema_name is None and "." in table_name:
+        schema_name, table_name = table_name.split(".")[-2:]
+
+    if data_platform in ["redshift", "postgres"]:
+        schema_name = schema_name or "public"
+        if url_instance.database is None:
+            warn(
+                f"DataHubValidationAction failed to locate database name for {data_platform}."
+            )
+            return None
+        schema_name = (
+            schema_name if exclude_dbname else f"{url_instance.database}.{schema_name}"
+        )
+    elif data_platform == "mssql":
+        schema_name = schema_name or "dbo"
+        if url_instance.database is None:
+            warn(
+                f"DataHubValidationAction failed to locate database name for {data_platform}."
+            )
+            return None
+        schema_name = (
+            schema_name if exclude_dbname else f"{url_instance.database}.{schema_name}"
+        )
+    elif data_platform in ["trino", "snowflake"]:
+        if schema_name is None or url_instance.database is None:
+            warn(
+                "DataHubValidationAction failed to locate schema name and/or database name for {data_platform}.".format(
+                    data_platform=data_platform
+                )
+            )
+            return None
+        # If data platform is snowflake, we artificially lowercase the Database name.
+        # This is because DataHub also does this during ingestion.
+        # Ref: https://github.com/datahub-project/datahub/blob/master/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_utils.py#L155
+        database_name = (
+            url_instance.database.lower()
+            if data_platform == "snowflake"
+            else url_instance.database
+        )
+        if database_name.endswith(f"/{schema_name}"):
+            database_name = database_name[: -len(f"/{schema_name}")]
+        schema_name = (
+            schema_name if exclude_dbname else f"{database_name}.{schema_name}"
+        )
+
+    elif data_platform == "bigquery":
+        if url_instance.host is None or url_instance.database is None:
+            warn(
+                "DataHubValidationAction failed to locate host and/or database name for {data_platform}. ".format(
+                    data_platform=data_platform
+                )
+            )
+            return None
+        schema_name = f"{url_instance.host}.{url_instance.database}"
+
+    schema_name = schema_name or url_instance.database
+    if schema_name is None:
+        warn(
+            f"DataHubValidationAction failed to locate schema name for {data_platform}."
+        )
+        return None
+
+    dataset_name = f"{schema_name}.{table_name}"
+
+    if convert_urns_to_lowercase:
+        dataset_name = dataset_name.lower()
+
+    dataset_urn = builder.make_dataset_urn_with_platform_instance(
+        platform=data_platform if platform_alias is None else platform_alias,
+        name=dataset_name,
+        platform_instance=platform_instance,
+        env=env,
+    )
+
+    return dataset_urn
+
+
+@dataclass
+class DataHubStdAssertion:
+    scope: Union[str, DatasetAssertionScope]
+    operator: Union[str, AssertionStdOperator]
+    aggregation: Union[str, AssertionStdAggregation]
+    parameters: Optional[AssertionStdParameters] = None
+
+
+class DecimalEncoder(json.JSONEncoder):
+    def default(self, o):
+        if isinstance(o, Decimal):
+            return str(o)
+        return super().default(o)
+
+
+def convert_to_string(var: Any) -> str:
+    try:
+        tmp = (
+            str(var)
+            if isinstance(var, (str, int, float))
+            else json.dumps(var, cls=DecimalEncoder)
+        )
+    except TypeError as e:
+        logger.debug(e)
+        tmp = str(var)
+    return tmp
+
+
+def warn(msg):
+    logger.warning(msg)
diff --git a/metadata-ingestion-modules/gx-plugin/tests/__init__.py b/metadata-ingestion-modules/gx-plugin/tests/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/metadata-ingestion-modules/gx-plugin/tests/conftest.py b/metadata-ingestion-modules/gx-plugin/tests/conftest.py
new file mode 100644
index 00000000000000..c99230fba30949
--- /dev/null
+++ b/metadata-ingestion-modules/gx-plugin/tests/conftest.py
@@ -0,0 +1 @@
+from datahub.testing.docker_utils import docker_compose_runner  # noqa: F401
diff --git a/metadata-ingestion/tests/integration/great-expectations/docker-compose.yml b/metadata-ingestion-modules/gx-plugin/tests/integration/docker-compose.yml
similarity index 100%
rename from metadata-ingestion/tests/integration/great-expectations/docker-compose.yml
rename to metadata-ingestion-modules/gx-plugin/tests/integration/docker-compose.yml
diff --git a/metadata-ingestion/tests/integration/great-expectations/ge_mcps_golden.json b/metadata-ingestion-modules/gx-plugin/tests/integration/ge_mcps_golden.json
similarity index 100%
rename from metadata-ingestion/tests/integration/great-expectations/ge_mcps_golden.json
rename to metadata-ingestion-modules/gx-plugin/tests/integration/ge_mcps_golden.json
diff --git a/metadata-ingestion/tests/integration/great-expectations/ge_mcps_golden_2.json b/metadata-ingestion-modules/gx-plugin/tests/integration/ge_mcps_golden_2.json
similarity index 100%
rename from metadata-ingestion/tests/integration/great-expectations/ge_mcps_golden_2.json
rename to metadata-ingestion-modules/gx-plugin/tests/integration/ge_mcps_golden_2.json
diff --git a/metadata-ingestion/tests/integration/great-expectations/setup/great_expectations/checkpoints/test_checkpoint.yml b/metadata-ingestion-modules/gx-plugin/tests/integration/setup/great_expectations/checkpoints/test_checkpoint.yml
similarity index 97%
rename from metadata-ingestion/tests/integration/great-expectations/setup/great_expectations/checkpoints/test_checkpoint.yml
rename to metadata-ingestion-modules/gx-plugin/tests/integration/setup/great_expectations/checkpoints/test_checkpoint.yml
index 466cbfe39a4ab0..0e6fa886d57847 100644
--- a/metadata-ingestion/tests/integration/great-expectations/setup/great_expectations/checkpoints/test_checkpoint.yml
+++ b/metadata-ingestion-modules/gx-plugin/tests/integration/setup/great_expectations/checkpoints/test_checkpoint.yml
@@ -19,7 +19,7 @@ action_list:
       site_names: []
   - name: datahub_action
     action:
-      module_name: datahub.integrations.great_expectations.action
+      module_name: datahub_gx_plugin.action
       class_name: DataHubValidationAction
       server_url: http://localhost:8080
       graceful_exceptions: False
diff --git a/metadata-ingestion/tests/integration/great-expectations/setup/great_expectations/checkpoints/test_checkpoint_2.yml b/metadata-ingestion-modules/gx-plugin/tests/integration/setup/great_expectations/checkpoints/test_checkpoint_2.yml
similarity index 97%
rename from metadata-ingestion/tests/integration/great-expectations/setup/great_expectations/checkpoints/test_checkpoint_2.yml
rename to metadata-ingestion-modules/gx-plugin/tests/integration/setup/great_expectations/checkpoints/test_checkpoint_2.yml
index 409d93f64db160..d0fa2a8c179920 100644
--- a/metadata-ingestion/tests/integration/great-expectations/setup/great_expectations/checkpoints/test_checkpoint_2.yml
+++ b/metadata-ingestion-modules/gx-plugin/tests/integration/setup/great_expectations/checkpoints/test_checkpoint_2.yml
@@ -19,7 +19,7 @@ action_list:
       site_names: []
   - name: datahub_action
     action:
-      module_name: datahub.integrations.great_expectations.action
+      module_name: datahub_gx_plugin.action
       class_name: DataHubValidationAction
       server_url: http://localhost:8080
       graceful_exceptions: False
diff --git a/metadata-ingestion/tests/integration/great-expectations/setup/great_expectations/expectations/.ge_store_backend_id b/metadata-ingestion-modules/gx-plugin/tests/integration/setup/great_expectations/expectations/.ge_store_backend_id
similarity index 100%
rename from metadata-ingestion/tests/integration/great-expectations/setup/great_expectations/expectations/.ge_store_backend_id
rename to metadata-ingestion-modules/gx-plugin/tests/integration/setup/great_expectations/expectations/.ge_store_backend_id
diff --git a/metadata-ingestion/tests/integration/great-expectations/setup/great_expectations/expectations/test_suite.json b/metadata-ingestion-modules/gx-plugin/tests/integration/setup/great_expectations/expectations/test_suite.json
similarity index 100%
rename from metadata-ingestion/tests/integration/great-expectations/setup/great_expectations/expectations/test_suite.json
rename to metadata-ingestion-modules/gx-plugin/tests/integration/setup/great_expectations/expectations/test_suite.json
diff --git a/metadata-ingestion/tests/integration/great-expectations/setup/great_expectations/great_expectations.yml b/metadata-ingestion-modules/gx-plugin/tests/integration/setup/great_expectations/great_expectations.yml
similarity index 100%
rename from metadata-ingestion/tests/integration/great-expectations/setup/great_expectations/great_expectations.yml
rename to metadata-ingestion-modules/gx-plugin/tests/integration/setup/great_expectations/great_expectations.yml
diff --git a/metadata-ingestion/tests/integration/great-expectations/setup/great_expectations/plugins/custom_data_docs/styles/data_docs_custom_styles.css b/metadata-ingestion-modules/gx-plugin/tests/integration/setup/great_expectations/plugins/custom_data_docs/styles/data_docs_custom_styles.css
similarity index 100%
rename from metadata-ingestion/tests/integration/great-expectations/setup/great_expectations/plugins/custom_data_docs/styles/data_docs_custom_styles.css
rename to metadata-ingestion-modules/gx-plugin/tests/integration/setup/great_expectations/plugins/custom_data_docs/styles/data_docs_custom_styles.css
diff --git a/metadata-ingestion/tests/integration/great-expectations/setup/setup.sql b/metadata-ingestion-modules/gx-plugin/tests/integration/setup/setup.sql
similarity index 100%
rename from metadata-ingestion/tests/integration/great-expectations/setup/setup.sql
rename to metadata-ingestion-modules/gx-plugin/tests/integration/setup/setup.sql
diff --git a/metadata-ingestion/tests/integration/great-expectations/test_great_expectations.py b/metadata-ingestion-modules/gx-plugin/tests/integration/test_great_expectations.py
similarity index 68%
rename from metadata-ingestion/tests/integration/great-expectations/test_great_expectations.py
rename to metadata-ingestion-modules/gx-plugin/tests/integration/test_great_expectations.py
index 0bb87b993e6b06..b03681dc780584 100644
--- a/metadata-ingestion/tests/integration/great-expectations/test_great_expectations.py
+++ b/metadata-ingestion-modules/gx-plugin/tests/integration/test_great_expectations.py
@@ -1,17 +1,30 @@
+import os
 import shutil
 from typing import List
 from unittest import mock
 
+import packaging.version
 import pytest
-from freezegun import freeze_time
-from great_expectations.data_context.data_context.file_data_context import (
-    FileDataContext,
-)
-
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.sink.file import write_metadata_file
-from tests.test_helpers import mce_helpers
-from tests.test_helpers.docker_helpers import wait_for_port
+from datahub.testing.compare_metadata_json import assert_metadata_files_equal
+from datahub.testing.docker_utils import wait_for_port
+from freezegun import freeze_time
+from great_expectations.data_context import FileDataContext
+
+try:
+    from great_expectations import __version__ as GX_VERSION  # type: ignore
+
+    use_gx_folder = packaging.version.parse(GX_VERSION) > packaging.version.Version(
+        "0.17.0"
+    )
+except Exception:
+    use_gx_folder = False
+
+
+def should_update_golden_file() -> bool:
+    return bool(os.getenv("DATAHUB_GOLDEN_FILE_UPDATE", False))
+
 
 FROZEN_TIME = "2021-12-28 12:00:00"
 
@@ -40,12 +53,11 @@ def test_ge_ingest(
     docker_compose_runner,
     pytestconfig,
     tmp_path,
-    mock_time,
     checkpoint,
     golden_json,
     **kwargs,
 ):
-    test_resources_dir = pytestconfig.rootpath / "tests/integration/great-expectations"
+    test_resources_dir = pytestconfig.rootpath / "tests/integration"
 
     with docker_compose_runner(
         test_resources_dir / "docker-compose.yml", "great-expectations"
@@ -57,18 +69,21 @@ def test_ge_ingest(
         emitter = MockDatahubEmitter("")
         mock_emit_mcp.side_effect = emitter.emit_mcp
 
+        gx_context_folder_name = "gx" if use_gx_folder else "great_expectations"
         shutil.copytree(
             test_resources_dir / "setup/great_expectations",
-            tmp_path / "great_expectations",
+            tmp_path / gx_context_folder_name,
         )
+
         context = FileDataContext.create(tmp_path)
         context.run_checkpoint(checkpoint_name=checkpoint)
 
         emitter.write_to_file(tmp_path / "ge_mcps.json")
 
-        mce_helpers.check_golden_file(
-            pytestconfig,
+        assert_metadata_files_equal(
             output_path=tmp_path / "ge_mcps.json",
             golden_path=test_resources_dir / golden_json,
+            copy_output=False,
+            update_golden=should_update_golden_file(),
             ignore_paths=[],
         )
diff --git a/metadata-ingestion/tests/unit/test_great_expectations_action.py b/metadata-ingestion-modules/gx-plugin/tests/unit/test_great_expectations_action.py
similarity index 98%
rename from metadata-ingestion/tests/unit/test_great_expectations_action.py
rename to metadata-ingestion-modules/gx-plugin/tests/unit/test_great_expectations_action.py
index 2e23949d296893..c870a4449abea1 100644
--- a/metadata-ingestion/tests/unit/test_great_expectations_action.py
+++ b/metadata-ingestion-modules/gx-plugin/tests/unit/test_great_expectations_action.py
@@ -4,6 +4,22 @@
 
 import pandas as pd
 import pytest
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.metadata.schema_classes import (
+    AssertionInfoClass,
+    AssertionResultClass,
+    AssertionResultTypeClass,
+    AssertionRunEventClass,
+    AssertionRunStatusClass,
+    AssertionStdParameterClass,
+    AssertionStdParametersClass,
+    AssertionTypeClass,
+    BatchSpecClass,
+    DataPlatformInstanceClass,
+    DatasetAssertionInfoClass,
+    DatasetAssertionScopeClass,
+    PartitionSpecClass,
+)
 from great_expectations.core.batch import Batch, BatchDefinition, BatchRequest
 from great_expectations.core.batch_spec import (
     RuntimeDataBatchSpec,
@@ -14,10 +30,7 @@
 )
 from great_expectations.core.id_dict import IDDict
 from great_expectations.core.run_identifier import RunIdentifier
-from great_expectations.data_context import DataContext
-from great_expectations.data_context.data_context.file_data_context import (
-    FileDataContext,
-)
+from great_expectations.data_context import DataContext, FileDataContext
 from great_expectations.data_context.types.resource_identifiers import (
     ExpectationSuiteIdentifier,
     ValidationResultIdentifier,
@@ -33,23 +46,7 @@
 )
 from great_expectations.validator.validator import Validator
 
-from datahub.emitter.mcp import MetadataChangeProposalWrapper
-from datahub.integrations.great_expectations.action import DataHubValidationAction
-from datahub.metadata.schema_classes import (
-    AssertionInfoClass,
-    AssertionResultClass,
-    AssertionResultTypeClass,
-    AssertionRunEventClass,
-    AssertionRunStatusClass,
-    AssertionStdParameterClass,
-    AssertionStdParametersClass,
-    AssertionTypeClass,
-    BatchSpecClass,
-    DataPlatformInstanceClass,
-    DatasetAssertionInfoClass,
-    DatasetAssertionScopeClass,
-    PartitionSpecClass,
-)
+from datahub_gx_plugin.action import DataHubValidationAction
 
 logger = logging.getLogger(__name__)
 
diff --git a/metadata-ingestion-modules/prefect-plugin/.gitignore b/metadata-ingestion-modules/prefect-plugin/.gitignore
new file mode 100644
index 00000000000000..1d2916d00eabde
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/.gitignore
@@ -0,0 +1,143 @@
+.envrc
+src/prefect_datahub/__init__.py.bak
+.vscode/
+output
+pvenv36/
+bq_credentials.json
+/tmp
+*.bak
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# Generated classes
+src/datahub/metadata/
+wheels/
+junit.quick.xml
diff --git a/metadata-ingestion-modules/prefect-plugin/README.md b/metadata-ingestion-modules/prefect-plugin/README.md
new file mode 100644
index 00000000000000..0896942e78ef61
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/README.md
@@ -0,0 +1,132 @@
+# prefect-datahub
+
+Emit flows & tasks metadata to DataHub REST API with `prefect-datahub`
+
+<p align="center">
+    <a href="https://pypi.python.org/pypi/prefect-datahub/" alt="PyPI version">
+        <img alt="PyPI" src="https://img.shields.io/pypi/v/prefect-datahub?color=0052FF&labelColor=090422" /></a>
+    <a href="https://github.com/datahub-project/datahub/" alt="Stars">
+        <img src="https://img.shields.io/github/stars/datahub-project/datahub?color=0052FF&labelColor=090422" /></a>
+    <a href="https://pypistats.org/packages/prefect-datahub/" alt="Downloads">
+        <img src="https://img.shields.io/pypi/dm/prefect-datahub?color=0052FF&labelColor=090422" /></a>
+    <a href="https://github.com/datahub-project/datahub/pulse" alt="Activity">
+        <img src="https://img.shields.io/github/commit-activity/m/datahub-project/datahub?color=0052FF&labelColor=090422" /></a>
+    <br/>
+    <a href="https://datahubspace.slack.com" alt="Slack">
+        <img src="https://img.shields.io/badge/slack-join_community-red.svg?color=0052FF&labelColor=090422&logo=slack" /></a>
+</p>
+
+## Introduction
+
+The `prefect-datahub` collection allows you to easily integrate DataHub's metadata ingestion capabilities into your Prefect workflows. With this collection, you can emit metadata about your flows, tasks, and workspace to DataHub's metadata service.
+
+## Features
+
+- Seamless integration with Prefect workflows
+- Support for ingesting metadata of flows, tasks, and workspaces to DataHub GMS REST API
+- Easy configuration using Prefect blocks
+
+## Prerequisites
+
+- Python 3.7+
+- Prefect 2.0.0+ and < 3.0.0+
+- A running instance of DataHub
+
+## Installation
+
+Install `prefect-datahub` using pip:
+
+```bash
+pip install prefect-datahub
+```
+
+We recommend using a Python virtual environment manager such as pipenv, conda, or virtualenv.
+
+## Getting Started
+
+### 1. Set up DataHub
+
+Before using `prefect-datahub`, you need to deploy an instance of DataHub. Follow the instructions on the [DataHub Quickstart page](https://datahubproject.io/docs/quickstart) to set up DataHub.
+
+After successful deployment, the DataHub GMS service should be running on `http://localhost:8080` if deployed locally.
+
+### 2. Configure DataHub Emitter
+
+Save your DataHub configuration as a Prefect block:
+
+```python
+from prefect_datahub.datahub_emitter import DatahubEmitter
+
+datahub_emitter = DatahubEmitter(
+    datahub_rest_url="http://localhost:8080",
+    env="DEV",
+    platform_instance="local_prefect",
+    token=None,  # generate auth token in the datahub and provide here if gms endpoint is secure
+)
+datahub_emitter.save("datahub-emitter-test")
+```
+
+Configuration options:
+
+| Config | Type | Default | Description |
+|--------|------|---------|-------------|
+| datahub_rest_url | `str` | `http://localhost:8080` | DataHub GMS REST URL |
+| env | `str` | `PROD` | Environment for assets (see [FabricType](https://datahubproject.io/docs/graphql/enums/#fabrictype)) |
+| platform_instance | `str` | `None` | Platform instance for assets (see [Platform Instances](https://datahubproject.io/docs/platform-instances/)) |
+
+### 3. Use DataHub Emitter in Your Workflows
+
+Here's an example of how to use the DataHub Emitter in a Prefect workflow:
+
+```python
+from prefect import flow, task
+from prefect_datahub.datahub_emitter import DatahubEmitter
+from prefect_datahub.entities import Dataset
+
+datahub_emitter_block = DatahubEmitter.load("datahub-emitter-test")
+
+@task(name="Extract", description="Extract the data")
+def extract():
+    return "This is data"
+
+@task(name="Transform", description="Transform the data")
+def transform(data, datahub_emitter):
+    transformed_data = data.split(" ")
+    datahub_emitter.add_task(
+        inputs=[Dataset("snowflake", "mydb.schema.tableX")],
+        outputs=[Dataset("snowflake", "mydb.schema.tableY")],
+    )
+    return transformed_data
+
+@flow(name="ETL", description="Extract transform load flow")
+def etl():
+    datahub_emitter = datahub_emitter_block
+    data = extract()
+    transformed_data = transform(data, datahub_emitter)
+    datahub_emitter.emit_flow()
+
+if __name__ == "__main__":
+    etl()
+```
+
+**Note**: To emit task metadata, you must call `emit_flow()` at the end of your flow. Otherwise, no metadata will be emitted.
+
+## Advanced Usage
+
+For more advanced usage and configuration options, please refer to the [prefect-datahub documentation](https://datahubproject.io/docs/lineage/prefect/).
+
+## Contributing
+
+We welcome contributions to `prefect-datahub`! Please refer to our [Contributing Guidelines](https://datahubproject.io/docs/contributing) for more information on how to get started.
+
+## Support
+
+If you encounter any issues or have questions, you can:
+
+- Open an issue in the [DataHub GitHub repository](https://github.com/datahub-project/datahub/issues)
+- Join the [DataHub Slack community](https://datahubspace.slack.com)
+- Seek help in the [Prefect Slack community](https://prefect.io/slack)
+
+## License
+
+`prefect-datahub` is released under the Apache 2.0 license. See the [LICENSE](https://github.com/datahub-project/datahub/blob/master/LICENSE) file for details.
diff --git a/metadata-ingestion-modules/prefect-plugin/build.gradle b/metadata-ingestion-modules/prefect-plugin/build.gradle
new file mode 100644
index 00000000000000..b078b8d8de3b37
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/build.gradle
@@ -0,0 +1,127 @@
+plugins {
+    id 'base'
+}
+
+ext {
+  python_executable = 'python3'
+  venv_name = 'venv'
+}
+
+if (!project.hasProperty("extra_pip_requirements")) {
+    ext.extra_pip_requirements = ""
+}
+
+def pip_install_command = "VIRTUAL_ENV=${venv_name} ${venv_name}/bin/uv pip install -e ../../metadata-ingestion"
+
+task checkPythonVersion(type: Exec) {
+  commandLine python_executable, '-c', 'import sys; assert sys.version_info >= (3, 7)'
+}
+
+task environmentSetup(type: Exec, dependsOn: checkPythonVersion) {
+  def sentinel_file = "${venv_name}/.venv_environment_sentinel"
+  inputs.file file('setup.py')
+  outputs.file(sentinel_file)
+  commandLine 'bash', '-c',
+      "${python_executable} -m venv ${venv_name} && " +
+          "${venv_name}/bin/python -m pip install --upgrade pip uv wheel 'setuptools>=63.0.0' && " +
+          "touch ${sentinel_file}"
+}
+
+task installPackage(type: Exec, dependsOn: [environmentSetup, ':metadata-ingestion:codegen']) {
+  def sentinel_file = "${venv_name}/.build_install_package_sentinel"
+  inputs.file file('setup.py')
+  outputs.file(sentinel_file)
+  commandLine 'bash', '-x', '-c',
+    "source ${venv_name}/bin/activate && set -x && " +
+    "${pip_install_command} -e . ${extra_pip_requirements} &&" +
+    "touch ${sentinel_file}"
+}
+
+task install(dependsOn: [installPackage])
+
+task installDev(type: Exec, dependsOn: [install]) {
+  def sentinel_file = "${venv_name}/.build_install_dev_sentinel"
+  inputs.file file('setup.py')
+  outputs.file("${sentinel_file}")
+  commandLine 'bash', '-x', '-c',
+    "source ${venv_name}/bin/activate && set -x && " +
+    "${pip_install_command} -e .[dev]  ${extra_pip_requirements} && " +
+    "touch ${sentinel_file}"
+}
+
+task lint(type: Exec, dependsOn: installDev) {
+  commandLine 'bash', '-c',
+    "source ${venv_name}/bin/activate && set -x && " +
+    "black --check --diff src/ tests/ && " +
+    "isort --check --diff src/ tests/ && " +
+    "flake8 --count --statistics src/ tests/ && " +
+    "mypy --show-traceback --show-error-codes src/ tests/"
+}
+task lintFix(type: Exec, dependsOn: installDev) {
+  commandLine 'bash', '-x', '-c',
+    "source ${venv_name}/bin/activate && " +
+    "black src/ tests/ && " +
+    "isort src/ tests/ && " +
+    "flake8 src/ tests/ && " +
+    "mypy src/ tests/ "
+}
+
+task installDevTest(type: Exec, dependsOn: [installDev]) {
+  def sentinel_file = "${venv_name}/.build_install_dev_test_sentinel"
+  inputs.file file('setup.py')
+  outputs.dir("${venv_name}")
+  outputs.file("${sentinel_file}")
+  commandLine 'bash', '-x', '-c',
+    "${pip_install_command} -e .[dev,integration-tests] && touch ${sentinel_file}"
+}
+
+def testFile = hasProperty('testFile') ? testFile : 'unknown'
+task testSingle(dependsOn: [installDevTest]) {
+  doLast {
+  if (testFile != 'unknown')  {
+  exec {
+    commandLine 'bash', '-x', '-c',
+     "source ${venv_name}/bin/activate && pytest ${testFile}"
+    }
+  } else {
+   throw new GradleException("No file provided. Use -PtestFile=<test_file>")
+    }
+  }
+}
+
+task testQuick(type: Exec, dependsOn: installDevTest) {
+  // We can't enforce the coverage requirements if we run a subset of the tests.
+  inputs.files(project.fileTree(dir: "src/", include: "**/*.py"))
+  inputs.files(project.fileTree(dir: "tests/"))
+  outputs.dir("${venv_name}")
+  commandLine 'bash', '-x', '-c',
+    "source ${venv_name}/bin/activate && pytest --cov-config=setup.cfg --cov-report xml:coverage_quick.xml -vv --continue-on-collection-errors --junit-xml=junit.quick.xml -s"
+}
+
+
+task testFull(type: Exec, dependsOn: [testQuick, installDevTest]) {
+  commandLine 'bash', '-x', '-c',
+    "source ${venv_name}/bin/activate && pytest -m 'not slow_integration' -vv --continue-on-collection-errors --junit-xml=junit.full.xml"
+}
+
+
+task buildWheel(type: Exec, dependsOn: [environmentSetup]) {
+  commandLine 'bash', '-c', "source ${venv_name}/bin/activate && " +
+      'uv pip install build && RELEASE_VERSION="\${RELEASE_VERSION:-0.0.0.dev1}" RELEASE_SKIP_INSTALL=1 RELEASE_SKIP_UPLOAD=1 ./scripts/release.sh'
+}
+
+task cleanPythonCache(type: Exec) {
+  commandLine 'bash', '-c',
+    "find src -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete -o -type d -empty -delete"
+}
+
+build.dependsOn install
+check.dependsOn lint
+check.dependsOn testQuick
+
+clean {
+  delete venv_name
+  delete 'build'
+  delete 'dist'
+}
+clean.dependsOn cleanPythonCache
diff --git a/metadata-ingestion-modules/prefect-plugin/pyproject.toml b/metadata-ingestion-modules/prefect-plugin/pyproject.toml
new file mode 100644
index 00000000000000..fba81486b9f677
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/pyproject.toml
@@ -0,0 +1,19 @@
+[build-system]
+build-backend = "setuptools.build_meta"
+requires = ["setuptools>=54.0.0", "wheel", "pip>=21.0.0"]
+
+[tool.black]
+extend-exclude = '''
+# A regex preceded with ^/ will apply only to files and directories
+# in the root of the project.
+^/tmp
+'''
+include = '\.pyi?$'
+
+[tool.isort]
+indent = '    '
+profile = 'black'
+sections = 'FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER'
+
+[tool.pyright]
+extraPaths = ['tests']
\ No newline at end of file
diff --git a/metadata-ingestion-modules/prefect-plugin/scripts/release.sh b/metadata-ingestion-modules/prefect-plugin/scripts/release.sh
new file mode 100755
index 00000000000000..f398db98b60290
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/scripts/release.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -euxo pipefail
+
+if [[ ! ${RELEASE_SKIP_TEST:-} ]] && [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
+	../../gradlew build  # also runs tests
+elif [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
+	../../gradlew install
+fi
+
+MODULE=prefect_datahub
+
+# Check packaging constraint.
+python -c 'import setuptools; where="./src"; assert setuptools.find_packages(where) == setuptools.find_namespace_packages(where), "you seem to be missing or have extra __init__.py files"'
+if [[ ${RELEASE_VERSION:-} ]]; then
+    # Replace version with RELEASE_VERSION env variable
+    sed -i.bak "s/__version__ = \"1\!0.0.0.dev0\"/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/${MODULE}/__init__.py
+else
+    vim src/${MODULE}/__init__.py
+fi
+
+rm -rf build dist || true
+python -m build
+if [[ ! ${RELEASE_SKIP_UPLOAD:-} ]]; then
+    python -m twine upload 'dist/*'
+fi
+mv src/${MODULE}/__init__.py.bak src/${MODULE}/__init__.py
\ No newline at end of file
diff --git a/metadata-ingestion-modules/prefect-plugin/setup.cfg b/metadata-ingestion-modules/prefect-plugin/setup.cfg
new file mode 100644
index 00000000000000..c59a99fa8aec0a
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/setup.cfg
@@ -0,0 +1,74 @@
+[flake8]
+max-complexity = 15
+ignore =
+    # Ignore: line length issues, since black's formatter will take care of them.
+    E501,
+    # Ignore: 1 blank line required before class docstring.
+    D203,
+    # See https://stackoverflow.com/a/57074416.
+    W503,
+    # See https://github.com/psf/black/issues/315.
+    E203
+exclude =
+    .git,
+    venv,
+    .tox,
+    __pycache__
+per-file-ignores =
+    # imported but unused
+    __init__.py: F401
+ban-relative-imports = true
+
+[mypy]
+plugins =
+    sqlmypy,
+    pydantic.mypy
+exclude = ^(venv|build|dist)/
+ignore_missing_imports = yes
+strict_optional = yes
+check_untyped_defs = yes
+disallow_incomplete_defs = yes
+disallow_untyped_decorators = yes
+warn_unused_configs = yes
+# eventually we'd like to enable these
+disallow_untyped_defs = no
+
+# try to be a bit more strict in certain areas of the codebase
+[mypy-datahub.*]
+ignore_missing_imports = no
+[mypy-tests.*]
+ignore_missing_imports = no
+
+[tool:pytest]
+asyncio_mode = auto
+addopts = --cov=src --cov-report term-missing --cov-config setup.cfg --strict-markers
+
+testpaths = 
+    tests/unit
+    tests/integration
+
+[coverage:run]
+# Because of some quirks in the way setup.cfg, coverage.py, pytest-cov,
+# and tox interact, we should not uncomment the following line.
+# See https://pytest-cov.readthedocs.io/en/latest/config.html and
+# https://coverage.readthedocs.io/en/coverage-5.0/config.html.
+# We also have some additional pytest/cov config options in tox.ini.
+# source = src
+
+[coverage:paths]
+# This is necessary for tox-based coverage to be counted properly.
+source =
+   src
+   */site-packages
+
+[coverage:report]
+# The fail_under value ensures that at least some coverage data is collected.
+# We override its value in the tox config.
+show_missing = true
+exclude_lines =
+    pragma: no cover
+    @abstract
+    if TYPE_CHECKING:
+omit =
+    # omit example jobs
+    src/prefect_datahub/example/*
diff --git a/metadata-ingestion-modules/prefect-plugin/setup.py b/metadata-ingestion-modules/prefect-plugin/setup.py
new file mode 100644
index 00000000000000..7e56fe8b6ad114
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/setup.py
@@ -0,0 +1,132 @@
+import os
+import pathlib
+
+import setuptools
+
+package_metadata: dict = {}
+with open("./src/prefect_datahub/__init__.py") as fp:
+    exec(fp.read(), package_metadata)
+
+
+def get_long_description():
+    root = os.path.dirname(__file__)
+    return pathlib.Path(os.path.join(root, "README.md")).read_text()
+
+
+_version: str = package_metadata["__version__"]
+_self_pin = (
+    f"=={_version}"
+    if not (_version.endswith(("dev0", "dev1")) or "docker" in _version)
+    else ""
+)
+
+
+rest_common = {"requests", "requests_file"}
+
+base_requirements = {
+    # For python 3.7 and importlib-metadata>=5.0.0, build failed with attribute error
+    "importlib-metadata>=4.4.0,<5.0.0; python_version < '3.8'",
+    # Actual dependencies.
+    # Temporary pinning to 2.0.0 until we can upgrade to 3.0.0
+    "prefect >= 2.0.0,<3.0.0",
+    *rest_common,
+    # Ignoring the dependency below because it causes issues with the vercel built wheel install
+    # f"acryl-datahub[datahub-rest]{_self_pin}",
+    "acryl-datahub[datahub-rest]",
+}
+
+
+mypy_stubs = {
+    "types-dataclasses",
+    "sqlalchemy-stubs",
+    "types-setuptools",
+    "types-six",
+    "types-python-dateutil",
+    "types-requests",
+    "types-toml",
+    "types-PyYAML",
+    "types-freezegun",
+    "types-cachetools",
+    # versions 0.1.13 and 0.1.14 seem to have issues
+    "types-click==0.1.12",
+    "types-tabulate",
+    # avrogen package requires this
+    "types-pytz",
+}
+
+dev_requirements = {
+    *base_requirements,
+    *mypy_stubs,
+    "black==22.12.0",
+    "coverage>=5.1",
+    "flake8>=3.8.3",
+    "flake8-tidy-imports>=4.3.0",
+    "isort>=5.7.0",
+    "mypy>=1.4.0",
+    # pydantic 1.8.2 is incompatible with mypy 0.910.
+    # See https://github.com/samuelcolvin/pydantic/pull/3175#issuecomment-995382910.
+    "pydantic>=1.10",
+    "pytest>=6.2.2",
+    "pytest-asyncio>=0.16.0",
+    "pytest-cov>=2.8.1",
+    "tox",
+    "deepdiff",
+    "requests-mock",
+    "freezegun",
+    "jsonpickle",
+    "build",
+    "twine",
+    "packaging",
+}
+
+entry_points = {
+    "prefect.block": "prefect-datahub = prefect_datahub.prefect_datahub:DatahubEmitter"
+}
+
+
+setuptools.setup(
+    # Package metadata.
+    name=package_metadata["__package_name__"],
+    version=package_metadata["__version__"],
+    url="https://datahubproject.io/",
+    project_urls={
+        "Documentation": "https://datahubproject.io/docs/",
+        "Source": "https://github.com/datahub-project/datahub",
+        "Changelog": "https://github.com/datahub-project/datahub/releases",
+    },
+    license="Apache License 2.0",
+    description="Datahub prefect block to capture executions and send to Datahub",
+    long_description=get_long_description(),
+    long_description_content_type="text/markdown",
+    classifiers=[
+        "Development Status :: 5 - Production/Stable",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3 :: Only",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Intended Audience :: Developers",
+        "Intended Audience :: Information Technology",
+        "Intended Audience :: System Administrators",
+        "License :: OSI Approved",
+        "License :: OSI Approved :: Apache Software License",
+        "Operating System :: Unix",
+        "Operating System :: POSIX :: Linux",
+        "Environment :: Console",
+        "Environment :: MacOS X",
+        "Topic :: Software Development",
+    ],
+    # Package info.
+    zip_safe=False,
+    python_requires=">=3.7",
+    package_dir={"": "src"},
+    packages=setuptools.find_namespace_packages(where="./src"),
+    entry_points=entry_points,
+    # Dependencies.
+    install_requires=list(base_requirements),
+    extras_require={
+        "dev": list(dev_requirements),
+    },
+)
diff --git a/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/__init__.py b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/__init__.py
new file mode 100644
index 00000000000000..8cc65f9010613d
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/__init__.py
@@ -0,0 +1,21 @@
+# Published at https://pypi.org/project/acryl-datahub/.
+__package_name__ = "prefect-datahub"
+__version__ = "1!0.0.0.dev0"
+
+
+def is_dev_mode() -> bool:
+    return __version__.endswith("dev0")
+
+
+def nice_version_name() -> str:
+    if is_dev_mode():
+        return "unavailable (installed in develop mode)"
+    return __version__
+
+
+def get_provider_info():
+    return {
+        "package-name": f"{__package_name__}",
+        "name": f"{__package_name__}",
+        "description": "Datahub prefect block to capture executions and send to Datahub",
+    }
diff --git a/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/datahub_emitter.py b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/datahub_emitter.py
new file mode 100644
index 00000000000000..5991503416aec7
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/datahub_emitter.py
@@ -0,0 +1,659 @@
+"""Datahub Emitter classes used to emit prefect metadata to Datahub REST."""
+
+import asyncio
+import traceback
+from typing import Any, Dict, List, Optional, cast
+from uuid import UUID
+
+import datahub.emitter.mce_builder as builder
+from datahub.api.entities.datajob import DataFlow, DataJob
+from datahub.api.entities.dataprocess.dataprocess_instance import (
+    DataProcessInstance,
+    InstanceRunResult,
+)
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.emitter.rest_emitter import DatahubRestEmitter
+from datahub.metadata.schema_classes import BrowsePathsClass
+from datahub.utilities.urns.data_flow_urn import DataFlowUrn
+from datahub.utilities.urns.data_job_urn import DataJobUrn
+from datahub.utilities.urns.dataset_urn import DatasetUrn
+from prefect import get_run_logger
+from prefect.blocks.core import Block
+from prefect.client import cloud, orchestration
+from prefect.client.schemas import FlowRun, TaskRun, Workspace
+from prefect.client.schemas.objects import Flow
+from prefect.context import FlowRunContext, TaskRunContext
+from prefect.settings import PREFECT_API_URL
+from pydantic.v1 import SecretStr
+
+from prefect_datahub.entities import _Entity
+
+ORCHESTRATOR = "prefect"
+
+# Flow and task common constants
+VERSION = "version"
+RETRIES = "retries"
+TIMEOUT_SECONDS = "timeout_seconds"
+LOG_PRINTS = "log_prints"
+ON_COMPLETION = "on_completion"
+ON_FAILURE = "on_failure"
+
+# Flow constants
+FLOW_RUN_NAME = "flow_run_name"
+TASK_RUNNER = "task_runner"
+PERSIST_RESULT = "persist_result"
+ON_CANCELLATION = "on_cancellation"
+ON_CRASHED = "on_crashed"
+
+# Task constants
+CACHE_EXPIRATION = "cache_expiration"
+TASK_RUN_NAME = "task_run_name"
+REFRESH_CACHE = "refresh_cache"
+TASK_KEY = "task_key"
+
+# Flow run and task run common constants
+ID = "id"
+CREATED = "created"
+UPDATED = "updated"
+TAGS = "tags"
+ESTIMATED_RUN_TIME = "estimated_run_time"
+START_TIME = "start_time"
+END_TIME = "end_time"
+TOTAL_RUN_TIME = "total_run_time"
+NEXT_SCHEDULED_START_TIME = "next_scheduled_start_time"
+
+# Fask run constants
+CREATED_BY = "created_by"
+AUTO_SCHEDULED = "auto_scheduled"
+
+# Task run constants
+FLOW_RUN_ID = "flow_run_id"
+RUN_COUNT = "run_count"
+UPSTREAM_DEPENDENCIES = "upstream_dependencies"
+
+# States constants
+COMPLETE = "Completed"
+FAILED = "Failed"
+CANCELLED = "Cancelled"
+
+
+class DatahubEmitter(Block):
+    """
+    Block used to emit prefect task and flow related metadata to Datahub REST
+    """
+
+    _block_type_name: Optional[str] = "datahub emitter"
+
+    datahub_rest_url: str = "http://localhost:8080"
+    env: str = builder.DEFAULT_ENV
+    platform_instance: Optional[str] = None
+    token: Optional[SecretStr] = None
+    _datajobs_to_emit: Dict[str, Any] = {}
+
+    def __init__(self, *args: Any, **kwargs: Any):
+        """
+        Initialize datahub rest emitter
+        """
+        super().__init__(*args, **kwargs)
+        # self._datajobs_to_emit: Dict[str, _Entity] = {}
+
+        token = self.token.get_secret_value() if self.token is not None else None
+        self.emitter = DatahubRestEmitter(gms_server=self.datahub_rest_url, token=token)
+        self.emitter.test_connection()
+
+    def _entities_to_urn_list(self, iolets: List[_Entity]) -> List[DatasetUrn]:
+        """
+        Convert list of _entity to list of dataser urn
+
+        Args:
+            iolets (list[_Entity]): The list of entities.
+
+        Returns:
+            The list of Dataset URN.
+        """
+        return [DatasetUrn.create_from_string(let.urn) for let in iolets]
+
+    def _get_workspace(self) -> Optional[str]:
+        """
+        Fetch workspace name if present in configured prefect api url.
+
+        Returns:
+            The workspace name.
+        """
+        try:
+            asyncio.run(cloud.get_cloud_client().api_healthcheck())
+        except Exception:
+            get_run_logger().debug(traceback.format_exc())
+            return None
+
+        if "workspaces" not in PREFECT_API_URL.value():
+            get_run_logger().debug(
+                "Cannot fetch workspace name. Please login to prefect cloud using "
+                "command 'prefect cloud login'."
+            )
+            return None
+
+        current_workspace_id = PREFECT_API_URL.value().split("/")[-1]
+        workspaces: List[Workspace] = asyncio.run(
+            cloud.get_cloud_client().read_workspaces()
+        )
+
+        for workspace in workspaces:
+            if str(workspace.workspace_id) == current_workspace_id:
+                return workspace.workspace_name
+
+        return None
+
+    async def _get_flow_run_graph(self, flow_run_id: str) -> Optional[List[Dict]]:
+        """
+        Fetch the flow run graph for provided flow run id
+
+        Args:
+            flow_run_id (str): The flow run id.
+
+        Returns:
+            The flow run graph in json format.
+        """
+        try:
+            response = orchestration.get_client()._client.get(
+                f"/flow_runs/{flow_run_id}/graph"
+            )
+
+            if asyncio.iscoroutine(response):
+                response = await response
+
+            if hasattr(response, "json"):
+                response_json = response.json()
+            else:
+                raise ValueError("Response object does not have a 'json' method")
+        except Exception:
+            get_run_logger().debug(traceback.format_exc())
+            return None
+        return response_json
+
+    def _emit_browsepath(self, urn: str, workspace_name: str) -> None:
+        """
+        Emit browsepath for provided urn. Set path as orchestrator/env/workspace_name.
+
+        Args:
+            urn (str): The entity URN
+            workspace_name (str): The prefect cloud workspace name
+        """
+        mcp = MetadataChangeProposalWrapper(
+            entityUrn=urn,
+            aspect=BrowsePathsClass(
+                paths=[f"/{ORCHESTRATOR}/{self.env}/{workspace_name}"]
+            ),
+        )
+        self.emitter.emit(mcp)
+
+    def _generate_datajob(
+        self,
+        flow_run_ctx: FlowRunContext,
+        task_run_ctx: Optional[TaskRunContext] = None,
+        task_key: Optional[str] = None,
+    ) -> Optional[DataJob]:
+        """
+        Create datajob entity using task run ctx and flow run ctx.
+        Assign description, tags, and properties to created datajob.
+
+        Args:
+            flow_run_ctx (FlowRunContext): The prefect current running flow run context.
+            task_run_ctx (Optional[TaskRunContext]): The prefect current running task \
+                run context.
+            task_key (Optional[str]): The task key.
+
+        Returns:
+            The datajob entity.
+        """
+        assert flow_run_ctx.flow
+
+        dataflow_urn = DataFlowUrn.create_from_ids(
+            orchestrator=ORCHESTRATOR,
+            flow_id=flow_run_ctx.flow.name,
+            env=self.env,
+            platform_instance=self.platform_instance,
+        )
+
+        if task_run_ctx is not None:
+            datajob = DataJob(
+                id=task_run_ctx.task.task_key,
+                flow_urn=dataflow_urn,
+                name=task_run_ctx.task.name,
+            )
+
+            datajob.description = task_run_ctx.task.description
+            datajob.tags = task_run_ctx.task.tags
+            job_property_bag: Dict[str, str] = {}
+
+            allowed_task_keys = [
+                VERSION,
+                CACHE_EXPIRATION,
+                TASK_RUN_NAME,
+                RETRIES,
+                TIMEOUT_SECONDS,
+                LOG_PRINTS,
+                REFRESH_CACHE,
+                TASK_KEY,
+                ON_COMPLETION,
+                ON_FAILURE,
+            ]
+            for key in allowed_task_keys:
+                if (
+                    hasattr(task_run_ctx.task, key)
+                    and getattr(task_run_ctx.task, key) is not None
+                ):
+                    job_property_bag[key] = repr(getattr(task_run_ctx.task, key))
+            datajob.properties = job_property_bag
+            return datajob
+        elif task_key is not None:
+            datajob = DataJob(
+                id=task_key, flow_urn=dataflow_urn, name=task_key.split(".")[-1]
+            )
+            return datajob
+        return None
+
+    def _generate_dataflow(self, flow_run_ctx: FlowRunContext) -> Optional[DataFlow]:
+        """
+        Create dataflow entity using flow run ctx.
+        Assign description, tags, and properties to created dataflow.
+
+        Args:
+            flow_run_ctx (FlowRunContext): The prefect current running flow run context.
+
+        Returns:
+            The dataflow entity.
+        """
+
+        async def get_flow(flow_id: UUID) -> Flow:
+            client = orchestration.get_client()
+            if not hasattr(client, "read_flow"):
+                raise ValueError("Client does not support async read_flow method")
+            return await client.read_flow(flow_id=flow_id)
+
+        assert flow_run_ctx.flow
+        assert flow_run_ctx.flow_run
+
+        try:
+            flow: Flow = asyncio.run(get_flow(flow_run_ctx.flow_run.flow_id))
+        except Exception:
+            get_run_logger().debug(traceback.format_exc())
+            return None
+
+        assert flow
+
+        dataflow = DataFlow(
+            orchestrator=ORCHESTRATOR,
+            id=flow_run_ctx.flow.name,
+            env=self.env,
+            name=flow_run_ctx.flow.name,
+            platform_instance=self.platform_instance,
+        )
+
+        dataflow.description = flow_run_ctx.flow.description
+        dataflow.tags = set(flow.tags)
+
+        flow_property_bag: Dict[str, str] = {}
+        flow_property_bag[ID] = str(flow.id)
+        flow_property_bag[CREATED] = str(flow.created)
+        flow_property_bag[UPDATED] = str(flow.updated)
+
+        allowed_flow_keys = [
+            VERSION,
+            FLOW_RUN_NAME,
+            RETRIES,
+            TASK_RUNNER,
+            TIMEOUT_SECONDS,
+            PERSIST_RESULT,
+            LOG_PRINTS,
+            ON_COMPLETION,
+            ON_FAILURE,
+            ON_CANCELLATION,
+            ON_CRASHED,
+        ]
+
+        for key in allowed_flow_keys:
+            if (
+                hasattr(flow_run_ctx.flow, key)
+                and getattr(flow_run_ctx.flow, key) is not None
+            ):
+                flow_property_bag[key] = repr(getattr(flow_run_ctx.flow, key))
+
+        dataflow.properties = flow_property_bag
+
+        return dataflow
+
+    def _emit_tasks(
+        self,
+        flow_run_ctx: FlowRunContext,
+        dataflow: DataFlow,
+        workspace_name: Optional[str] = None,
+    ) -> None:
+        """
+        Emit prefect tasks metadata to datahub rest. Add upstream dependencies if
+        present for each task.
+
+        Args:
+            flow_run_ctx (FlowRunContext): The prefect current running flow run context
+            dataflow (DataFlow): The datahub dataflow entity.
+            workspace_name Optional(str): The prefect cloud workpace name.
+        """
+        try:
+            assert flow_run_ctx.flow_run
+
+            graph_json = asyncio.run(
+                self._get_flow_run_graph(str(flow_run_ctx.flow_run.id))
+            )
+
+            if graph_json is None:
+                return
+
+            task_run_key_map: Dict[str, str] = {}
+
+            for prefect_future in flow_run_ctx.task_run_futures:
+                if prefect_future.task_run is not None:
+                    task_run_key_map[
+                        str(prefect_future.task_run.id)
+                    ] = prefect_future.task_run.task_key
+
+            for node in graph_json:
+                datajob_urn = DataJobUrn.create_from_ids(
+                    data_flow_urn=str(dataflow.urn),
+                    job_id=task_run_key_map[node[ID]],
+                )
+
+                datajob: Optional[DataJob] = None
+
+                if str(datajob_urn) in self._datajobs_to_emit:
+                    datajob = cast(DataJob, self._datajobs_to_emit[str(datajob_urn)])
+                else:
+                    datajob = self._generate_datajob(
+                        flow_run_ctx=flow_run_ctx, task_key=task_run_key_map[node[ID]]
+                    )
+
+                if datajob is not None:
+                    for each in node[UPSTREAM_DEPENDENCIES]:
+                        upstream_task_urn = DataJobUrn.create_from_ids(
+                            data_flow_urn=str(dataflow.urn),
+                            job_id=task_run_key_map[each[ID]],
+                        )
+                        datajob.upstream_urns.extend([upstream_task_urn])
+
+                    datajob.emit(self.emitter)
+
+                    if workspace_name is not None:
+                        self._emit_browsepath(str(datajob.urn), workspace_name)
+
+                    self._emit_task_run(
+                        datajob=datajob,
+                        flow_run_name=flow_run_ctx.flow_run.name,
+                        task_run_id=UUID(node[ID]),
+                    )
+        except Exception:
+            get_run_logger().debug(traceback.format_exc())
+
+    def _emit_flow_run(self, dataflow: DataFlow, flow_run_id: UUID) -> None:
+        """
+        Emit prefect flow run to datahub rest. Prefect flow run get mapped with datahub
+        data process instance entity which get's generate from provided dataflow entity.
+        Assign flow run properties to data process instance properties.
+
+        Args:
+            dataflow (DataFlow): The datahub dataflow entity used to create \
+                data process instance.
+            flow_run_id (UUID): The prefect current running flow run id.
+        """
+
+        async def get_flow_run(flow_run_id: UUID) -> FlowRun:
+            client = orchestration.get_client()
+
+            if not hasattr(client, "read_flow_run"):
+                raise ValueError("Client does not support async read_flow_run method")
+
+            response = client.read_flow_run(flow_run_id=flow_run_id)
+
+            if asyncio.iscoroutine(response):
+                response = await response
+
+            return FlowRun.parse_obj(response)
+
+        flow_run: FlowRun = asyncio.run(get_flow_run(flow_run_id))
+
+        assert flow_run
+
+        if self.platform_instance is not None:
+            dpi_id = f"{self.platform_instance}.{flow_run.name}"
+        else:
+            dpi_id = flow_run.name
+
+        dpi = DataProcessInstance.from_dataflow(dataflow=dataflow, id=dpi_id)
+
+        dpi_property_bag: Dict[str, str] = {}
+
+        allowed_flow_run_keys = [
+            ID,
+            CREATED,
+            UPDATED,
+            CREATED_BY,
+            AUTO_SCHEDULED,
+            ESTIMATED_RUN_TIME,
+            START_TIME,
+            TOTAL_RUN_TIME,
+            NEXT_SCHEDULED_START_TIME,
+            TAGS,
+            RUN_COUNT,
+        ]
+
+        for key in allowed_flow_run_keys:
+            if hasattr(flow_run, key) and getattr(flow_run, key) is not None:
+                dpi_property_bag[key] = str(getattr(flow_run, key))
+
+        dpi.properties.update(dpi_property_bag)
+
+        if flow_run.start_time is not None:
+            dpi.emit_process_start(
+                emitter=self.emitter,
+                start_timestamp_millis=int(flow_run.start_time.timestamp() * 1000),
+            )
+
+    def _emit_task_run(
+        self, datajob: DataJob, flow_run_name: str, task_run_id: UUID
+    ) -> None:
+        """
+        Emit prefect task run to datahub rest. Prefect task run get mapped with datahub
+        data process instance entity which get's generate from provided datajob entity.
+        Assign task run properties to data process instance properties.
+
+        Args:
+            datajob (DataJob): The datahub datajob entity used to create \
+                data process instance.
+            flow_run_name (str): The prefect current running flow run name.
+            task_run_id (str): The prefect task run id.
+        """
+
+        async def get_task_run(task_run_id: UUID) -> TaskRun:
+            client = orchestration.get_client()
+
+            if not hasattr(client, "read_task_run"):
+                raise ValueError("Client does not support async read_task_run method")
+
+            response = client.read_task_run(task_run_id=task_run_id)
+
+            if asyncio.iscoroutine(response):
+                response = await response
+
+            return TaskRun.parse_obj(response)
+
+        task_run: TaskRun = asyncio.run(get_task_run(task_run_id))
+
+        assert task_run
+
+        if self.platform_instance is not None:
+            dpi_id = f"{self.platform_instance}.{flow_run_name}.{task_run.name}"
+        else:
+            dpi_id = f"{flow_run_name}.{task_run.name}"
+
+        dpi = DataProcessInstance.from_datajob(
+            datajob=datajob,
+            id=dpi_id,
+            clone_inlets=True,
+            clone_outlets=True,
+        )
+
+        dpi_property_bag: Dict[str, str] = {}
+
+        allowed_task_run_keys = [
+            ID,
+            FLOW_RUN_ID,
+            CREATED,
+            UPDATED,
+            ESTIMATED_RUN_TIME,
+            START_TIME,
+            END_TIME,
+            TOTAL_RUN_TIME,
+            NEXT_SCHEDULED_START_TIME,
+            TAGS,
+            RUN_COUNT,
+        ]
+
+        for key in allowed_task_run_keys:
+            if hasattr(task_run, key) and getattr(task_run, key) is not None:
+                dpi_property_bag[key] = str(getattr(task_run, key))
+
+        dpi.properties.update(dpi_property_bag)
+
+        state_result_map: Dict[str, InstanceRunResult] = {
+            COMPLETE: InstanceRunResult.SUCCESS,
+            FAILED: InstanceRunResult.FAILURE,
+            CANCELLED: InstanceRunResult.SKIPPED,
+        }
+
+        if task_run.state_name not in state_result_map:
+            raise Exception(
+                f"State should be either complete, failed or cancelled and it was "
+                f"{task_run.state_name}"
+            )
+
+        result = state_result_map[task_run.state_name]
+
+        if task_run.start_time is not None:
+            dpi.emit_process_start(
+                emitter=self.emitter,
+                start_timestamp_millis=int(task_run.start_time.timestamp() * 1000),
+                emit_template=False,
+            )
+
+        if task_run.end_time is not None:
+            dpi.emit_process_end(
+                emitter=self.emitter,
+                end_timestamp_millis=int(task_run.end_time.timestamp() * 1000),
+                result=result,
+                result_type=ORCHESTRATOR,
+            )
+
+    def add_task(
+        self,
+        inputs: Optional[List[_Entity]] = None,
+        outputs: Optional[List[_Entity]] = None,
+    ) -> None:
+        """
+        Store prefect current running task metadata temporarily which later get emit
+        to datahub rest only if user calls emit_flow. Prefect task gets mapped with
+        datahub datajob entity. Assign provided inputs and outputs as datajob inlets
+        and outlets respectively.
+
+        Args:
+            inputs (Optional[list]): The list of task inputs.
+            outputs (Optional[list]): The list of task outputs.
+
+        Example:
+            Emit the task metadata as show below:
+            ```python
+            from prefect import flow, task
+            from prefect_datahub.dataset import Dataset
+            from prefect_datahub.datahub_emitter import DatahubEmitter
+
+            datahub_emitter = DatahubEmitter.load("MY_BLOCK_NAME")
+
+            @task(name="Transform", description="Transform the data")
+            def transform(data):
+                data = data.split(" ")
+                datahub_emitter.add_task(
+                    inputs=[Dataset("snowflake", "mydb.schema.tableA")],
+                    outputs=[Dataset("snowflake", "mydb.schema.tableC")],
+                )
+                return data
+
+            @flow(name="ETL flow", description="Extract transform load flow")
+            def etl():
+                data = transform("This is data")
+                datahub_emitter.emit_flow()
+            ```
+        """
+        try:
+            flow_run_ctx = FlowRunContext.get()
+            task_run_ctx = TaskRunContext.get()
+
+            assert flow_run_ctx
+            assert task_run_ctx
+
+            datajob = self._generate_datajob(
+                flow_run_ctx=flow_run_ctx, task_run_ctx=task_run_ctx
+            )
+
+            if datajob is not None:
+                if inputs is not None:
+                    datajob.inlets.extend(self._entities_to_urn_list(inputs))
+                if outputs is not None:
+                    datajob.outlets.extend(self._entities_to_urn_list(outputs))
+                self._datajobs_to_emit[str(datajob.urn)] = cast(_Entity, datajob)
+        except Exception:
+            get_run_logger().debug(traceback.format_exc())
+
+    def emit_flow(self) -> None:
+        """
+        Emit prefect current running flow metadata to datahub rest. Prefect flow gets
+        mapped with datahub dataflow entity. If the user hasn't called add_task in
+        the task function still emit_flow will emit a task but without task name,
+        description,tags and properties.
+
+
+        Example:
+            Emit the flow metadata as show below:
+            ```python
+            from prefect import flow, task
+            from prefect_datahub.datahub_emitter import DatahubEmitter
+
+            datahub_emitter = DatahubEmitter.load("MY_BLOCK_NAME")
+
+            @flow(name="ETL flow", description="Extract transform load flow")
+            def etl():
+                data = extract()
+                data = transform(data)
+                load(data)
+                datahub_emitter.emit_flow()
+            ```
+        """
+        try:
+            flow_run_ctx = FlowRunContext.get()
+
+            assert flow_run_ctx
+            assert flow_run_ctx.flow_run
+
+            workspace_name = self._get_workspace()
+
+            # Emit flow and flow run
+            get_run_logger().info("Emitting flow to datahub...")
+            dataflow = self._generate_dataflow(flow_run_ctx=flow_run_ctx)
+
+            if dataflow is not None:
+                dataflow.emit(self.emitter)
+
+                if workspace_name is not None:
+                    self._emit_browsepath(str(dataflow.urn), workspace_name)
+
+                self._emit_flow_run(dataflow, flow_run_ctx.flow_run.id)
+
+                self._emit_tasks(flow_run_ctx, dataflow, workspace_name)
+        except Exception:
+            get_run_logger().debug(traceback.format_exc())
diff --git a/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/entities.py b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/entities.py
new file mode 100644
index 00000000000000..e2711d0925d977
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/entities.py
@@ -0,0 +1,46 @@
+from abc import abstractmethod
+from typing import Optional
+
+import attr
+import datahub.emitter.mce_builder as builder
+from datahub.utilities.urns.urn import guess_entity_type
+
+
+class _Entity:
+    @property
+    @abstractmethod
+    def urn(self) -> str:
+        pass
+
+
+@attr.s(auto_attribs=True, str=True)
+class Dataset(_Entity):
+    platform: str
+    name: str
+    env: str = builder.DEFAULT_ENV
+    platform_instance: Optional[str] = None
+
+    @property
+    def urn(self):
+        return builder.make_dataset_urn_with_platform_instance(
+            platform=self.platform,
+            name=self.name,
+            platform_instance=self.platform_instance,
+            env=self.env,
+        )
+
+
+@attr.s(str=True)
+class Urn(_Entity):
+    _urn: str = attr.ib()
+
+    @_urn.validator
+    def _validate_urn(self, attribute, value):
+        if not value.startswith("urn:"):
+            raise ValueError("invalid urn provided: urns must start with 'urn:'")
+        if guess_entity_type(value) != "dataset":
+            raise ValueError("Datajob input/output currently only supports datasets")
+
+    @property
+    def urn(self):
+        return self._urn
diff --git a/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/example/__init__.py b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/example/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/example/flow.py b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/example/flow.py
new file mode 100644
index 00000000000000..3f404d04887084
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/example/flow.py
@@ -0,0 +1,52 @@
+from typing import List, Tuple
+
+from prefect import flow, task
+
+from prefect_datahub.datahub_emitter import DatahubEmitter
+from prefect_datahub.entities import Dataset
+
+datahub_emitter_block = DatahubEmitter.load("datahub-emitter-test")
+
+
+@task(name="Extract", description="Extract the data")
+def extract() -> str:
+    data = "This is data"
+    return data
+
+
+@task(name="Transform", description="Transform the data")
+def transform(
+    data: str, datahub_emitter: DatahubEmitter
+) -> Tuple[List[str], DatahubEmitter]:
+    data_list_str = data.split(" ")
+    datahub_emitter.add_task(
+        inputs=[
+            Dataset(
+                platform="snowflake",
+                name="mydb.schema.tableA",
+                env=datahub_emitter.env,
+                platform_instance=datahub_emitter.platform_instance,
+            )
+        ],
+        outputs=[
+            Dataset(
+                platform="snowflake",
+                name="mydb.schema.tableB",
+                env=datahub_emitter.env,
+                platform_instance=datahub_emitter.platform_instance,
+            )
+        ],
+    )
+    return data_list_str, datahub_emitter
+
+
+@flow(name="ETL", description="Extract transform load flow")
+def etl() -> None:
+    datahub_emitter = datahub_emitter_block
+    data = extract()
+    return_value = transform(data, datahub_emitter)  # type: ignore
+    emitter = return_value[1]
+    emitter.emit_flow()
+
+
+etl()
diff --git a/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/example/save_block.py b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/example/save_block.py
new file mode 100644
index 00000000000000..33996785f70cca
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/example/save_block.py
@@ -0,0 +1,9 @@
+from prefect_datahub.datahub_emitter import DatahubEmitter
+
+datahub_emitter = DatahubEmitter(
+    datahub_rest_url="http://localhost:8080",
+    env="DEV",
+    platform_instance="local_prefect",
+    token=None,  # generate auth token in the datahub and provide here if gms endpoint is secure
+)
+datahub_emitter.save("datahub-emitter-test")  # type: ignore
diff --git a/metadata-ingestion-modules/prefect-plugin/tests/integration/integration_test_dummy.py b/metadata-ingestion-modules/prefect-plugin/tests/integration/integration_test_dummy.py
new file mode 100644
index 00000000000000..10cf3ad0a608ae
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/tests/integration/integration_test_dummy.py
@@ -0,0 +1,2 @@
+def test_dummy():
+    pass
diff --git a/metadata-ingestion-modules/prefect-plugin/tests/unit/test_block_standards.py b/metadata-ingestion-modules/prefect-plugin/tests/unit/test_block_standards.py
new file mode 100644
index 00000000000000..12801a01ad07e5
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/tests/unit/test_block_standards.py
@@ -0,0 +1,31 @@
+import re
+from typing import Type
+
+import pytest
+from prefect.blocks.core import Block
+
+from prefect_datahub.datahub_emitter import DatahubEmitter
+
+
+@pytest.mark.parametrize("block", [DatahubEmitter])
+class TestAllBlocksAdhereToStandards:
+    @pytest.fixture
+    def block(self, block):
+        return block
+
+    def test_has_a_description(self, block: Type[Block]) -> None:
+        assert block.get_description()
+
+    def test_has_a_valid_code_example(self, block: Type[Block]) -> None:
+        code_example = block.get_code_example()
+        assert code_example is not None, f"{block.__name__} is missing a code example"
+        import_pattern = rf"from .* import {block.__name__}"
+        assert re.search(import_pattern, code_example) is not None, (
+            f"The code example for {block.__name__} is missing an import statement"
+            f" matching the pattern {import_pattern}"
+        )
+        block_load_pattern = rf'.* = {block.__name__}\.load\("BLOCK_NAME"\)'
+        assert re.search(block_load_pattern, code_example), (
+            f"The code example for {block.__name__} is missing a .load statement"
+            f" matching the pattern {block_load_pattern}"
+        )
diff --git a/metadata-ingestion-modules/prefect-plugin/tests/unit/test_datahub_emitter.py b/metadata-ingestion-modules/prefect-plugin/tests/unit/test_datahub_emitter.py
new file mode 100644
index 00000000000000..ba50cddc986b66
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/tests/unit/test_datahub_emitter.py
@@ -0,0 +1,824 @@
+import asyncio
+import json
+import logging
+from typing import Dict, List, Optional, cast
+from unittest.mock import MagicMock, Mock, patch
+from uuid import UUID
+
+import pytest
+from datahub.api.entities.datajob import DataJob
+from datahub.utilities.urns.dataset_urn import DatasetUrn
+from prefect.client.schemas import FlowRun, TaskRun, Workspace
+from prefect.futures import PrefectFuture
+from prefect.server.schemas.core import Flow
+from prefect.task_runners import SequentialTaskRunner
+from requests.models import Response
+
+from prefect_datahub.datahub_emitter import DatahubEmitter
+from prefect_datahub.entities import Dataset, _Entity
+
+mock_transform_task_json: Dict = {
+    "name": "transform",
+    "description": "Transform the actual data",
+    "task_key": "__main__.transform",
+    "tags": ["etl flow task"],
+}
+
+mock_extract_task_run_json: Dict = {
+    "id": "fa14a52b-d271-4c41-99cb-6b42ca7c070b",
+    "created": "2023-06-06T05:51:54.822707+00:00",
+    "updated": "2023-06-06T05:51:55.126000+00:00",
+    "name": "Extract-0",
+    "flow_run_id": "c3b947e5-3fa1-4b46-a2e2-58d50c938f2e",
+    "task_key": "__main__.extract",
+    "dynamic_key": "0",
+    "cache_key": None,
+    "cache_expiration": None,
+    "task_version": None,
+    "empirical_policy": {
+        "max_retries": 0,
+        "retry_delay_seconds": 0.0,
+        "retries": 0,
+        "retry_delay": 0,
+        "retry_jitter_factor": None,
+    },
+    "tags": [],
+    "state_id": "e280decd-2cc8-4428-a70f-149bcaf95b3c",
+    "task_inputs": {},
+    "state_type": "COMPLETED",
+    "state_name": "Completed",
+    "run_count": 1,
+    "flow_run_run_count": 1,
+    "expected_start_time": "2023-06-06T05:51:54.822183+00:00",
+    "next_scheduled_start_time": None,
+    "start_time": "2023-06-06T05:51:55.016264+00:00",
+    "end_time": "2023-06-06T05:51:55.096534+00:00",
+    "total_run_time": 0.08027,
+    "estimated_run_time": 0.08027,
+    "estimated_start_time_delta": 0.194081,
+    "state": {
+        "id": "e280decd-2cc8-4428-a70f-149bcaf95b3c",
+        "type": "COMPLETED",
+        "name": "Completed",
+        "timestamp": "2023-06-06T05:51:55.096534+00:00",
+        "message": None,
+        "data": {"type": "unpersisted"},
+        "state_details": {
+            "flow_run_id": "c3b947e5-3fa1-4b46-a2e2-58d50c938f2e",
+            "task_run_id": "fa14a52b-d271-4c41-99cb-6b42ca7c070b",
+            "child_flow_run_id": None,
+            "scheduled_time": None,
+            "cache_key": None,
+            "cache_expiration": None,
+            "untrackable_result": False,
+            "pause_timeout": None,
+            "pause_reschedule": False,
+            "pause_key": None,
+            "refresh_cache": None,
+        },
+    },
+}
+
+mock_transform_task_run_json: Dict = {
+    "id": "dd15ee83-5d28-4bf1-804f-f84eab9f9fb7",
+    "created": "2023-06-06T05:51:55.160372+00:00",
+    "updated": "2023-06-06T05:51:55.358000+00:00",
+    "name": "transform-0",
+    "flow_run_id": "c3b947e5-3fa1-4b46-a2e2-58d50c938f2e",
+    "task_key": "__main__.transform",
+    "dynamic_key": "0",
+    "cache_key": None,
+    "cache_expiration": None,
+    "task_version": None,
+    "empirical_policy": {
+        "max_retries": 0,
+        "retry_delay_seconds": 0.0,
+        "retries": 0,
+        "retry_delay": 0,
+        "retry_jitter_factor": None,
+    },
+    "tags": [],
+    "state_id": "971ad82e-6e5f-4691-abab-c900358e96c2",
+    "task_inputs": {
+        "actual_data": [
+            {"input_type": "task_run", "id": "fa14a52b-d271-4c41-99cb-6b42ca7c070b"}
+        ]
+    },
+    "state_type": "COMPLETED",
+    "state_name": "Completed",
+    "run_count": 1,
+    "flow_run_run_count": 1,
+    "expected_start_time": "2023-06-06T05:51:55.159416+00:00",
+    "next_scheduled_start_time": None,
+    "start_time": "2023-06-06T05:51:55.243159+00:00",
+    "end_time": "2023-06-06T05:51:55.332950+00:00",
+    "total_run_time": 0.089791,
+    "estimated_run_time": 0.089791,
+    "estimated_start_time_delta": 0.083743,
+    "state": {
+        "id": "971ad82e-6e5f-4691-abab-c900358e96c2",
+        "type": "COMPLETED",
+        "name": "Completed",
+        "timestamp": "2023-06-06T05:51:55.332950+00:00",
+        "message": None,
+        "data": {"type": "unpersisted"},
+        "state_details": {
+            "flow_run_id": "c3b947e5-3fa1-4b46-a2e2-58d50c938f2e",
+            "task_run_id": "dd15ee83-5d28-4bf1-804f-f84eab9f9fb7",
+            "child_flow_run_id": None,
+            "scheduled_time": None,
+            "cache_key": None,
+            "cache_expiration": None,
+            "untrackable_result": False,
+            "pause_timeout": None,
+            "pause_reschedule": False,
+            "pause_key": None,
+            "refresh_cache": None,
+        },
+    },
+}
+mock_load_task_run_json: Dict = {
+    "id": "f19f83ea-316f-4781-8cbe-1d5d8719afc3",
+    "created": "2023-06-06T05:51:55.389823+00:00",
+    "updated": "2023-06-06T05:51:55.566000+00:00",
+    "name": "Load_task-0",
+    "flow_run_id": "c3b947e5-3fa1-4b46-a2e2-58d50c938f2e",
+    "task_key": "__main__.load",
+    "dynamic_key": "0",
+    "cache_key": None,
+    "cache_expiration": None,
+    "task_version": None,
+    "empirical_policy": {
+        "max_retries": 0,
+        "retry_delay_seconds": 0.0,
+        "retries": 0,
+        "retry_delay": 0,
+        "retry_jitter_factor": None,
+    },
+    "tags": [],
+    "state_id": "0cad13c8-84e4-4bcf-8616-c5904e10dcb4",
+    "task_inputs": {
+        "data": [
+            {"input_type": "task_run", "id": "dd15ee83-5d28-4bf1-804f-f84eab9f9fb7"}
+        ]
+    },
+    "state_type": "COMPLETED",
+    "state_name": "Completed",
+    "run_count": 1,
+    "flow_run_run_count": 1,
+    "expected_start_time": "2023-06-06T05:51:55.389075+00:00",
+    "next_scheduled_start_time": None,
+    "start_time": "2023-06-06T05:51:55.461812+00:00",
+    "end_time": "2023-06-06T05:51:55.535954+00:00",
+    "total_run_time": 0.074142,
+    "estimated_run_time": 0.074142,
+    "estimated_start_time_delta": 0.072737,
+    "state": {
+        "id": "0cad13c8-84e4-4bcf-8616-c5904e10dcb4",
+        "type": "COMPLETED",
+        "name": "Completed",
+        "timestamp": "2023-06-06T05:51:55.535954+00:00",
+        "message": None,
+        "data": {"type": "unpersisted"},
+        "state_details": {
+            "flow_run_id": "c3b947e5-3fa1-4b46-a2e2-58d50c938f2e",
+            "task_run_id": "f19f83ea-316f-4781-8cbe-1d5d8719afc3",
+            "child_flow_run_id": None,
+            "scheduled_time": None,
+            "cache_key": None,
+            "cache_expiration": None,
+            "untrackable_result": True,
+            "pause_timeout": None,
+            "pause_reschedule": False,
+            "pause_key": None,
+            "refresh_cache": None,
+        },
+    },
+}
+mock_flow_json: Dict = {
+    "id": "cc65498f-d950-4114-8cc1-7af9e8fdf91b",
+    "created": "2023-06-02T12:31:10.988697+00:00",
+    "updated": "2023-06-02T12:31:10.988710+00:00",
+    "name": "etl",
+    "description": "Extract transform load flow",
+    "tags": [],
+}
+mock_flow_run_json: Dict = {
+    "id": "c3b947e5-3fa1-4b46-a2e2-58d50c938f2e",
+    "created": "2023-06-06T05:51:54.544266+00:00",
+    "updated": "2023-06-06T05:51:55.622000+00:00",
+    "name": "olivine-beagle",
+    "flow_id": "cc65498f-d950-4114-8cc1-7af9e8fdf91b",
+    "state_id": "ca2db325-d98f-40e7-862e-449cd0cc9a6e",
+    "deployment_id": None,
+    "work_queue_name": None,
+    "flow_version": "3ba54dfa31a7c9af4161aa4cd020a527",
+    "parameters": {},
+    "idempotency_key": None,
+    "context": {},
+    "empirical_policy": {
+        "max_retries": 0,
+        "retry_delay_seconds": 0.0,
+        "retries": 0,
+        "retry_delay": 0,
+        "pause_keys": [],
+        "resuming": False,
+    },
+    "tags": [],
+    "parent_task_run_id": None,
+    "state_type": "COMPLETED",
+    "state_name": "Completed",
+    "run_count": 1,
+    "expected_start_time": "2023-06-06T05:51:54.543357+00:00",
+    "next_scheduled_start_time": None,
+    "start_time": "2023-06-06T05:51:54.750523+00:00",
+    "end_time": "2023-06-06T05:51:55.596446+00:00",
+    "total_run_time": 0.845923,
+    "estimated_run_time": 0.845923,
+    "estimated_start_time_delta": 0.207166,
+    "auto_scheduled": False,
+    "infrastructure_document_id": None,
+    "infrastructure_pid": None,
+    "created_by": None,
+    "work_pool_name": None,
+    "state": {
+        "id": "ca2db325-d98f-40e7-862e-449cd0cc9a6e",
+        "type": "COMPLETED",
+        "name": "Completed",
+        "timestamp": "2023-06-06T05:51:55.596446+00:00",
+        "message": "All states completed.",
+        "data": {"type": "unpersisted"},
+        "state_details": {
+            "flow_run_id": "c3b947e5-3fa1-4b46-a2e2-58d50c938f2e",
+            "task_run_id": None,
+            "child_flow_run_id": None,
+            "scheduled_time": None,
+            "cache_key": None,
+            "cache_expiration": None,
+            "untrackable_result": False,
+            "pause_timeout": None,
+            "pause_reschedule": False,
+            "pause_key": None,
+            "refresh_cache": None,
+        },
+    },
+}
+mock_graph_json: List[Dict] = [
+    {
+        "id": "fa14a52b-d271-4c41-99cb-6b42ca7c070b",
+        "name": "Extract-0",
+        "upstream_dependencies": [],
+        "state": {
+            "id": "e280decd-2cc8-4428-a70f-149bcaf95b3c",
+            "type": "COMPLETED",
+            "name": "Completed",
+            "timestamp": "2023-06-06T05:51:55.096534+00:00",
+            "message": None,
+            "data": {"type": "unpersisted"},
+            "state_details": {
+                "flow_run_id": "c3b947e5-3fa1-4b46-a2e2-58d50c938f2e",
+                "task_run_id": "fa14a52b-d271-4c41-99cb-6b42ca7c070b",
+                "child_flow_run_id": None,
+                "scheduled_time": None,
+                "cache_key": None,
+                "cache_expiration": None,
+                "untrackable_result": False,
+                "pause_timeout": None,
+                "pause_reschedule": False,
+                "pause_key": None,
+                "refresh_cache": None,
+            },
+        },
+        "expected_start_time": "2023-06-06T05:51:54.822183+00:00",
+        "start_time": "2023-06-06T05:51:55.016264+00:00",
+        "end_time": "2023-06-06T05:51:55.096534+00:00",
+        "total_run_time": 0.08027,
+        "estimated_run_time": 0.08027,
+        "untrackable_result": False,
+    },
+    {
+        "id": "f19f83ea-316f-4781-8cbe-1d5d8719afc3",
+        "name": "Load_task-0",
+        "upstream_dependencies": [
+            {"input_type": "task_run", "id": "dd15ee83-5d28-4bf1-804f-f84eab9f9fb7"}
+        ],
+        "state": {
+            "id": "0cad13c8-84e4-4bcf-8616-c5904e10dcb4",
+            "type": "COMPLETED",
+            "name": "Completed",
+            "timestamp": "2023-06-06T05:51:55.535954+00:00",
+            "message": None,
+            "data": {"type": "unpersisted"},
+            "state_details": {
+                "flow_run_id": "c3b947e5-3fa1-4b46-a2e2-58d50c938f2e",
+                "task_run_id": "f19f83ea-316f-4781-8cbe-1d5d8719afc3",
+                "child_flow_run_id": None,
+                "scheduled_time": None,
+                "cache_key": None,
+                "cache_expiration": None,
+                "untrackable_result": True,
+                "pause_timeout": None,
+                "pause_reschedule": False,
+                "pause_key": None,
+                "refresh_cache": None,
+            },
+        },
+        "expected_start_time": "2023-06-06T05:51:55.389075+00:00",
+        "start_time": "2023-06-06T05:51:55.461812+00:00",
+        "end_time": "2023-06-06T05:51:55.535954+00:00",
+        "total_run_time": 0.074142,
+        "estimated_run_time": 0.074142,
+        "untrackable_result": True,
+    },
+    {
+        "id": "dd15ee83-5d28-4bf1-804f-f84eab9f9fb7",
+        "name": "transform-0",
+        "upstream_dependencies": [
+            {"input_type": "task_run", "id": "fa14a52b-d271-4c41-99cb-6b42ca7c070b"}
+        ],
+        "state": {
+            "id": "971ad82e-6e5f-4691-abab-c900358e96c2",
+            "type": "COMPLETED",
+            "name": "Completed",
+            "timestamp": "2023-06-06T05:51:55.332950+00:00",
+            "message": None,
+            "data": {"type": "unpersisted"},
+            "state_details": {
+                "flow_run_id": "c3b947e5-3fa1-4b46-a2e2-58d50c938f2e",
+                "task_run_id": "dd15ee83-5d28-4bf1-804f-f84eab9f9fb7",
+                "child_flow_run_id": None,
+                "scheduled_time": None,
+                "cache_key": None,
+                "cache_expiration": None,
+                "untrackable_result": False,
+                "pause_timeout": None,
+                "pause_reschedule": False,
+                "pause_key": None,
+                "refresh_cache": None,
+            },
+        },
+        "expected_start_time": "2023-06-06T05:51:55.159416+00:00",
+        "start_time": "2023-06-06T05:51:55.243159+00:00",
+        "end_time": "2023-06-06T05:51:55.332950+00:00",
+        "total_run_time": 0.089791,
+        "estimated_run_time": 0.089791,
+        "untrackable_result": False,
+    },
+]
+mock_workspace_json: Dict = {
+    "account_id": "33e98cfe-ad06-4ceb-a500-c11148499f75",
+    "account_name": "shubhamjagtapgslabcom",
+    "account_handle": "shubhamjagtapgslabcom",
+    "workspace_id": "157eb822-1b3b-4338-ae80-98edd5d00cb9",
+    "workspace_name": "datahub",
+    "workspace_description": "",
+    "workspace_handle": "datahub",
+}
+
+
+async def mock_task_run_future():
+    extract_prefect_future: PrefectFuture = PrefectFuture(
+        name=mock_extract_task_run_json["name"],
+        key=UUID("4552629a-ac04-4590-b286-27642292739f"),
+        task_runner=SequentialTaskRunner(),
+    )
+    extract_prefect_future.task_run = cast(
+        None, TaskRun.parse_obj(mock_extract_task_run_json)
+    )
+    transform_prefect_future: PrefectFuture = PrefectFuture(
+        name=mock_transform_task_run_json["name"],
+        key=UUID("40fff3e5-5ef4-4b8b-9cc8-786f91bcc656"),
+        task_runner=SequentialTaskRunner(),
+    )
+    transform_prefect_future.task_run = cast(
+        None, TaskRun.parse_obj(mock_transform_task_run_json)
+    )
+    load_prefect_future: PrefectFuture = PrefectFuture(
+        name=mock_load_task_run_json["name"],
+        key=UUID("7565f596-9eb0-4330-ba34-963e7839883e"),
+        task_runner=SequentialTaskRunner(),
+    )
+    load_prefect_future.task_run = cast(
+        None, TaskRun.parse_obj(mock_load_task_run_json)
+    )
+    return [extract_prefect_future, transform_prefect_future, load_prefect_future]
+
+
+@pytest.fixture(scope="module")
+def mock_run_logger():
+    with patch(
+        "prefect_datahub.datahub_emitter.get_run_logger",
+        return_value=logging.getLogger(),
+    ) as mock_logger:
+        yield mock_logger
+
+
+@pytest.fixture(scope="module")
+def mock_run_context(mock_run_logger):
+    task_run_ctx = MagicMock()
+    task_run_ctx.task.task_key = mock_transform_task_json["task_key"]
+    task_run_ctx.task.name = mock_transform_task_json["name"]
+    task_run_ctx.task.description = mock_transform_task_json["description"]
+    task_run_ctx.task.tags = mock_transform_task_json["tags"]
+
+    flow_run_ctx = MagicMock()
+    flow_run_ctx.flow.name = mock_flow_json["name"]
+    flow_run_ctx.flow.description = mock_flow_json["description"]
+    flow_run_obj = FlowRun.parse_obj(mock_flow_run_json)
+    flow_run_ctx.flow_run.id = flow_run_obj.id
+    flow_run_ctx.flow_run.name = flow_run_obj.name
+    flow_run_ctx.flow_run.flow_id = flow_run_obj.flow_id
+    flow_run_ctx.flow_run.start_time = flow_run_obj.start_time
+    flow_run_ctx.task_run_futures = asyncio.run(mock_task_run_future())
+
+    with patch(
+        "prefect_datahub.datahub_emitter.TaskRunContext"
+    ) as mock_task_run_ctx, patch(
+        "prefect_datahub.datahub_emitter.FlowRunContext"
+    ) as mock_flow_run_ctx:
+        mock_task_run_ctx.get.return_value = task_run_ctx
+        mock_flow_run_ctx.get.return_value = flow_run_ctx
+        yield (task_run_ctx, flow_run_ctx)
+
+
+async def mock_task_run(*args, **kwargs):
+    task_run_id = str(kwargs["task_run_id"])
+    if task_run_id == "fa14a52b-d271-4c41-99cb-6b42ca7c070b":
+        return TaskRun.parse_obj(mock_extract_task_run_json)
+    elif task_run_id == "dd15ee83-5d28-4bf1-804f-f84eab9f9fb7":
+        return TaskRun.parse_obj(mock_transform_task_run_json)
+    elif task_run_id == "f19f83ea-316f-4781-8cbe-1d5d8719afc3":
+        return TaskRun.parse_obj(mock_load_task_run_json)
+    return None
+
+
+async def mock_flow(*args, **kwargs):
+    return Flow.parse_obj(mock_flow_json)
+
+
+async def mock_flow_run(*args, **kwargs):
+    return FlowRun.parse_obj(mock_flow_run_json)
+
+
+async def mock_flow_run_graph(*args, **kwargs):
+    response = Response()
+    response.status_code = 200
+    response._content = json.dumps(mock_graph_json, separators=(",", ":")).encode(
+        "utf-8"
+    )
+    return response
+
+
+async def mock_api_healthcheck(*args, **kwargs):
+    return None
+
+
+async def mock_read_workspaces(*args, **kwargs):
+    return [Workspace.parse_obj(mock_workspace_json)]
+
+
+@pytest.fixture(scope="module")
+def mock_prefect_client():
+    prefect_client_mock = MagicMock()
+    prefect_client_mock.read_flow.side_effect = mock_flow
+    prefect_client_mock.read_flow_run.side_effect = mock_flow_run
+    prefect_client_mock.read_task_run.side_effect = mock_task_run
+    prefect_client_mock._client.get.side_effect = mock_flow_run_graph
+    with patch("prefect_datahub.datahub_emitter.orchestration") as mock_client:
+        mock_client.get_client.return_value = prefect_client_mock
+        yield prefect_client_mock
+
+
+@pytest.fixture(scope="module")
+def mock_prefect_cloud_client():
+    prefect_cloud_client_mock = MagicMock()
+    prefect_cloud_client_mock.api_healthcheck.side_effect = mock_api_healthcheck
+    prefect_cloud_client_mock.read_workspaces.side_effect = mock_read_workspaces
+    with patch("prefect_datahub.datahub_emitter.cloud") as mock_client, patch(
+        "prefect_datahub.datahub_emitter.PREFECT_API_URL.value",
+        return_value="https://api.prefect.cloud/api/accounts/33e98cfe-ad06-4ceb-"
+        "a500-c11148499f75/workspaces/157eb822-1b3b-4338-ae80-98edd5d00cb9",
+    ):
+        mock_client.get_cloud_client.return_value = prefect_cloud_client_mock
+        yield prefect_cloud_client_mock
+
+
+@patch("prefect_datahub.datahub_emitter.DatahubRestEmitter", autospec=True)
+def test_entities_to_urn_list(mock_emit):
+    dataset_urn_list = DatahubEmitter()._entities_to_urn_list(
+        [Dataset("snowflake", "mydb.schema.tableA")]
+    )
+    for dataset_urn in dataset_urn_list:
+        assert isinstance(dataset_urn, DatasetUrn)
+
+
+@patch("prefect_datahub.datahub_emitter.DatahubRestEmitter", autospec=True)
+def test_get_flow_run_graph(mock_emit, mock_prefect_client):
+    graph_json = asyncio.run(
+        DatahubEmitter()._get_flow_run_graph("c3b947e5-3fa1-4b46-a2e2-58d50c938f2e")
+    )
+    assert isinstance(graph_json, list)
+
+
+@patch("prefect_datahub.datahub_emitter.DatahubRestEmitter", autospec=True)
+def test__get_workspace(mock_emit, mock_prefect_cloud_client):
+    workspace_name = DatahubEmitter()._get_workspace()
+    assert workspace_name == "datahub"
+
+
+@patch("prefect_datahub.datahub_emitter.DatahubRestEmitter", autospec=True)
+def test_add_task(mock_emit, mock_run_context):
+    mock_emitter = Mock()
+    mock_emit.return_value = mock_emitter
+
+    datahub_emitter = DatahubEmitter()
+    inputs: Optional[List[_Entity]] = [Dataset("snowflake", "mydb.schema.tableA")]
+    outputs: Optional[List[_Entity]] = [Dataset("snowflake", "mydb.schema.tableC")]
+    datahub_emitter.add_task(
+        inputs=inputs,
+        outputs=outputs,
+    )
+
+    task_run_ctx = mock_run_context[0]
+    flow_run_ctx = mock_run_context[1]
+
+    expected_datajob_urn = (
+        f"urn:li:dataJob:(urn:li:dataFlow:"
+        f"(prefect,{flow_run_ctx.flow.name},PROD),{task_run_ctx.task.task_key})"
+    )
+
+    assert expected_datajob_urn in datahub_emitter._datajobs_to_emit.keys()
+    actual_datajob = datahub_emitter._datajobs_to_emit[expected_datajob_urn]
+    assert isinstance(actual_datajob, DataJob)
+    assert str(actual_datajob.flow_urn) == "urn:li:dataFlow:(prefect,etl,PROD)"
+    assert actual_datajob.name == task_run_ctx.task.name
+    assert actual_datajob.description == task_run_ctx.task.description
+    assert actual_datajob.tags == task_run_ctx.task.tags
+    assert (
+        str(actual_datajob.inlets[0])
+        == "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableA,PROD)"
+    )
+    assert (
+        str(actual_datajob.outlets[0])
+        == "urn:li:dataset:(urn:li:dataPlatform:snowflake,mydb.schema.tableC,PROD)"
+    )
+    assert mock_emit.emit.call_count == 0
+
+
+@patch("prefect_datahub.datahub_emitter.DatahubRestEmitter", autospec=True)
+def test_emit_flow(
+    mock_emit, mock_run_context, mock_prefect_client, mock_prefect_cloud_client
+):
+    mock_emitter = Mock()
+    mock_emit.return_value = mock_emitter
+
+    platform_instance = "datahub_workspace"
+
+    datahub_emitter = DatahubEmitter(platform_instance=platform_instance)
+    datahub_emitter.add_task()
+    datahub_emitter.emit_flow()
+
+    task_run_ctx = mock_run_context[0]
+    flow_run_ctx = mock_run_context[1]
+
+    expected_dataflow_urn = (
+        f"urn:li:dataFlow:(prefect,{platform_instance}.{flow_run_ctx.flow.name},PROD)"
+    )
+
+    expected_dataflow_urn = (
+        f"urn:li:dataFlow:(prefect,{platform_instance}.{flow_run_ctx.flow.name},PROD)"
+    )
+
+    # Ignore the first call (index 0) which is a connection call
+    # DataFlow assertions
+    assert mock_emitter.method_calls[1][1][0].aspectName == "dataFlowInfo"
+    assert mock_emitter.method_calls[1][1][0].entityUrn == expected_dataflow_urn
+    assert mock_emitter.method_calls[2][1][0].aspectName == "status"
+    assert mock_emitter.method_calls[2][1][0].entityUrn == expected_dataflow_urn
+    assert mock_emitter.method_calls[3][1][0].aspectName == "ownership"
+    assert mock_emitter.method_calls[3][1][0].entityUrn == expected_dataflow_urn
+    assert mock_emitter.method_calls[4][1][0].aspectName == "globalTags"
+    assert mock_emitter.method_calls[4][1][0].entityUrn == expected_dataflow_urn
+    assert mock_emitter.method_calls[5][1][0].aspectName == "browsePaths"
+    assert mock_emitter.method_calls[5][1][0].entityUrn == expected_dataflow_urn
+
+    # DataProcessInstance assertions for the flow
+    assert (
+        mock_emitter.method_calls[10][1][0].aspectName
+        == "dataProcessInstanceProperties"
+    )
+    assert (
+        mock_emitter.method_calls[10][1][0].entityUrn
+        == "urn:li:dataProcessInstance:56231547bcc2781e0c14182ceab6c9ac"
+    )
+    assert (
+        mock_emitter.method_calls[11][1][0].aspectName
+        == "dataProcessInstanceRelationships"
+    )
+    assert (
+        mock_emitter.method_calls[11][1][0].entityUrn
+        == "urn:li:dataProcessInstance:56231547bcc2781e0c14182ceab6c9ac"
+    )
+    assert (
+        mock_emitter.method_calls[12][1][0].aspectName == "dataProcessInstanceRunEvent"
+    )
+    assert (
+        mock_emitter.method_calls[12][1][0].entityUrn
+        == "urn:li:dataProcessInstance:56231547bcc2781e0c14182ceab6c9ac"
+    )
+
+    # DataJob assertions for extract
+    assert mock_emitter.method_calls[13][1][0].aspectName == "dataJobInfo"
+    assert (
+        mock_emitter.method_calls[13][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.extract)"
+    )
+    assert mock_emitter.method_calls[14][1][0].aspectName == "status"
+    assert (
+        mock_emitter.method_calls[14][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.extract)"
+    )
+    assert mock_emitter.method_calls[15][1][0].aspectName == "dataJobInputOutput"
+    assert (
+        mock_emitter.method_calls[15][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.extract)"
+    )
+    assert mock_emitter.method_calls[16][1][0].aspectName == "ownership"
+    assert (
+        mock_emitter.method_calls[16][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.extract)"
+    )
+    assert mock_emitter.method_calls[17][1][0].aspectName == "globalTags"
+    assert (
+        mock_emitter.method_calls[17][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.extract)"
+    )
+    assert mock_emitter.method_calls[18][1][0].aspectName == "browsePaths"
+    assert (
+        mock_emitter.method_calls[18][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.extract)"
+    )
+
+    # DataProcessInstance assertions for extract
+    assert (
+        mock_emitter.method_calls[19][1][0].aspectName
+        == "dataProcessInstanceProperties"
+    )
+    assert (
+        mock_emitter.method_calls[19][1][0].entityUrn
+        == "urn:li:dataProcessInstance:b048ba729c1403f229a0760f8765d691"
+    )
+    assert (
+        mock_emitter.method_calls[20][1][0].aspectName
+        == "dataProcessInstanceRelationships"
+    )
+    assert (
+        mock_emitter.method_calls[20][1][0].entityUrn
+        == "urn:li:dataProcessInstance:b048ba729c1403f229a0760f8765d691"
+    )
+    assert (
+        mock_emitter.method_calls[21][1][0].aspectName == "dataProcessInstanceRunEvent"
+    )
+    assert (
+        mock_emitter.method_calls[21][1][0].entityUrn
+        == "urn:li:dataProcessInstance:b048ba729c1403f229a0760f8765d691"
+    )
+    assert (
+        mock_emitter.method_calls[22][1][0].aspectName == "dataProcessInstanceRunEvent"
+    )
+    assert (
+        mock_emitter.method_calls[22][1][0].entityUrn
+        == "urn:li:dataProcessInstance:b048ba729c1403f229a0760f8765d691"
+    )
+
+    # DataJob assertions for load
+    assert mock_emitter.method_calls[23][1][0].aspectName == "dataJobInfo"
+    assert (
+        mock_emitter.method_calls[23][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.load)"
+    )
+    assert mock_emitter.method_calls[24][1][0].aspectName == "status"
+    assert (
+        mock_emitter.method_calls[24][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.load)"
+    )
+    assert mock_emitter.method_calls[25][1][0].aspectName == "dataJobInputOutput"
+    assert (
+        mock_emitter.method_calls[25][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.load)"
+    )
+    assert mock_emitter.method_calls[26][1][0].aspectName == "ownership"
+    assert (
+        mock_emitter.method_calls[26][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.load)"
+    )
+    assert mock_emitter.method_calls[27][1][0].aspectName == "globalTags"
+    assert (
+        mock_emitter.method_calls[27][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.load)"
+    )
+    assert mock_emitter.method_calls[28][1][0].aspectName == "browsePaths"
+    assert (
+        mock_emitter.method_calls[28][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.load)"
+    )
+
+    # DataProcessInstance assertions for load
+    assert (
+        mock_emitter.method_calls[29][1][0].aspectName
+        == "dataProcessInstanceProperties"
+    )
+    assert (
+        mock_emitter.method_calls[29][1][0].entityUrn
+        == "urn:li:dataProcessInstance:e7df9fe09bb4da19687b8199e5ee5038"
+    )
+    assert (
+        mock_emitter.method_calls[30][1][0].aspectName
+        == "dataProcessInstanceRelationships"
+    )
+    assert (
+        mock_emitter.method_calls[30][1][0].entityUrn
+        == "urn:li:dataProcessInstance:e7df9fe09bb4da19687b8199e5ee5038"
+    )
+    assert (
+        mock_emitter.method_calls[31][1][0].aspectName == "dataProcessInstanceRunEvent"
+    )
+    assert (
+        mock_emitter.method_calls[31][1][0].entityUrn
+        == "urn:li:dataProcessInstance:e7df9fe09bb4da19687b8199e5ee5038"
+    )
+    assert (
+        mock_emitter.method_calls[32][1][0].aspectName == "dataProcessInstanceRunEvent"
+    )
+    assert (
+        mock_emitter.method_calls[32][1][0].entityUrn
+        == "urn:li:dataProcessInstance:e7df9fe09bb4da19687b8199e5ee5038"
+    )
+
+    # DataJob assertions for transform
+    assert mock_emitter.method_calls[33][1][0].aspectName == "dataJobInfo"
+    assert (
+        mock_emitter.method_calls[33][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.transform)"
+    )
+    assert mock_emitter.method_calls[34][1][0].aspectName == "status"
+    assert (
+        mock_emitter.method_calls[34][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.transform)"
+    )
+    assert mock_emitter.method_calls[35][1][0].aspectName == "dataJobInputOutput"
+    assert (
+        mock_emitter.method_calls[35][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.transform)"
+    )
+    assert mock_emitter.method_calls[36][1][0].aspectName == "ownership"
+    assert (
+        mock_emitter.method_calls[36][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.transform)"
+    )
+    assert mock_emitter.method_calls[37][1][0].aspectName == "globalTags"
+    assert (
+        mock_emitter.method_calls[37][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.transform)"
+    )
+    assert (
+        mock_emitter.method_calls[37][1][0].aspect.tags[0].tag
+        == f"urn:li:tag:{task_run_ctx.task.tags[0]}"
+    )
+    assert mock_emitter.method_calls[38][1][0].aspectName == "browsePaths"
+    assert (
+        mock_emitter.method_calls[38][1][0].entityUrn
+        == f"urn:li:dataJob:({expected_dataflow_urn},__main__.transform)"
+    )
+
+    # DataProcessInstance assertions for transform
+    assert (
+        mock_emitter.method_calls[39][1][0].aspectName
+        == "dataProcessInstanceProperties"
+    )
+    assert (
+        mock_emitter.method_calls[39][1][0].entityUrn
+        == "urn:li:dataProcessInstance:bfa255d4d1fba52d23a52c9de4f6d0a6"
+    )
+    assert (
+        mock_emitter.method_calls[40][1][0].aspectName
+        == "dataProcessInstanceRelationships"
+    )
+    assert (
+        mock_emitter.method_calls[40][1][0].entityUrn
+        == "urn:li:dataProcessInstance:bfa255d4d1fba52d23a52c9de4f6d0a6"
+    )
+    assert (
+        mock_emitter.method_calls[41][1][0].aspectName == "dataProcessInstanceRunEvent"
+    )
+    assert (
+        mock_emitter.method_calls[41][1][0].entityUrn
+        == "urn:li:dataProcessInstance:bfa255d4d1fba52d23a52c9de4f6d0a6"
+    )
+    assert (
+        mock_emitter.method_calls[42][1][0].aspectName == "dataProcessInstanceRunEvent"
+    )
+    assert (
+        mock_emitter.method_calls[42][1][0].entityUrn
+        == "urn:li:dataProcessInstance:bfa255d4d1fba52d23a52c9de4f6d0a6"
+    )
diff --git a/metadata-ingestion/cli-ingestion.md b/metadata-ingestion/cli-ingestion.md
index 6a6dd65b3c98e0..3dec2e54683b9b 100644
--- a/metadata-ingestion/cli-ingestion.md
+++ b/metadata-ingestion/cli-ingestion.md
@@ -61,14 +61,14 @@ The **source** configuration block defines where to extract metadata from. This
 
 The **sink** configuration block defines where to push metadata into. Each sink type requires specific configurations, the details of which are detailed in the [Sinks](sink_overview.md) documentation.
 
-To configure your instance of DataHub as the destination for ingestion, set the "server" field of your recipe to point to your Acryl instance's domain suffixed by the path `/gms`, as shown below.
+To configure your instance of DataHub as the destination for ingestion, set the "server" field of your recipe to point to your DataHub Cloud instance's domain suffixed by the path `/gms`, as shown below.
 A complete example of a DataHub recipe file, which reads from MySQL and writes into a DataHub instance:
 
 For more information and examples on configuring recipes, please refer to [Recipes](recipe_overview.md).
 
 
 ### Using Recipes with Authentication
-In Acryl DataHub deployments, only the `datahub-rest` sink is supported, which simply means that metadata will be pushed to the REST endpoints exposed by your DataHub instance. The required configurations for this sink are
+In DataHub Cloud deployments, only the `datahub-rest` sink is supported, which simply means that metadata will be pushed to the REST endpoints exposed by your DataHub instance. The required configurations for this sink are
 
 1. **server**: the location of the REST API exposed by your instance of DataHub
 2. **token**: a unique API key used to authenticate requests to your instance's REST API
@@ -85,7 +85,7 @@ The token can be retrieved by logging in as admin. You can go to Settings page a
 
 :::info Secure Your API Key
 Please keep Your API key secure & avoid sharing it. 
-If you are on Acryl Cloud and your key is compromised for any reason, please reach out to the Acryl team at support@acryl.io.
+If you are on DataHub Cloud and your key is compromised for any reason, please reach out to the Acryl team at support@acryl.io.
 :::
 
 
diff --git a/metadata-ingestion/developing.md b/metadata-ingestion/developing.md
index e0dbc7c8d4b145..9293fc7a369dc7 100644
--- a/metadata-ingestion/developing.md
+++ b/metadata-ingestion/developing.md
@@ -68,6 +68,28 @@ cd metadata-ingestion-modules/dagster-plugin
 source venv/bin/activate
 datahub version  # should print "DataHub CLI version: unavailable (installed in develop mode)"
 ```
+
+### (Optional) Set up your Python environment for developing on Prefect Plugin
+From the repository root:
+
+```shell
+cd metadata-ingestion-modules/prefect-plugin
+../../gradlew :metadata-ingestion-modules:prefect-plugin:installDev
+source venv/bin/activate
+datahub version   # should print "DataHub CLI version: unavailable (installed in develop mode)"
+```
+
+### (Optional) Set up your Python environment for developing on GX Plugin
+
+From the repository root:
+
+```shell
+cd metadata-ingestion-modules/gx-plugin
+../../gradlew :metadata-ingestion-modules:gx-plugin:installDev
+source venv/bin/activate
+datahub version  # should print "DataHub CLI version: unavailable (installed in develop mode)"
+```
+
 ### Common setup issues
 
 Common issues (click to expand):
@@ -264,4 +286,4 @@ tox -- --update-golden-files
 
 # Update golden files for a specific environment.
 tox -e py310-airflow26 -- --update-golden-files
-```
+```
\ No newline at end of file
diff --git a/metadata-ingestion/docs/sources/bigquery/bigquery_recipe.yml b/metadata-ingestion/docs/sources/bigquery/bigquery_recipe.yml
index c91aef929889ee..2efa1e5513caa6 100644
--- a/metadata-ingestion/docs/sources/bigquery/bigquery_recipe.yml
+++ b/metadata-ingestion/docs/sources/bigquery/bigquery_recipe.yml
@@ -1,8 +1,7 @@
 source:
   type: bigquery
   config:
-    # `schema_pattern` for BQ Datasets
-    schema_pattern:
+    dataset_pattern:
       allow:
         - finance_bq_dataset
     table_pattern:
diff --git a/metadata-ingestion/docs/sources/dbt/README.md b/metadata-ingestion/docs/sources/dbt/README.md
index c7aea8db38d6de..ab262f2197cc0d 100644
--- a/metadata-ingestion/docs/sources/dbt/README.md
+++ b/metadata-ingestion/docs/sources/dbt/README.md
@@ -2,17 +2,19 @@ Ingesting metadata from dbt requires either using the **dbt** module or the **db
 
 ### Concept Mapping
 
-| Source Concept  | DataHub Concept                                               | Notes              |
-| --------------- | ------------------------------------------------------------- | ------------------ |
-| `"dbt"`         | [Data Platform](../../metamodel/entities/dataPlatform.md)     |                    |
-| dbt Source      | [Dataset](../../metamodel/entities/dataset.md)                | Subtype `Source`   |
-| dbt Seed        | [Dataset](../../metamodel/entities/dataset.md)                | Subtype `Seed`     |
-| dbt Model       | [Dataset](../../metamodel/entities/dataset.md)                | Subtype `Model`    |
-| dbt Snapshot    | [Dataset](../../metamodel/entities/dataset.md)                | Subtype `Snapshot` |
-| dbt Test        | [Assertion](../../metamodel/entities/assertion.md)            |                    |
-| dbt Test Result | [Assertion Run Result](../../metamodel/entities/assertion.md) |                    |
+| Source Concept | DataHub Concept                                                        | Notes              |
+| -------------- | ---------------------------------------------------------------------- | ------------------ |
+| Source         | [Dataset](../../metamodel/entities/dataset.md)                         | Subtype `Source`   |
+| Seed           | [Dataset](../../metamodel/entities/dataset.md)                         | Subtype `Seed`     |
+| Model          | [Dataset](../../metamodel/entities/dataset.md)                         | Subtype `Model`    |
+| Snapshot       | [Dataset](../../metamodel/entities/dataset.md)                         | Subtype `Snapshot` |
+| Test           | [Assertion](../../metamodel/entities/assertion.md)                     |                    |
+| Test Result    | [Assertion Run Result](../../metamodel/entities/assertion.md)          |                    |
+| Model Runs     | [DataProcessInstance](../../metamodel/entities/dataProcessInstance.md) |                    |
 
 Note:
 
-1. It also generates lineage between the `dbt` nodes (e.g. ephemeral nodes that depend on other dbt sources) as well as lineage between the `dbt` nodes and the underlying (target) platform nodes (e.g. BigQuery Table -> dbt Source, dbt View -> BigQuery View).
-2. We also support automated actions (like add a tag, term or owner) based on properties defined in dbt meta.
+1. You must **run ingestion for both dbt and your data warehouse** (target platform). They can be run in any order.
+2. It generates column lineage between the `dbt` nodes (e.g. when a model/snapshot depends on a dbt source or ephemeral model) as well as lineage between the `dbt` nodes and the underlying target platform nodes (e.g. BigQuery Table -> dbt source, dbt model -> BigQuery table/view).
+3. It automatically generates "sibling" relationships between the dbt nodes and the target / data warehouse nodes. These nodes will show up in the UI with both platform logos.
+4. We also support automated actions (like add a tag, term or owner) based on properties defined in dbt meta.
diff --git a/metadata-ingestion/docs/sources/dbt/dbt.md b/metadata-ingestion/docs/sources/dbt/dbt.md
index eca5101e006426..52a19777dd0337 100644
--- a/metadata-ingestion/docs/sources/dbt/dbt.md
+++ b/metadata-ingestion/docs/sources/dbt/dbt.md
@@ -62,7 +62,11 @@ We support the following operations:
 1. add_tag - Requires `tag` property in config.
 2. add_term - Requires `term` property in config.
 3. add_terms - Accepts an optional `separator` property in config.
-4. add_owner - Requires `owner_type` property in config which can be either user or group. Optionally accepts the `owner_category` config property which can be set to either a [custom ownership type](../../../../docs/ownership/ownership-types.md) urn like `urn:li:ownershipType:architect` or one of `['TECHNICAL_OWNER', 'BUSINESS_OWNER', 'DATA_STEWARD', 'DATAOWNER'` (defaults to `DATAOWNER`).
+4. add_owner - Requires `owner_type` property in config which can be either `user` or `group`. Optionally accepts the `owner_category` config property which can be set to either a [custom ownership type](../../../../docs/ownership/ownership-types.md) urn like `urn:li:ownershipType:architect` or one of `['TECHNICAL_OWNER', 'BUSINESS_OWNER', 'DATA_STEWARD', 'DATAOWNER'` (defaults to `DATAOWNER`).
+
+   - The `owner_type` property will be ignored if the owner is a fully qualified urn.
+   - You can use commas to specify multiple owners - e.g. `business_owner: "jane,john,urn:li:corpGroup:data-team"`.
+
 5. add_doc_link - Requires `link` and `description` properties in config. Upon ingestion run, this will overwrite current links in the institutional knowledge section with this new link. The anchor text is defined here in the meta_mappings as `description`.
 
 Note:
@@ -269,16 +273,19 @@ source:
     # ... other configs
 ```
 
-<details>
-  <summary>[Experimental] Reducing "composed of" sprawl with multiproject setups</summary>
+If you have models that have tons of sources from other projects listed in the "Composed Of" section, it may also make sense to hide sources.
+
+### Reducing "composed of" sprawl by hiding sources
+
+When many dbt projects use a single table as a source, the "Composed Of" relationships can become very large and difficult to navigate
+and extra source nodes can clutter the lineage graph.
 
-When many dbt projects use a single table as a source, the "Composed Of" relationships can become very large and difficult to navigate.
-To address this, we are experimenting with an alternative approach to handling multiproject setups: not including sources.
+This is particularly useful for multi-project setups, but can be useful in single-project setups as well.
 
 The benefit is that your entire dbt estate becomes much easier to navigate, and the borders between projects less noticeable.
 The downside is that we will not pick up any documentation or meta mappings applied to dbt sources.
 
-To enable this, set a few additional flags in your dbt source config:
+To enable this, set `entities_enabled.sources: No` and `skip_sources_in_lineage: true` in your dbt source config:
 
 ```yaml
 source:
@@ -294,4 +301,4 @@ source:
     skip_sources_in_lineage: true
 ```
 
-</details>
+[Experimental] It's also possible to use `skip_sources_in_lineage: true` without disabling sources entirely. If you do this, sources will not participate in the lineage graph - they'll have upstreams but no downstreams. However, they will still contribute to docs, tags, etc to the warehouse entity.
diff --git a/metadata-ingestion/docs/sources/looker/lookml_pre.md b/metadata-ingestion/docs/sources/looker/lookml_pre.md
index 68a4828a5ce2ae..24ee2e617be966 100644
--- a/metadata-ingestion/docs/sources/looker/lookml_pre.md
+++ b/metadata-ingestion/docs/sources/looker/lookml_pre.md
@@ -95,8 +95,8 @@ jobs:
   lookml-metadata-upload:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Run LookML ingestion
diff --git a/metadata-ingestion/docs/sources/s3/s3.md b/metadata-ingestion/docs/sources/s3/s3.md
index 9484cd8de6666e..90a2c30882d529 100644
--- a/metadata-ingestion/docs/sources/s3/s3.md
+++ b/metadata-ingestion/docs/sources/s3/s3.md
@@ -3,16 +3,31 @@
 
 Path Specs (`path_specs`) is a list of Path Spec (`path_spec`) objects where each individual `path_spec` represents one or more datasets. Include path (`path_spec.include`) represents formatted path to the dataset. This path must end with `*.*` or `*.[ext]` to represent leaf level. If `*.[ext]` is provided then files with only specified extension type will be scanned. "`.[ext]`" can be any of [supported file types](#supported-file-types). Refer [example 1](#example-1---individual-file-as-dataset) below for more details.
 
-All folder levels need to be specified in include path. You can use `/*/` to represent a folder level and avoid specifying exact folder name. To map folder as a dataset, use `{table}` placeholder to represent folder level for which dataset is to be created. For a partitioned dataset, you can use placeholder `{partition_key[i]}` to represent name of `i`th partition and `{partition[i]}` to represent value of `i`th partition. During ingestion, `i` will be used to match partition_key to partition. Refer [example 2 and 3](#example-2---folder-of-files-as-dataset-without-partitions) below for more details.
+All folder levels need to be specified in include path. You can use `/*/` to represent a folder level and avoid specifying exact folder name. To map folder as a dataset, use `{table}` placeholder to represent folder level for which dataset is to be created. For a partitioned dataset, you can use placeholder `{partition_key[i]}` to represent name of `i`th partition and `{partition_value[i]}` to represent value of `i`th partition. During ingestion, `i` will be used to match partition_key to partition. Refer [example 2 and 3](#example-2---folder-of-files-as-dataset-without-partitions) below for more details.
 
 Exclude paths (`path_spec.exclude`) can be used to ignore paths that are not relevant to current `path_spec`. This path cannot have named variables ( `{}` ). Exclude path can have `**` to represent multiple folder levels. Refer [example 4](#example-4---folder-of-files-as-dataset-with-partitions-and-exclude-filter) below for more details.
 
 Refer [example 5](#example-5---advanced---either-individual-file-or-folder-of-files-as-dataset) if your bucket has more complex dataset representation.
 
+
 **Additional points to note**
 - Folder names should not contain {, }, *, / in their names.
 - Named variable {folder} is reserved for internal working. please do not use in named variables.
 
+#### Partitioned Dataset support
+If your dataset is partitioned by the `partition_key`=`partition_value` format, then the partition values are auto-detected.
+
+Otherwise, you can specify partitions in the following way in the path_spec:
+1. Specify partition_key and partition_value in the path like => `{partition_key[0]}={partition_value[0]}/{partition_key[1]}={partition_value[1]}/{partition_key[2]}={partition_value[2]}`
+2. Partition key can be specify using named variables in the path_spec like => `year={year}/month={month}/day={day}`
+3 if the path is in the form of /value1/value2/value3 the source infer partition value from the path and assign partition_0, partition_1, partition_2 etc
+
+Dataset creation time is determined by the creation time of earliest created file in the lowest partition while last updated time is determined by the last updated time of the latest updated file in the highest partition.
+
+How the source determines the highest/lowest partition it is based on the traversal method set in the path_spec.
+- If the traversal method is set to `MAX` then the source will try to find the latest partition by ordering the partitions each level and find the latest partiton. This traversal method won't look for earilest partition/creation time but this is the fastest.
+- If the traversal method is set to `MIN_MAX` then the source will try to find the latest and earliest partition by ordering the partitions each level and find the latest/earliest partiton. This traversal sort folders purely by name therefor it is fast but it doesn't guarantee the latest partition will have the latest created file.
+- If the traversal method is set to `ALL` then the source will try to find the latest and earliest partition by listing all the files in all the partitions and find the creation/last modification time based on the file creations. This is the slowest but for non time partitioned datasets this is the only way to find the latest/earliest partition.
 
 ### Path Specs -  Examples
 #### Example 1 - Individual file as Dataset
@@ -73,7 +88,12 @@ test-bucket
 Path specs config to ingest folders `orders` and `returns` as datasets:
 ```
 path_specs:
-    - include: s3://test-bucket/{table}/{partition_key[0]}={partition[0]}/{partition_key[1]}={partition[1]}/*.parquet
+    - include: s3://test-bucket/{table}/{partition_key[0]}={partition_value[0]}/{partition_key[1]}={partition_value[1]}/*.parquet
+```
+or with partition auto-detection:
+```
+path_specs:
+    - include: s3://test-bucket/{table}/
 ```
 
 One can also use `include: s3://test-bucket/{table}/*/*/*.parquet` here however above format is preferred as it allows declaring partitions explicitly.
@@ -99,11 +119,15 @@ test-bucket
 Path specs config to ingest folder `orders` as dataset but not folder `tmp_orders`:
 ```
 path_specs:
-    - include: s3://test-bucket/{table}/{partition_key[0]}={partition[0]}/{partition_key[1]}={partition[1]}/*.parquet
+    - include: s3://test-bucket/{table}/{partition_key[0]}={partition_value[0]}/{partition_key[1]}={partition_value[1]}/*.parquet
       exclude: 
         - **/tmp_orders/**
 ```
-
+or with partition auto-detection:
+```
+path_specs:
+    - include: s3://test-bucket/{table}/
+```
 
 #### Example 5 - Advanced - Either Individual file OR Folder of files as Dataset
 
@@ -150,6 +174,7 @@ Above config has 3 path_specs and will ingest following datasets
 s3://my-bucket/foo/tests/bar.avro # single file table   
 s3://my-bucket/foo/tests/*.* # mulitple file level tables
 s3://my-bucket/foo/tests/{table}/*.avro #table without partition
+s3://my-bucket/foo/tests/{table}/ #table with partition autodetection. Partition only can be detected if it is in the format of key=value
 s3://my-bucket/foo/tests/{table}/*/*.avro #table where partitions are not specified
 s3://my-bucket/foo/tests/{table}/*.* # table where no partitions as well as data type specified
 s3://my-bucket/{dept}/tests/{table}/*.avro # specifying keywords to be used in display name
diff --git a/metadata-ingestion/docs/sources/sac/sac_pre.md b/metadata-ingestion/docs/sources/sac/sac_pre.md
new file mode 100644
index 00000000000000..c62cd81fa27534
--- /dev/null
+++ b/metadata-ingestion/docs/sources/sac/sac_pre.md
@@ -0,0 +1,45 @@
+## Configuration Notes
+
+1. Refer to [Manage OAuth Clients](https://help.sap.com/docs/SAP_ANALYTICS_CLOUD/00f68c2e08b941f081002fd3691d86a7/4f43b54398fc4acaa5efa32badfe3df6.html) to create an OAuth client in SAP Analytics Cloud. The OAuth client is required to have the following properties:
+
+    - Purpose: API Access
+    - Access:
+        - Data Import Service
+    - Authorization Grant: Client Credentials
+
+2. Maintain connection mappings (optional):
+
+To map individual connections in SAP Analytics Cloud to platforms, platform instances and environments, the `connection_mapping` configuration can be used within the recipe:
+
+```yaml
+connection_mapping:
+    MY_BW_CONNECTION:
+        platform: bw
+        platform_instance: PROD_BW
+        env: PROD
+    MY_HANA_CONNECTION:
+        platform: hana
+        platform_instance: PROD_HANA
+        env: PROD
+```
+
+The key in the connection mapping dictionary represents the name of the connection created in SAP Analytics Cloud.
+
+## Concept mapping
+
+| SAP Analytics Cloud   | DataHub             |
+|-----------------------|---------------------|
+| `Story`               | `Dashboard`         |
+| `Application`         | `Dashboard`         |
+| `Live Data Model`     | `Dataset`           |
+| `Import Data Model`   | `Dataset`           |
+| `Model`               | `Dataset`           |
+
+## Limitations
+
+- Only models which are used in a Story or an Application will be ingested because there is no dedicated API to retrieve models (only for Stories and Applications).
+- Browse Paths for models cannot be created because the folder where the models are saved is not returned by the API.
+- Schema metadata is only ingested for Import Data Models because there is no possibility to get the schema metadata of the other model types.
+- Lineages for Import Data Models cannot be ingested because the API is not providing any information about it.
+- Currently, only SAP BW and SAP HANA are supported for ingesting the upstream lineages of Live Data Models - a warning is logged for all other connection types, please feel free to open an [issue on GitHub](https://github.com/datahub-project/datahub/issues/new/choose) with the warning message to have this fixed.
+- For some models (e.g., builtin models) it cannot be detected whether the models are Live Data or Import Data Models. Therefore, these models will be ingested only with the `Story` subtype.
diff --git a/metadata-ingestion/docs/sources/sac/sac_recipe.yml b/metadata-ingestion/docs/sources/sac/sac_recipe.yml
new file mode 100644
index 00000000000000..e2067d815e41dd
--- /dev/null
+++ b/metadata-ingestion/docs/sources/sac/sac_recipe.yml
@@ -0,0 +1,40 @@
+source:
+    type: sac
+    config:
+        stateful_ingestion:
+            enabled: true
+
+        tenant_url: # Your SAP Analytics Cloud tenant URL, e.g. https://company.eu10.sapanalytics.cloud or https://company.eu10.hcs.cloud.sap
+        token_url: # The Token URL of your SAP Analytics Cloud tenant, e.g. https://company.eu10.hana.ondemand.com/oauth/token.
+
+        # Add secret in Secrets Tab with relevant names for each variable
+        client_id: "${SAC_CLIENT_ID}" # Your SAP Analytics Cloud client id
+        client_secret: "${SAC_CLIENT_SECRET}" # Your SAP Analytics Cloud client secret
+
+        # ingest stories
+        ingest_stories: true
+
+        # ingest applications
+        ingest_applications: true
+
+        resource_id_pattern:
+            allow:
+                - .*
+
+        resource_name_pattern:
+            allow:
+                - .*
+
+        folder_pattern:
+            allow:
+                - .*
+
+        connection_mapping:
+            MY_BW_CONNECTION:
+                platform: bw
+                platform_instance: PROD_BW
+                env: PROD
+            MY_HANA_CONNECTION:
+                platform: hana
+                platform_instance: PROD_HANA
+                env: PROD
diff --git a/metadata-ingestion/docs/sources/tableau/tableau_pre.md b/metadata-ingestion/docs/sources/tableau/tableau_pre.md
index 5e323da6746d21..aeb67f85b241b9 100644
--- a/metadata-ingestion/docs/sources/tableau/tableau_pre.md
+++ b/metadata-ingestion/docs/sources/tableau/tableau_pre.md
@@ -81,3 +81,12 @@ This may happen when the Tableau API returns NODE_LIMIT_EXCEEDED error in respon
 
 - reducing the page size using the `page_size` config param in datahub recipe (Defaults to 10).
 - increasing tableau configuration [metadata query node limit](https://help.tableau.com/current/server/en-us/cli_configuration-set_tsm.htm#metadata_nodelimit) to higher value.
+
+### `PERMISSIONS_MODE_SWITCHED` error in ingestion report 
+This error occurs if the Tableau site is using external assets. For more detail, refer to the Tableau documentation [Manage Permissions for External Assets](https://help.tableau.com/current/online/en-us/dm_perms_assets.htm).
+
+Follow the below steps to enable the derived permissions:
+
+1.  Sign in to Tableau Cloud or Tableau Server as an admin.
+2.  From the left navigation pane, click Settings.
+3.  On the General tab, under Automatic Access to Metadata about Databases and Tables, select the `Automatically grant authorized users access to metadata about databases and tables` check box.
diff --git a/metadata-ingestion/docs/transformer/dataset_transformer.md b/metadata-ingestion/docs/transformer/dataset_transformer.md
index 773a7e8554832d..03a224bcf7da47 100644
--- a/metadata-ingestion/docs/transformer/dataset_transformer.md
+++ b/metadata-ingestion/docs/transformer/dataset_transformer.md
@@ -953,7 +953,7 @@ Then define your class to return a list of custom properties, for example:
           add_properties_resolver_class: "<your_module>.<your_class>"
     ```
 
-## Replace ExternalUrl
+## Replace ExternalUrl Dataset
 ### Config Details
 | Field                       | Required | Type    | Default       | Description                                 |
 |-----------------------------|----------|---------|---------------|---------------------------------------------|
@@ -971,6 +971,24 @@ transformers:
       replacement: "sub"
 ```
 
+## Replace ExternalUrl Container
+### Config Details
+| Field                       | Required | Type    | Default       | Description                                 |
+|-----------------------------|----------|---------|---------------|---------------------------------------------|
+| `input_pattern`                 | ✅         | string    |    | String or pattern to replace |
+| `replacement`                 | ✅         | string    |    | Replacement string |
+
+
+Matches the full/partial string in the externalUrl of the container properties and replace that with the replacement string
+
+```yaml
+transformers:
+  - type: "replace_external_url_container"
+    config:
+      input_pattern: '\b\w*hub\b'
+      replacement: "sub"
+```
+
 ## Clean User URN in DatasetUsageStatistics Aspect
 ### Config Details
 | Field                       | Required | Type    | Default       | Description                                 |
@@ -1189,11 +1207,16 @@ The config, which we’d append to our ingestion recipe YAML, would look like th
 | Field                                 | Required | Type                 | Default     | Description                                                                                 |
 |---------------------------------------|----------|----------------------|-------------|---------------------------------------------------------------------------------------------|
 | `dataset_to_data_product_urns_pattern`| ✅       | map[regx, urn]       |             | Dataset Entity urn with regular expression and dataproduct urn apply to matching entity urn.|
+| `is_container`      |          | bool    | `false`   | Whether to also consider a container or not. If true, the data product will be attached to both the dataset and its container. |
+
 
-Let’s suppose we’d like to append a series of dataproducts with specific datasets as its assets. To do so, we can use the `pattern_add_dataset_dataproduct` module that’s included in the ingestion framework.  This will match the regex pattern to `urn` of the dataset and create the data product entity with given urn and matched datasets as its assets. 
+Let’s suppose we’d like to append a series of data products with specific datasets or their containers as assets. To do so, we can use the pattern_add_dataset_dataproduct module that’s included in the ingestion framework. This module matches a regex pattern to the urn of the dataset and creates a data product entity with the given urn, associating the matched datasets as its assets.
+
+If the is_container field is set to true, the module will not only attach the data product to the matching datasets but will also find and attach the containers associated with those datasets. This means that both the datasets and their containers will be associated with the specified data product.
 
 The config, which we’d append to our ingestion recipe YAML, would look like this:
 
+- Add Product to dataset
   ```yaml
   transformers:
     - type: "pattern_add_dataset_dataproduct"
@@ -1203,6 +1226,32 @@ The config, which we’d append to our ingestion recipe YAML, would look like th
             ".*example1.*": "urn:li:dataProduct:first"
             ".*example2.*": "urn:li:dataProduct:second"
   ```
+- Add Product to dataset container
+  ```yaml
+  transformers:
+    - type: "pattern_add_dataset_dataproduct"
+      config:
+        is_container: true
+        dataset_to_data_product_urns_pattern:
+          rules:
+            ".*example1.*": "urn:li:dataProduct:first"
+            ".*example2.*": "urn:li:dataProduct:second"
+  ```
+⚠️ Warning:
+When working with two datasets in the same container but with different data products, only one data product can be attached to the container.
+
+For example:
+```yaml
+transformers:
+  - type: "pattern_add_dataset_dataproduct"
+    config:
+      is_container: true
+      dataset_to_data_product_urns_pattern:
+        rules:
+          ".*example1.*": "urn:li:dataProduct:first"
+          ".*example2.*": "urn:li:dataProduct:second"
+```
+If example1 and example2 are in the same container, only urn:li:dataProduct:first will be added. However, if they are in separate containers, the system works as expected and assigns the correct data product URNs.
 
 ## Add Dataset dataProduct
 ### Config Details
diff --git a/metadata-ingestion/examples/data_product/dataproduct.yaml b/metadata-ingestion/examples/data_product/dataproduct.yaml
index baf5bb42020a45..c8158aae9d1e38 100644
--- a/metadata-ingestion/examples/data_product/dataproduct.yaml
+++ b/metadata-ingestion/examples/data_product/dataproduct.yaml
@@ -13,6 +13,8 @@ assets:
 owners:
   - id: urn:li:corpuser:jdoe
     type: BUSINESS_OWNER
+  - id: urn:li:corpuser:fbar
+    type: urn:li:ownershipType:architect  # Maps to a custom ownership type
 
 # Tags associated with this Data Product
 tags:
diff --git a/metadata-ingestion/examples/mce_files/bootstrap_mce.json b/metadata-ingestion/examples/mce_files/bootstrap_mce.json
index fbe6b9953cb4fa..bc218e5e8c2d53 100644
--- a/metadata-ingestion/examples/mce_files/bootstrap_mce.json
+++ b/metadata-ingestion/examples/mce_files/bootstrap_mce.json
@@ -3394,7 +3394,7 @@
     "changeType":"UPSERT",
     "aspectName":"datasetProfile",
     "aspect":{
-      "value":"{\"timestampMillis\": 1679515693000, \"rowCount\": 4500, \"columnCount\": 2, \"sizeInBytes\": 842000200000, \"fieldProfiles\": [{\"fieldPath\": \"field_foo\", \"uniqueCount\": 2, \"uniqueProportion\": 0.00044, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"true\", \"false\"]}, {\"fieldPath\": \"field_bar\", \"uniqueCount\": 2, \"uniqueProportion\": 0.00044, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"false\"]}]}",
+      "value":"{\"timestampMillis\": 1723488954865, \"rowCount\": 4500, \"columnCount\": 2, \"sizeInBytes\": 842000200000, \"fieldProfiles\": [{\"fieldPath\": \"field_foo\", \"uniqueCount\": 2, \"uniqueProportion\": 0.00044, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"true\", \"false\"]}, {\"fieldPath\": \"field_bar\", \"uniqueCount\": 2, \"uniqueProportion\": 0.00044, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"false\"]}]}",
       "contentType":"application/json"
     },
     "systemMetadata":null
@@ -3406,7 +3406,7 @@
     "changeType":"UPSERT",
     "aspectName":"datasetProfile",
     "aspect":{
-      "value":"{\"timestampMillis\": 1684786093000, \"rowCount\": 3500, \"columnCount\": 2, \"fieldProfiles\": [{\"fieldPath\": \"field_foo\", \"uniqueCount\": 2, \"uniqueProportion\": 0.00057, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"true\", \"false\"]}, {\"fieldPath\": \"field_bar\", \"uniqueCount\": 2, \"uniqueProportion\": 0.00057, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"true\"]}]}",
+      "value":"{\"timestampMillis\": 1723488954865, \"rowCount\": 3500, \"columnCount\": 2, \"fieldProfiles\": [{\"fieldPath\": \"field_foo\", \"uniqueCount\": 2, \"uniqueProportion\": 0.00057, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"true\", \"false\"]}, {\"fieldPath\": \"field_bar\", \"uniqueCount\": 2, \"uniqueProportion\": 0.00057, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"true\"]}]}",
       "contentType":"application/json"
     },
     "systemMetadata":null
diff --git a/metadata-ingestion/integration_docs/great-expectations.md b/metadata-ingestion/integration_docs/great-expectations.md
index 80f5bedf42661a..e03ce036259968 100644
--- a/metadata-ingestion/integration_docs/great-expectations.md
+++ b/metadata-ingestion/integration_docs/great-expectations.md
@@ -23,7 +23,7 @@ This integration does not support
 
 1. Install the required dependency in your Great Expectations environment.  
     ```shell
-    pip install 'acryl-datahub[great-expectations]'
+    pip install 'acryl-datahub-gx-plugin'
     ```
 
 
@@ -32,7 +32,7 @@ This integration does not support
     action_list:
       - name: datahub_action
         action:
-          module_name: datahub.integrations.great_expectations.action
+          module_name: datahub_gx_plugin.action
           class_name: DataHubValidationAction
           server_url: http://localhost:8080 #datahub server url
     ```
diff --git a/metadata-ingestion/recipe_overview.md b/metadata-ingestion/recipe_overview.md
index a748edbf3bb449..27d5cb8c85f23b 100644
--- a/metadata-ingestion/recipe_overview.md
+++ b/metadata-ingestion/recipe_overview.md
@@ -90,6 +90,35 @@ similar to variable substitution in GNU bash or in docker-compose files.
 For details, see [variable-substitution](https://docs.docker.com/compose/compose-file/compose-file-v2/#variable-substitution).
 This environment variable substitution should be used to mask sensitive information in recipe files. As long as you can get env variables securely to the ingestion process there would not be any need to store sensitive information in recipes.
 
+### Loading Sensitive Data as Files in Recipes
+
+
+Some sources (e.g. kafka, bigquery, mysql) require paths to files on a local file system. This doesn't work for UI ingestion, where the recipe needs to be totally self-sufficient. To add files to ingestion processes as part of the necessary configuration, DataHub offers a directive `__DATAHUB_TO_FILE_` which allows recipes to set the contents of files.
+
+The syntax for this directive is: `__DATAHUB_TO_FILE_<property>: <value>` which will get turned into `<property>: <path to file containing value>`. Note that value can be specified inline or using an env var/secret.
+
+I.e:
+
+```yaml
+source:
+  type: mysql
+  config:
+    # Coordinates
+    host_port: localhost:3306
+    database: dbname
+
+    # Credentials
+    username: root
+    password: example
+    # If you need to use SSL with MySQL:
+    options:
+      connect_args:
+        __DATAHUB_TO_FILE_ssl_key: '${secret}' # use this for secrets that you need to mount to a file
+        # this will get converted into
+        # ssl_key: /tmp/path/to/file # where file contains the contents of ${secret}
+   ...
+```
+
 ### Transformations
 
 If you'd like to modify data before it reaches the ingestion sinks – for instance, adding additional owners or tags – you can use a transformer to write your own module and integrate it with DataHub. Transformers require extending the recipe with a new section to describe the transformers that you want to run.
diff --git a/metadata-ingestion/scripts/install_deps.sh b/metadata-ingestion/scripts/install_deps.sh
index 80a07cb04cb447..bdc47f275742f4 100755
--- a/metadata-ingestion/scripts/install_deps.sh
+++ b/metadata-ingestion/scripts/install_deps.sh
@@ -19,7 +19,13 @@ else
             xz-devel \
             libxml2-devel \
             libxslt-devel \
-	    krb5-devel
+            krb5-devel
+    elif command -v apk; then
+        $sudo_cmd apk add \
+            build-base \
+            openldap-dev \
+            xz-dev \
+            krb5-dev
     else
         $sudo_cmd apt-get update && $sudo_cmd apt-get install -y \
             python3-ldap \
diff --git a/metadata-ingestion/setup.cfg b/metadata-ingestion/setup.cfg
index 16af43abe3be73..c095420e4e3f30 100644
--- a/metadata-ingestion/setup.cfg
+++ b/metadata-ingestion/setup.cfg
@@ -78,7 +78,7 @@ disallow_untyped_defs = yes
 
 [tool:pytest]
 asyncio_mode = auto
-addopts = --cov=src --cov-report= --cov-config setup.cfg --strict-markers
+addopts = --cov=src --cov-report= --cov-config setup.cfg --strict-markers -p no:faker
 markers =
     slow: marks tests that are slow to run, including all docker-based tests (deselect with '-m not slow')
     integration: marks all integration tests, across all batches (deselect with '-m "not integration"')
diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
index e973ff629ee841..8b778048c34757 100644
--- a/metadata-ingestion/setup.py
+++ b/metadata-ingestion/setup.py
@@ -8,7 +8,9 @@
 
 _version: str = package_metadata["__version__"]
 _self_pin = (
-    f"=={_version}" if not (_version.endswith("dev0") or "docker" in _version) else ""
+    f"=={_version}"
+    if not (_version.endswith(("dev0", "dev1")) or "docker" in _version)
+    else ""
 )
 
 base_requirements = {
@@ -34,7 +36,7 @@
     "importlib_metadata>=4.0.0; python_version < '3.10'",
     "docker",
     "expandvars>=0.6.5",
-    "avro-gen3==0.7.13",
+    "avro-gen3==0.7.16",
     # "avro-gen3 @ git+https://github.com/acryldata/avro_gen@master#egg=avro-gen3",
     "avro>=1.11.3,<1.12",
     "python-dateutil>=2.8.0",
@@ -99,11 +101,13 @@
 sqlglot_lib = {
     # Using an Acryl fork of sqlglot.
     # https://github.com/tobymao/sqlglot/compare/main...hsheth2:sqlglot:main?expand=1
-    "acryl-sqlglot[rs]==25.3.1.dev3",
+    "acryl-sqlglot[rs]==25.20.2.dev5",
 }
 
 classification_lib = {
     "acryl-datahub-classify==0.0.11",
+    # schwifty is needed for the classify plugin but in 2024.08.0 they broke the python 3.8 compatibility
+    "schwifty<2024.08.0",
     # This is a bit of a hack. Because we download the SpaCy model at runtime in the classify plugin,
     # we need pip to be available.
     "pip",
@@ -171,6 +175,7 @@
     *sqlglot_lib,
     "GitPython>2",
     "python-liquid",
+    "deepmerge>=1.1.1",
 }
 
 bigquery_common = {
@@ -178,6 +183,7 @@
     "google-cloud-logging<=3.5.0",
     "google-cloud-bigquery",
     "google-cloud-datacatalog>=1.5.0",
+    "google-cloud-resource-manager",
     "more-itertools>=8.12.0",
     "sqlalchemy-bigquery>=1.4.1",
 }
@@ -232,7 +238,7 @@
     # Instead, we put the fix in our PyHive fork, so no thrift pin is needed.
 }
 
-microsoft_common = {"msal==1.22.0"}
+microsoft_common = {"msal>=1.22.0"}
 
 iceberg_common = {
     # Iceberg Python SDK
@@ -265,7 +271,7 @@
 
 abs_base = {
     "azure-core==1.29.4",
-    "azure-identity>=1.14.0",
+    "azure-identity>=1.17.1",
     "azure-storage-blob>=12.19.0",
     "azure-storage-file-datalake>=12.14.0",
     "more-itertools>=8.12.0",
@@ -295,7 +301,8 @@
 
 databricks = {
     # 0.1.11 appears to have authentication issues with azure databricks
-    "databricks-sdk>=0.9.0",
+    # 0.22.0 has support for `include_browse` in metadata list apis
+    "databricks-sdk>=0.30.0",
     "pyspark~=3.3.0",
     "requests",
     # Version 2.4.0 includes sqlalchemy dialect, 2.8.0 includes some bug fixes
@@ -308,6 +315,12 @@
 
 mysql = sql_common | {"pymysql>=1.0.2"}
 
+sac = {
+    "requests",
+    "pyodata>=1.11.1",
+    "Authlib",
+}
+
 # Note: for all of these, framework_common will be added.
 plugins: Dict[str, Set[str]] = {
     # Sink plugins.
@@ -328,7 +341,9 @@
         "gql[requests]>=3.3.0",
     },
     "datahub": mysql | kafka_common,
-    "great-expectations": sql_common | sqllineage_lib,
+    "great-expectations": {
+        f"acryl-datahub-gx-plugin{_self_pin}",
+    },
     # Misc plugins.
     "sql-parser": sqlglot_lib,
     # Source plugins
@@ -351,6 +366,7 @@
         "google-cloud-datacatalog-lineage==0.2.2",
     }
     | classification_lib,
+    "bigquery-queries": sql_common | bigquery_common | sqlglot_lib,
     "clickhouse": sql_common | clickhouse_common,
     "clickhouse-usage": sql_common | usage_common | clickhouse_common,
     "cockroachdb": sql_common | postgres_common | {"sqlalchemy-cockroachdb<2.0.0"},
@@ -454,7 +470,7 @@
     },
     # FIXME: I don't think tableau uses sqllineage anymore so we should be able
     # to remove that dependency.
-    "tableau": {"tableauserverclient>=0.17.0"} | sqllineage_lib | sqlglot_lib,
+    "tableau": {"tableauserverclient>=0.24.0"} | sqllineage_lib | sqlglot_lib,
     "teradata": sql_common
     | usage_common
     | sqlglot_lib
@@ -471,6 +487,7 @@
     "fivetran": snowflake_common | bigquery_common | sqlglot_lib,
     "qlik-sense": sqlglot_lib | {"requests", "websocket-client"},
     "sigma": sqlglot_lib | {"requests"},
+    "sac": sac,
 }
 
 # This is mainly used to exclude plugins from the Docker image.
@@ -478,6 +495,9 @@
     # The Airflow extra is only retained for compatibility, but new users should
     # be using the datahub-airflow-plugin package instead.
     "airflow",
+    # The great-expectations extra is only retained for compatibility, but new users should
+    # be using the datahub-gx-plugin package instead.
+    "great-expectations",
     # SQL Server ODBC requires additional drivers, and so we don't want to keep
     # it included in the default "all" installation.
     "mssql-odbc",
@@ -491,7 +511,7 @@
 
 mypy_stubs = {
     "types-dataclasses",
-    "types-pkg_resources",
+    "types-setuptools",
     "types-six",
     "types-python-dateutil",
     # We need to avoid 2.31.0.5 and 2.31.0.4 due to
@@ -523,9 +543,13 @@
 }
 
 
-pytest_dep = "pytest>=6.2.2"
-deepdiff_dep = "deepdiff"
-test_api_requirements = {pytest_dep, deepdiff_dep, "PyYAML"}
+test_api_requirements = {
+    "pytest>=6.2.2",
+    # Missing numpy requirement in 8.0.0
+    "deepdiff!=8.0.0",
+    "PyYAML",
+    "pytest-docker>=1.1.0",
+}
 
 debug_requirements = {
     "memray",
@@ -547,12 +571,9 @@
     "isort>=5.7.0",
     "mypy==1.10.1",
     *test_api_requirements,
-    pytest_dep,
     "pytest-asyncio>=0.16.0",
     "pytest-cov>=2.8.1",
-    "pytest-docker>=1.1.0",
     "pytest-random-order~=1.1.0",
-    deepdiff_dep,
     "requests-mock",
     "freezegun",
     "jsonpickle",
@@ -586,7 +607,6 @@
             "kafka",
             "datahub-rest",
             "datahub-lite",
-            "great-expectations",
             "presto",
             "redash",
             "redshift",
@@ -609,6 +629,7 @@
             "kafka-connect",
             "qlik-sense",
             "sigma",
+            "sac",
         ]
         if plugin
         for dependency in plugins[plugin]
@@ -658,6 +679,7 @@
         "athena = datahub.ingestion.source.sql.athena:AthenaSource",
         "azure-ad = datahub.ingestion.source.identity.azure_ad:AzureADSource",
         "bigquery = datahub.ingestion.source.bigquery_v2.bigquery:BigqueryV2Source",
+        "bigquery-queries = datahub.ingestion.source.bigquery_v2.bigquery_queries:BigQueryQueriesSource",
         "clickhouse = datahub.ingestion.source.sql.clickhouse:ClickHouseSource",
         "clickhouse-usage = datahub.ingestion.source.usage.clickhouse_usage:ClickHouseUsageSource",
         "cockroachdb = datahub.ingestion.source.sql.cockroachdb:CockroachDBSource",
@@ -700,7 +722,7 @@
         "snowflake-summary = datahub.ingestion.source.snowflake.snowflake_summary:SnowflakeSummarySource",
         "snowflake-queries = datahub.ingestion.source.snowflake.snowflake_queries:SnowflakeQueriesSource",
         "superset = datahub.ingestion.source.superset:SupersetSource",
-        "tableau = datahub.ingestion.source.tableau:TableauSource",
+        "tableau = datahub.ingestion.source.tableau.tableau:TableauSource",
         "openapi = datahub.ingestion.source.openapi:OpenApiSource",
         "metabase = datahub.ingestion.source.metabase:MetabaseSource",
         "teradata = datahub.ingestion.source.sql.teradata:TeradataSource",
@@ -723,6 +745,7 @@
         "fivetran = datahub.ingestion.source.fivetran.fivetran:FivetranSource",
         "qlik-sense = datahub.ingestion.source.qlik_sense.qlik_sense:QlikSenseSource",
         "sigma = datahub.ingestion.source.sigma.sigma:SigmaSource",
+        "sac = datahub.ingestion.source.sac.sac:SACSource",
     ],
     "datahub.ingestion.transformer.plugins": [
         "pattern_cleanup_ownership = datahub.ingestion.transformer.pattern_cleanup_ownership:PatternCleanUpOwnership",
@@ -750,7 +773,8 @@
         "add_dataset_dataproduct = datahub.ingestion.transformer.add_dataset_dataproduct:AddDatasetDataProduct",
         "simple_add_dataset_dataproduct = datahub.ingestion.transformer.add_dataset_dataproduct:SimpleAddDatasetDataProduct",
         "pattern_add_dataset_dataproduct = datahub.ingestion.transformer.add_dataset_dataproduct:PatternAddDatasetDataProduct",
-        "replace_external_url = datahub.ingestion.transformer.replace_external_url:ReplaceExternalUrl",
+        "replace_external_url = datahub.ingestion.transformer.replace_external_url:ReplaceExternalUrlDataset",
+        "replace_external_url_container = datahub.ingestion.transformer.replace_external_url:ReplaceExternalUrlContainer",
         "pattern_cleanup_dataset_usage_user = datahub.ingestion.transformer.pattern_cleanup_dataset_usage_user:PatternCleanupDatasetUsageUser",
         "domain_mapping_based_on_tags = datahub.ingestion.transformer.dataset_domain_based_on_tags:DatasetTagDomainMapper",
         "tags_to_term = datahub.ingestion.transformer.tags_to_terms:TagsToTermMapper",
diff --git a/metadata-ingestion/sink_docs/datahub.md b/metadata-ingestion/sink_docs/datahub.md
index 85bd8cc2f8531e..8ddcf6aff10352 100644
--- a/metadata-ingestion/sink_docs/datahub.md
+++ b/metadata-ingestion/sink_docs/datahub.md
@@ -28,7 +28,7 @@ sink:
     server: "http://localhost:8080"
 ```
 
-If you are connecting to a hosted Acryl instance, your sink will look like
+If you are connecting to a hosted DataHub Cloud instance, your sink will look like
 ```yml
 source:
   # source configs
diff --git a/metadata-ingestion/src/datahub/api/entities/assertion/compiler_interface.py b/metadata-ingestion/src/datahub/api/entities/assertion/compiler_interface.py
index 27b43a58530b1e..09a2371329c723 100644
--- a/metadata-ingestion/src/datahub/api/entities/assertion/compiler_interface.py
+++ b/metadata-ingestion/src/datahub/api/entities/assertion/compiler_interface.py
@@ -1,16 +1,12 @@
 from abc import abstractmethod
 from dataclasses import dataclass, field
-from enum import Enum
 from pathlib import Path
 from typing import Dict, List, Literal
 
 from datahub.api.entities.assertion.assertion_config_spec import AssertionsConfigSpec
 from datahub.ingestion.api.report import Report
 from datahub.utilities.lossy_collections import LossyDict, LossyList
-
-
-class StrEnum(str, Enum):
-    pass
+from datahub.utilities.str_enum import StrEnum
 
 
 class CompileResultArtifactType(StrEnum):
diff --git a/metadata-ingestion/src/datahub/api/entities/datajob/dataflow.py b/metadata-ingestion/src/datahub/api/entities/datajob/dataflow.py
index 3870e6978ee64f..c892484ea41f82 100644
--- a/metadata-ingestion/src/datahub/api/entities/datajob/dataflow.py
+++ b/metadata-ingestion/src/datahub/api/entities/datajob/dataflow.py
@@ -17,6 +17,7 @@
     OwnershipSourceClass,
     OwnershipSourceTypeClass,
     OwnershipTypeClass,
+    StatusClass,
     TagAssociationClass,
 )
 from datahub.utilities.urns.data_flow_urn import DataFlowUrn
@@ -158,6 +159,14 @@ def generate_mcp(self) -> Iterable[MetadataChangeProposalWrapper]:
         )
         yield mcp
 
+        mcp = MetadataChangeProposalWrapper(
+            entityUrn=str(self.urn),
+            aspect=StatusClass(
+                removed=False,
+            ),
+        )
+        yield mcp
+
         for owner in self.generate_ownership_aspect():
             mcp = MetadataChangeProposalWrapper(
                 entityUrn=str(self.urn),
diff --git a/metadata-ingestion/src/datahub/api/entities/datajob/datajob.py b/metadata-ingestion/src/datahub/api/entities/datajob/datajob.py
index 514f0a5093aa59..bcdcc619286c00 100644
--- a/metadata-ingestion/src/datahub/api/entities/datajob/datajob.py
+++ b/metadata-ingestion/src/datahub/api/entities/datajob/datajob.py
@@ -18,6 +18,7 @@
     OwnershipSourceClass,
     OwnershipSourceTypeClass,
     OwnershipTypeClass,
+    StatusClass,
     TagAssociationClass,
 )
 from datahub.utilities.urns.data_flow_urn import DataFlowUrn
@@ -127,6 +128,14 @@ def generate_mcp(
         )
         yield mcp
 
+        mcp = MetadataChangeProposalWrapper(
+            entityUrn=str(self.urn),
+            aspect=StatusClass(
+                removed=False,
+            ),
+        )
+        yield mcp
+
         yield from self.generate_data_input_output_mcp(
             materialize_iolets=materialize_iolets
         )
diff --git a/metadata-ingestion/src/datahub/api/entities/dataprocess/dataprocess_instance.py b/metadata-ingestion/src/datahub/api/entities/dataprocess/dataprocess_instance.py
index 771efd1f2aa51f..bf521ded5dbf3b 100644
--- a/metadata-ingestion/src/datahub/api/entities/dataprocess/dataprocess_instance.py
+++ b/metadata-ingestion/src/datahub/api/entities/dataprocess/dataprocess_instance.py
@@ -1,6 +1,5 @@
 import time
 from dataclasses import dataclass, field
-from enum import Enum
 from typing import Callable, Dict, Iterable, List, Optional, Union, cast
 
 from datahub.api.entities.datajob import DataFlow, DataJob
@@ -21,6 +20,7 @@
     DataProcessRunStatusClass,
     DataProcessTypeClass,
 )
+from datahub.utilities.str_enum import StrEnum
 from datahub.utilities.urns.data_flow_urn import DataFlowUrn
 from datahub.utilities.urns.data_job_urn import DataJobUrn
 from datahub.utilities.urns.data_process_instance_urn import DataProcessInstanceUrn
@@ -33,7 +33,7 @@ class DataProcessInstanceKey(DatahubKey):
     id: str
 
 
-class InstanceRunResult(str, Enum):
+class InstanceRunResult(StrEnum):
     SUCCESS = RunResultType.SUCCESS
     SKIPPED = RunResultType.SKIPPED
     FAILURE = RunResultType.FAILURE
diff --git a/metadata-ingestion/src/datahub/cli/check_cli.py b/metadata-ingestion/src/datahub/cli/check_cli.py
index 2b67c1582971bf..6e9bfddd350f92 100644
--- a/metadata-ingestion/src/datahub/cli/check_cli.py
+++ b/metadata-ingestion/src/datahub/cli/check_cli.py
@@ -68,7 +68,7 @@ def metadata_file(json_file: str, rewrite: bool, unpack_mces: bool) -> None:
                         "config": {"filename": out_file.name},
                     },
                 },
-                no_default_report=True,
+                report_to=None,
             )
 
             pipeline.run()
diff --git a/metadata-ingestion/src/datahub/cli/cli_utils.py b/metadata-ingestion/src/datahub/cli/cli_utils.py
index b0039b5f87b343..1b9cccb1cbc215 100644
--- a/metadata-ingestion/src/datahub/cli/cli_utils.py
+++ b/metadata-ingestion/src/datahub/cli/cli_utils.py
@@ -1,7 +1,6 @@
 import json
 import logging
-import os
-import os.path
+import time
 import typing
 from datetime import datetime
 from typing import Any, Dict, List, Optional, Tuple, Type, Union
@@ -15,7 +14,7 @@
 from datahub.emitter.aspect import ASPECT_MAP, TIMESERIES_ASPECT_MAP
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.emitter.request_helper import make_curl_command
-from datahub.emitter.serialization_helper import post_json_transform
+from datahub.emitter.serialization_helper import post_json_transform, pre_json_transform
 from datahub.metadata.com.linkedin.pegasus2avro.mxe import (
     MetadataChangeEvent,
     MetadataChangeProposal,
@@ -25,9 +24,6 @@
 
 log = logging.getLogger(__name__)
 
-ENV_DATAHUB_SYSTEM_CLIENT_ID = "DATAHUB_SYSTEM_CLIENT_ID"
-ENV_DATAHUB_SYSTEM_CLIENT_SECRET = "DATAHUB_SYSTEM_CLIENT_SECRET"
-
 # TODO: Many of the methods in this file duplicate logic that already lives
 # in the DataHubGraph client. We should refactor this to use the client instead.
 # For the methods that aren't duplicates, that logic should be moved to the client.
@@ -37,14 +33,6 @@ def first_non_null(ls: List[Optional[str]]) -> Optional[str]:
     return next((el for el in ls if el is not None and el.strip() != ""), None)
 
 
-def get_system_auth() -> Optional[str]:
-    system_client_id = os.environ.get(ENV_DATAHUB_SYSTEM_CLIENT_ID)
-    system_client_secret = os.environ.get(ENV_DATAHUB_SYSTEM_CLIENT_SECRET)
-    if system_client_id is not None and system_client_secret is not None:
-        return f"Basic {system_client_id}:{system_client_secret}"
-    return None
-
-
 def parse_run_restli_response(response: requests.Response) -> dict:
     response_json = response.json()
     if response.status_code != 200:
@@ -166,10 +154,11 @@ def post_entity(
     aspect_value: Dict,
     cached_session_host: Optional[Tuple[Session, str]] = None,
     is_async: Optional[str] = "false",
+    system_metadata: Union[None, SystemMetadataClass] = None,
 ) -> int:
     endpoint: str = "/aspects/?action=ingestProposal"
 
-    proposal = {
+    proposal: Dict[str, Any] = {
         "proposal": {
             "entityType": entity_type,
             "entityUrn": urn,
@@ -182,6 +171,12 @@ def post_entity(
         },
         "async": is_async,
     }
+
+    if system_metadata is not None:
+        proposal["proposal"]["systemMetadata"] = json.dumps(
+            pre_json_transform(system_metadata.to_obj())
+        )
+
     payload = json.dumps(proposal)
     url = gms_host + endpoint
     curl_command = make_curl_command(session, "POST", url, payload)
@@ -310,20 +305,16 @@ def command(ctx: click.Context) -> None:
     return command
 
 
-def get_session_login_as(
+def get_frontend_session_login_as(
     username: str, password: str, frontend_url: str
 ) -> requests.Session:
     session = requests.Session()
     headers = {
         "Content-Type": "application/json",
     }
-    system_auth = get_system_auth()
-    if system_auth is not None:
-        session.headers.update({"Authorization": system_auth})
-    else:
-        data = '{"username":"' + username + '", "password":"' + password + '"}'
-        response = session.post(f"{frontend_url}/logIn", headers=headers, data=data)
-        response.raise_for_status()
+    data = '{"username":"' + username + '", "password":"' + password + '"}'
+    response = session.post(f"{frontend_url}/logIn", headers=headers, data=data)
+    response.raise_for_status()
     return session
 
 
@@ -367,7 +358,7 @@ def generate_access_token(
     validity: str = "ONE_HOUR",
 ) -> Tuple[str, str]:
     frontend_url = guess_frontend_url_from_gms_url(gms_url)
-    session = get_session_login_as(
+    session = get_frontend_session_login_as(
         username=username,
         password=password,
         frontend_url=frontend_url,
@@ -413,6 +404,8 @@ def ensure_has_system_metadata(
     if event.systemMetadata is None:
         event.systemMetadata = SystemMetadataClass()
     metadata = event.systemMetadata
+    if metadata.lastObserved == 0:
+        metadata.lastObserved = int(time.time() * 1000)
     if metadata.properties is None:
         metadata.properties = {}
     props = metadata.properties
diff --git a/metadata-ingestion/src/datahub/cli/config_utils.py b/metadata-ingestion/src/datahub/cli/config_utils.py
index 7a3fee1c760dae..bb85809174ea96 100644
--- a/metadata-ingestion/src/datahub/cli/config_utils.py
+++ b/metadata-ingestion/src/datahub/cli/config_utils.py
@@ -4,36 +4,134 @@
 
 import logging
 import os
-from typing import Optional
+import sys
+from typing import Optional, Tuple
 
 import click
 import yaml
+from pydantic import BaseModel, ValidationError
 
 from datahub.cli.env_utils import get_boolean_env_variable
+from datahub.ingestion.graph.config import DatahubClientConfig
 
-log = logging.getLogger(__name__)
+logger = logging.getLogger(__name__)
 
-DEFAULT_GMS_HOST = "http://localhost:8080"
 CONDENSED_DATAHUB_CONFIG_PATH = "~/.datahubenv"
 DATAHUB_CONFIG_PATH = os.path.expanduser(CONDENSED_DATAHUB_CONFIG_PATH)
 DATAHUB_ROOT_FOLDER = os.path.expanduser("~/.datahub")
 ENV_SKIP_CONFIG = "DATAHUB_SKIP_CONFIG"
 
+ENV_DATAHUB_SYSTEM_CLIENT_ID = "DATAHUB_SYSTEM_CLIENT_ID"
+ENV_DATAHUB_SYSTEM_CLIENT_SECRET = "DATAHUB_SYSTEM_CLIENT_SECRET"
 
-def persist_datahub_config(config: dict) -> None:
-    with open(DATAHUB_CONFIG_PATH, "w+") as outfile:
-        yaml.dump(config, outfile, default_flow_style=False)
+ENV_METADATA_HOST_URL = "DATAHUB_GMS_URL"
+ENV_METADATA_TOKEN = "DATAHUB_GMS_TOKEN"
+ENV_METADATA_HOST = "DATAHUB_GMS_HOST"
+ENV_METADATA_PORT = "DATAHUB_GMS_PORT"
+ENV_METADATA_PROTOCOL = "DATAHUB_GMS_PROTOCOL"
+
+
+class MissingConfigError(Exception):
+    SHOW_STACK_TRACE = False
+
+
+def get_system_auth() -> Optional[str]:
+    system_client_id = os.environ.get(ENV_DATAHUB_SYSTEM_CLIENT_ID)
+    system_client_secret = os.environ.get(ENV_DATAHUB_SYSTEM_CLIENT_SECRET)
+    if system_client_id is not None and system_client_secret is not None:
+        return f"Basic {system_client_id}:{system_client_secret}"
     return None
 
 
-def should_skip_config() -> bool:
+def _should_skip_config() -> bool:
     return get_boolean_env_variable(ENV_SKIP_CONFIG, False)
 
 
-def get_client_config() -> Optional[dict]:
+def persist_raw_datahub_config(config: dict) -> None:
+    with open(DATAHUB_CONFIG_PATH, "w+") as outfile:
+        yaml.dump(config, outfile, default_flow_style=False)
+    return None
+
+
+def get_raw_client_config() -> Optional[dict]:
     with open(DATAHUB_CONFIG_PATH) as stream:
         try:
             return yaml.safe_load(stream)
         except yaml.YAMLError as exc:
             click.secho(f"{DATAHUB_CONFIG_PATH} malformed, error: {exc}", bold=True)
             return None
+
+
+class DatahubConfig(BaseModel):
+    gms: DatahubClientConfig
+
+
+def _get_config_from_env() -> Tuple[Optional[str], Optional[str]]:
+    host = os.environ.get(ENV_METADATA_HOST)
+    port = os.environ.get(ENV_METADATA_PORT)
+    token = os.environ.get(ENV_METADATA_TOKEN)
+    protocol = os.environ.get(ENV_METADATA_PROTOCOL, "http")
+    url = os.environ.get(ENV_METADATA_HOST_URL)
+    if port is not None:
+        url = f"{protocol}://{host}:{port}"
+        return url, token
+    # The reason for using host as URL is backward compatibility
+    # If port is not being used we assume someone is using host env var as URL
+    if url is None and host is not None:
+        logger.warning(
+            f"Do not use {ENV_METADATA_HOST} as URL. Use {ENV_METADATA_HOST_URL} instead"
+        )
+    return url or host, token
+
+
+def load_client_config() -> DatahubClientConfig:
+    gms_host_env, gms_token_env = _get_config_from_env()
+    if gms_host_env:
+        # TODO We should also load system auth credentials here.
+        return DatahubClientConfig(server=gms_host_env, token=gms_token_env)
+
+    if _should_skip_config():
+        raise MissingConfigError(
+            "You have set the skip config flag, but no GMS host or token was provided in env variables."
+        )
+
+    try:
+        _ensure_datahub_config()
+        client_config_dict = get_raw_client_config()
+        datahub_config: DatahubClientConfig = DatahubConfig.parse_obj(
+            client_config_dict
+        ).gms
+
+        return datahub_config
+    except ValidationError as e:
+        click.echo(f"Error loading your {CONDENSED_DATAHUB_CONFIG_PATH}")
+        click.echo(e, err=True)
+        sys.exit(1)
+
+
+def _ensure_datahub_config() -> None:
+    if not os.path.isfile(DATAHUB_CONFIG_PATH):
+        raise MissingConfigError(
+            f"No {CONDENSED_DATAHUB_CONFIG_PATH} file found, and no configuration was found in environment variables. "
+            f"Run `datahub init` to create a {CONDENSED_DATAHUB_CONFIG_PATH} file."
+        )
+
+
+def write_gms_config(
+    host: str, token: Optional[str], merge_with_previous: bool = True
+) -> None:
+    config = DatahubConfig(gms=DatahubClientConfig(server=host, token=token))
+    if merge_with_previous:
+        try:
+            previous_config = get_raw_client_config()
+            assert isinstance(previous_config, dict)
+        except Exception as e:
+            # ok to fail on this
+            previous_config = {}
+            logger.debug(
+                f"Failed to retrieve config from file {DATAHUB_CONFIG_PATH}: {e}. This isn't fatal."
+            )
+        config_dict = {**previous_config, **config.dict()}
+    else:
+        config_dict = config.dict()
+    persist_raw_datahub_config(config_dict)
diff --git a/metadata-ingestion/src/datahub/cli/docker_cli.py b/metadata-ingestion/src/datahub/cli/docker_cli.py
index 707a9cab076e68..9189a881f9ce72 100644
--- a/metadata-ingestion/src/datahub/cli/docker_cli.py
+++ b/metadata-ingestion/src/datahub/cli/docker_cli.py
@@ -1001,7 +1001,7 @@ def ingest_sample_data(path: Optional[str], token: Optional[str]) -> None:
     if token is not None:
         recipe["sink"]["config"]["token"] = token
 
-    pipeline = Pipeline.create(recipe, no_default_report=True)
+    pipeline = Pipeline.create(recipe, report_to=None)
     pipeline.run()
     ret = pipeline.pretty_print_summary()
     sys.exit(ret)
diff --git a/metadata-ingestion/src/datahub/cli/get_cli.py b/metadata-ingestion/src/datahub/cli/get_cli.py
index b6ff5f39a2c14b..ab31323ac52b6f 100644
--- a/metadata-ingestion/src/datahub/cli/get_cli.py
+++ b/metadata-ingestion/src/datahub/cli/get_cli.py
@@ -48,15 +48,28 @@ def urn(ctx: Any, urn: Optional[str], aspect: List[str], details: bool) -> None:
 
     client = get_default_graph()
 
+    if aspect:
+        # If aspects are specified, we need to do the existence check first.
+        if not client.exists(urn):
+            raise click.ClickException(f"urn {urn} not found")
+
+    aspect_data = get_aspects_for_entity(
+        session=client._session,
+        gms_host=client.config.server,
+        entity_urn=urn,
+        aspects=aspect,
+        typed=False,
+        details=details,
+    )
+
+    if not aspect:
+        # If no aspects are specified and we only get a key aspect back, yield an error instead.
+        if len(aspect_data) == 1 and "key" in next(iter(aspect_data)).lower():
+            raise click.ClickException(f"urn {urn} not found")
+
     click.echo(
         json.dumps(
-            get_aspects_for_entity(
-                session=client._session,
-                gms_host=client.config.server,
-                entity_urn=urn,
-                aspects=aspect,
-                typed=False,
-            ),
+            aspect_data,
             sort_keys=True,
             indent=2,
         )
diff --git a/metadata-ingestion/src/datahub/cli/ingest_cli.py b/metadata-ingestion/src/datahub/cli/ingest_cli.py
index 6c8cc6beafbbf1..8654e6c282ba83 100644
--- a/metadata-ingestion/src/datahub/cli/ingest_cli.py
+++ b/metadata-ingestion/src/datahub/cli/ingest_cli.py
@@ -16,7 +16,7 @@
 import datahub as datahub_package
 from datahub.cli import cli_utils
 from datahub.cli.config_utils import CONDENSED_DATAHUB_CONFIG_PATH
-from datahub.configuration.common import ConfigModel
+from datahub.configuration.common import ConfigModel, GraphError
 from datahub.configuration.config_loader import load_config_file
 from datahub.emitter.mce_builder import datahub_guid
 from datahub.ingestion.graph.client import get_default_graph
@@ -119,7 +119,7 @@ def run(
     strict_warnings: bool,
     preview_workunits: int,
     test_source_connection: bool,
-    report_to: str,
+    report_to: Optional[str],
     no_default_report: bool,
     no_spinner: bool,
     no_progress: bool,
@@ -160,7 +160,11 @@ async def run_pipeline_to_completion(pipeline: Pipeline) -> int:
     raw_pipeline_config = pipeline_config.pop("__raw_config")
 
     if test_source_connection:
-        _test_source_connection(report_to, pipeline_config)
+        sys.exit(_test_source_connection(report_to, pipeline_config))
+
+    if no_default_report:
+        # The default is "datahub" reporting. The extra flag will disable it.
+        report_to = None
 
     async def run_ingestion_and_check_upgrade() -> int:
         # TRICKY: We want to make sure that the Pipeline.create() call happens on the
@@ -171,13 +175,12 @@ async def run_ingestion_and_check_upgrade() -> int:
         # logger.debug(f"Using config: {pipeline_config}")
         pipeline = Pipeline.create(
             pipeline_config,
-            dry_run,
-            preview,
-            preview_workunits,
-            report_to,
-            no_default_report,
-            no_progress,
-            raw_pipeline_config,
+            dry_run=dry_run,
+            preview_mode=preview,
+            preview_workunits=preview_workunits,
+            report_to=report_to,
+            no_progress=no_progress,
+            raw_config=raw_pipeline_config,
         )
 
         version_stats_future = asyncio.ensure_future(
@@ -372,7 +375,19 @@ def deploy(
         """
     )
 
-    response = datahub_graph.execute_graphql(graphql_query, variables=variables)
+    try:
+        response = datahub_graph.execute_graphql(
+            graphql_query, variables=variables, format_exception=False
+        )
+    except GraphError as graph_error:
+        try:
+            error = json.loads(str(graph_error).replace('"', '\\"').replace("'", '"'))
+            click.secho(error[0]["message"], fg="red", err=True)
+        except Exception:
+            click.secho(
+                f"Could not create ingestion source:\n{graph_error}", fg="red", err=True
+            )
+        sys.exit(1)
 
     click.echo(
         f"✅ Successfully wrote data ingestion source metadata for recipe {deploy_options.name}:"
@@ -380,7 +395,7 @@ def deploy(
     click.echo(response)
 
 
-def _test_source_connection(report_to: Optional[str], pipeline_config: dict) -> None:
+def _test_source_connection(report_to: Optional[str], pipeline_config: dict) -> int:
     connection_report = None
     try:
         connection_report = ConnectionManager().test_source_connection(pipeline_config)
@@ -389,12 +404,12 @@ def _test_source_connection(report_to: Optional[str], pipeline_config: dict) ->
             with open(report_to, "w") as out_fp:
                 out_fp.write(connection_report.as_json())
             logger.info(f"Wrote report successfully to {report_to}")
-        sys.exit(0)
+        return 0
     except Exception as e:
         logger.error(f"Failed to test connection due to {e}")
         if connection_report:
             logger.error(connection_report.as_json())
-        sys.exit(1)
+        return 1
 
 
 def parse_restli_response(response):
@@ -435,7 +450,7 @@ def mcps(path: str) -> None:
         },
     }
 
-    pipeline = Pipeline.create(recipe, no_default_report=True)
+    pipeline = Pipeline.create(recipe, report_to=None)
     pipeline.run()
     ret = pipeline.pretty_print_summary()
     sys.exit(ret)
diff --git a/metadata-ingestion/src/datahub/cli/lite_cli.py b/metadata-ingestion/src/datahub/cli/lite_cli.py
index 7000cdbd730947..841c2f27528b72 100644
--- a/metadata-ingestion/src/datahub/cli/lite_cli.py
+++ b/metadata-ingestion/src/datahub/cli/lite_cli.py
@@ -11,12 +11,12 @@
 
 from datahub.cli.config_utils import (
     DATAHUB_ROOT_FOLDER,
-    get_client_config,
-    persist_datahub_config,
+    DatahubConfig,
+    get_raw_client_config,
+    persist_raw_datahub_config,
 )
 from datahub.ingestion.api.common import PipelineContext, RecordEnvelope
 from datahub.ingestion.api.sink import NoopWriteCallback
-from datahub.ingestion.graph.client import DatahubConfig
 from datahub.ingestion.run.pipeline import Pipeline
 from datahub.ingestion.sink.file import FileSink, FileSinkConfig
 from datahub.lite.duckdb_lite_config import DuckDBLiteConfig
@@ -45,7 +45,7 @@ class LiteCliConfig(DatahubConfig):
 
 
 def get_lite_config() -> LiteLocalConfig:
-    client_config_dict = get_client_config()
+    client_config_dict = get_raw_client_config()
     lite_config = LiteCliConfig.parse_obj(client_config_dict)
     return lite_config.lite
 
@@ -309,10 +309,10 @@ def search(
 
 
 def write_lite_config(lite_config: LiteLocalConfig) -> None:
-    cli_config = get_client_config()
+    cli_config = get_raw_client_config()
     assert isinstance(cli_config, dict)
     cli_config["lite"] = lite_config.dict()
-    persist_datahub_config(cli_config)
+    persist_raw_datahub_config(cli_config)
 
 
 @lite.command(context_settings=dict(allow_extra_args=True))
diff --git a/metadata-ingestion/src/datahub/cli/put_cli.py b/metadata-ingestion/src/datahub/cli/put_cli.py
index 40af54c7c7e2e4..989b1a6d02fd01 100644
--- a/metadata-ingestion/src/datahub/cli/put_cli.py
+++ b/metadata-ingestion/src/datahub/cli/put_cli.py
@@ -1,12 +1,12 @@
 import logging
-from typing import Optional
+from typing import Optional, Union
 
 import click
 from click_default_group import DefaultGroup
 
 from datahub.cli.cli_utils import post_entity
 from datahub.configuration.config_loader import load_config_file
-from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.emitter.mcp import MetadataChangeProposalWrapper, SystemMetadataClass
 from datahub.ingestion.graph.client import get_default_graph
 from datahub.metadata.schema_classes import (
     DataPlatformInfoClass as DataPlatformInfo,
@@ -36,9 +36,15 @@ def put() -> None:
 @click.option("--urn", required=True, type=str)
 @click.option("-a", "--aspect", required=True, type=str)
 @click.option("-d", "--aspect-data", required=True, type=str)
+@click.option(
+    "--run-id",
+    type=str,
+    required=False,
+    help="Run ID into which we should log the aspect.",
+)
 @upgrade.check_upgrade
 @telemetry.with_telemetry()
-def aspect(urn: str, aspect: str, aspect_data: str) -> None:
+def aspect(urn: str, aspect: str, aspect_data: str, run_id: Optional[str]) -> None:
     """Update a single aspect of an entity"""
 
     entity_type = guess_entity_type(urn)
@@ -48,6 +54,10 @@ def aspect(urn: str, aspect: str, aspect_data: str) -> None:
 
     client = get_default_graph()
 
+    system_metadata: Union[None, SystemMetadataClass] = None
+    if run_id:
+        system_metadata = SystemMetadataClass(runId=run_id)
+
     # TODO: Replace with client.emit, requires figuring out the correct subsclass of _Aspect to create from the data
     status = post_entity(
         client._session,
@@ -56,6 +66,7 @@ def aspect(urn: str, aspect: str, aspect_data: str) -> None:
         aspect_name=aspect,
         entity_type=entity_type,
         aspect_value=aspect_obj,
+        system_metadata=system_metadata,
     )
     click.secho(f"Update succeeded with status {status}", fg="green")
 
@@ -82,8 +93,11 @@ def aspect(urn: str, aspect: str, aspect_data: str) -> None:
     help="Logo URL that must be reachable from the DataHub UI.",
     required=True,
 )
+@click.option(
+    "--run-id", type=str, help="Run ID into which we should log the platform."
+)
 def platform(
-    ctx: click.Context, name: str, display_name: Optional[str], logo: str
+    ctx: click.Context, name: str, display_name: Optional[str], logo: str, run_id: str
 ) -> None:
     """
     Create or update a dataplatform entity in DataHub
@@ -104,11 +118,12 @@ def platform(
         logoUrl=logo,
     )
     datahub_graph = get_default_graph()
-    datahub_graph.emit(
-        MetadataChangeProposalWrapper(
-            entityUrn=str(platform_urn), aspect=data_platform_info
-        )
+    mcp = MetadataChangeProposalWrapper(
+        entityUrn=str(platform_urn),
+        aspect=data_platform_info,
+        systemMetadata=SystemMetadataClass(runId=run_id),
     )
+    datahub_graph.emit(mcp)
     click.echo(
         f"✅ Successfully wrote data platform metadata for {platform_urn} to DataHub ({datahub_graph})"
     )
diff --git a/metadata-ingestion/src/datahub/configuration/source_common.py b/metadata-ingestion/src/datahub/configuration/source_common.py
index 6a663a790c6c2b..7160aa6fc339d3 100644
--- a/metadata-ingestion/src/datahub/configuration/source_common.py
+++ b/metadata-ingestion/src/datahub/configuration/source_common.py
@@ -21,7 +21,9 @@ class PlatformInstanceConfigMixin(ConfigModel):
 
     platform_instance: Optional[str] = Field(
         default=None,
-        description="The instance of the platform that all assets produced by this recipe belong to",
+        description="The instance of the platform that all assets produced by this recipe belong to. "
+        "This should be unique within the platform. "
+        "See https://datahubproject.io/docs/platform-instances/ for more details.",
     )
 
 
diff --git a/metadata-ingestion/src/datahub/configuration/time_window_config.py b/metadata-ingestion/src/datahub/configuration/time_window_config.py
index f20ab85be05855..b3cc0316091173 100644
--- a/metadata-ingestion/src/datahub/configuration/time_window_config.py
+++ b/metadata-ingestion/src/datahub/configuration/time_window_config.py
@@ -9,10 +9,11 @@
 from datahub.configuration.common import ConfigModel
 from datahub.configuration.datetimes import parse_absolute_time, parse_relative_timespan
 from datahub.metadata.schema_classes import CalendarIntervalClass
+from datahub.utilities.str_enum import StrEnum
 
 
 @enum.unique
-class BucketDuration(str, enum.Enum):
+class BucketDuration(StrEnum):
     DAY = CalendarIntervalClass.DAY
     HOUR = CalendarIntervalClass.HOUR
 
diff --git a/metadata-ingestion/src/datahub/emitter/mce_builder.py b/metadata-ingestion/src/datahub/emitter/mce_builder.py
index a0694983660e42..e273bab62fe7a0 100644
--- a/metadata-ingestion/src/datahub/emitter/mce_builder.py
+++ b/metadata-ingestion/src/datahub/emitter/mce_builder.py
@@ -244,6 +244,12 @@ def make_tag_urn(tag: str) -> str:
 
 
 def make_owner_urn(owner: str, owner_type: OwnerType) -> str:
+    if owner_type == OwnerType.USER:
+        return make_user_urn(owner)
+    elif owner_type == OwnerType.GROUP:
+        return make_group_urn(owner)
+    # This should pretty much never happen.
+    # TODO: With Python 3.11, we can use typing.assert_never() here.
     return f"urn:li:{owner_type.value}:{owner}"
 
 
diff --git a/metadata-ingestion/src/datahub/emitter/rest_emitter.py b/metadata-ingestion/src/datahub/emitter/rest_emitter.py
index bb639339427d91..f4bc3666a18c82 100644
--- a/metadata-ingestion/src/datahub/emitter/rest_emitter.py
+++ b/metadata-ingestion/src/datahub/emitter/rest_emitter.py
@@ -10,11 +10,8 @@
 from requests.adapters import HTTPAdapter, Retry
 from requests.exceptions import HTTPError, RequestException
 
-from datahub.cli.cli_utils import (
-    ensure_has_system_metadata,
-    fixup_gms_url,
-    get_system_auth,
-)
+from datahub.cli import config_utils
+from datahub.cli.cli_utils import ensure_has_system_metadata, fixup_gms_url
 from datahub.configuration.common import ConfigurationError, OperationalError
 from datahub.emitter.generic_emitter import Emitter
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
@@ -91,7 +88,12 @@ def __init__(
         if token:
             self._session.headers.update({"Authorization": f"Bearer {token}"})
         else:
-            system_auth = get_system_auth()
+            # HACK: When no token is provided but system auth env variables are set, we use them.
+            # Ideally this should simply get passed in as config, instead of being sneakily injected
+            # in as part of this constructor.
+            # It works because everything goes through here. The DatahubGraph inherits from the
+            # rest emitter, and the rest sink uses the rest emitter under the hood.
+            system_auth = config_utils.get_system_auth()
             if system_auth is not None:
                 self._session.headers.update({"Authorization": system_auth})
 
@@ -305,12 +307,21 @@ def _emit_generic(self, url: str, payload: str) -> None:
         except HTTPError as e:
             try:
                 info: Dict = response.json()
-                logger.debug(
-                    "Full stack trace from DataHub:\n%s", info.get("stackTrace")
-                )
-                info.pop("stackTrace", None)
+
+                if info.get("stackTrace"):
+                    logger.debug(
+                        "Full stack trace from DataHub:\n%s", info.get("stackTrace")
+                    )
+                    info.pop("stackTrace", None)
+
+                hint = ""
+                if "unrecognized field found but not allowed" in (
+                    info.get("message") or ""
+                ):
+                    hint = ", likely because the server version is too old relative to the client"
+
                 raise OperationalError(
-                    f"Unable to emit metadata to DataHub GMS: {info.get('message')}",
+                    f"Unable to emit metadata to DataHub GMS{hint}: {info.get('message')}",
                     info,
                 ) from e
             except JSONDecodeError:
diff --git a/metadata-ingestion/src/datahub/entrypoints.py b/metadata-ingestion/src/datahub/entrypoints.py
index d6b888b391bfb5..d088380d5d38c4 100644
--- a/metadata-ingestion/src/datahub/entrypoints.py
+++ b/metadata-ingestion/src/datahub/entrypoints.py
@@ -13,7 +13,11 @@
     generate_access_token,
     make_shim_command,
 )
-from datahub.cli.config_utils import DATAHUB_CONFIG_PATH, get_boolean_env_variable
+from datahub.cli.config_utils import (
+    DATAHUB_CONFIG_PATH,
+    get_boolean_env_variable,
+    write_gms_config,
+)
 from datahub.cli.delete_cli import delete
 from datahub.cli.docker_cli import docker
 from datahub.cli.exists_cli import exists
@@ -33,7 +37,7 @@
 from datahub.cli.telemetry import telemetry as telemetry_cli
 from datahub.cli.timeline_cli import timeline
 from datahub.configuration.common import should_show_stack_trace
-from datahub.ingestion.graph.client import get_default_graph, write_gms_config
+from datahub.ingestion.graph.client import get_default_graph
 from datahub.telemetry import telemetry
 from datahub.utilities._custom_package_loader import model_version_name
 from datahub.utilities.logging_manager import configure_logging
@@ -149,7 +153,7 @@ def init(use_password: bool = False) -> None:
             type=str,
             default="",
         )
-    write_gms_config(host, token)
+    write_gms_config(host, token, merge_with_previous=False)
 
     click.echo(f"Written to {DATAHUB_CONFIG_PATH}")
 
diff --git a/metadata-ingestion/src/datahub/ingestion/api/incremental_lineage_helper.py b/metadata-ingestion/src/datahub/ingestion/api/incremental_lineage_helper.py
index 29e1f63dd452ef..78a091f1ffe689 100644
--- a/metadata-ingestion/src/datahub/ingestion/api/incremental_lineage_helper.py
+++ b/metadata-ingestion/src/datahub/ingestion/api/incremental_lineage_helper.py
@@ -1,3 +1,4 @@
+import logging
 from typing import Iterable, Optional
 
 from pydantic.fields import Field
@@ -18,6 +19,8 @@
 from datahub.specific.dashboard import DashboardPatchBuilder
 from datahub.specific.dataset import DatasetPatchBuilder
 
+logger = logging.getLogger(__name__)
+
 
 def convert_upstream_lineage_to_patch(
     urn: str,
@@ -48,6 +51,20 @@ def convert_chart_info_to_patch(
         for inputEdge in aspect.inputEdges:
             patch_builder.add_input_edge(inputEdge)
 
+    patch_builder.set_chart_url(aspect.chartUrl).set_external_url(
+        aspect.externalUrl
+    ).set_type(aspect.type).set_title(aspect.title).set_access(
+        aspect.access
+    ).set_last_modified(
+        aspect.lastModified
+    ).set_last_refreshed(
+        aspect.lastRefreshed
+    ).set_description(
+        aspect.description
+    ).add_inputs(
+        aspect.inputs
+    )
+
     values = patch_builder.build()
     if values:
         mcp = next(iter(values))
@@ -76,8 +93,36 @@ def convert_dashboard_info_to_patch(
         for chartEdge in aspect.chartEdges:
             patch_builder.add_chart_edge(chartEdge)
 
+    if aspect.title:
+        patch_builder.set_title(aspect.title)
+
+    if aspect.description:
+        patch_builder.set_description(aspect.description)
+
+    if aspect.charts:
+        patch_builder.add_charts(aspect.charts)
+
+    if aspect.dashboardUrl:
+        patch_builder.set_dashboard_url(aspect.dashboardUrl)
+
+    if aspect.datasets:
+        patch_builder.add_datasets(aspect.datasets)
+
+    if aspect.access:
+        patch_builder.set_access(aspect.access)
+
+    if aspect.lastRefreshed:
+        patch_builder.set_last_refreshed(aspect.lastRefreshed)
+
+    if aspect.lastModified:
+        patch_builder.set_last_modified(last_modified=aspect.lastModified)
+
     values = patch_builder.build()
+
     if values:
+        logger.debug(
+            f"Generating patch DashboardInfo MetadataWorkUnit for dashboard {aspect.title}"
+        )
         mcp = next(iter(values))
         return MetadataWorkUnit(
             id=MetadataWorkUnit.generate_workunit_id(mcp), mcp_raw=mcp
diff --git a/metadata-ingestion/src/datahub/ingestion/api/source.py b/metadata-ingestion/src/datahub/ingestion/api/source.py
index 788bec97a64884..3dea3d36f41f17 100644
--- a/metadata-ingestion/src/datahub/ingestion/api/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/api/source.py
@@ -47,7 +47,7 @@
 
 logger = logging.getLogger(__name__)
 
-_MAX_CONTEXT_STRING_LENGTH = 300
+_MAX_CONTEXT_STRING_LENGTH = 1000
 
 
 class SourceCapability(Enum):
@@ -137,7 +137,10 @@ def report_log(
                 )
 
             # Add the simple exception details to the context.
-            context = f"{context}: {exc}"
+            if context:
+                context = f"{context} {type(exc)}: {exc}"
+            else:
+                context = f"{type(exc)}: {exc}"
         elif log:
             logger.log(level=level.value, msg=log_content, stacklevel=stacklevel)
 
diff --git a/metadata-ingestion/src/datahub/ingestion/glossary/classification_mixin.py b/metadata-ingestion/src/datahub/ingestion/glossary/classification_mixin.py
index 3e5eb4347b474b..1d381acbf3dbe9 100644
--- a/metadata-ingestion/src/datahub/ingestion/glossary/classification_mixin.py
+++ b/metadata-ingestion/src/datahub/ingestion/glossary/classification_mixin.py
@@ -48,7 +48,7 @@ class ClassificationReportMixin:
 class ClassificationSourceConfigMixin(ConfigModel):
     classification: ClassificationConfig = Field(
         default=ClassificationConfig(),
-        description="For details, refer [Classification](../../../../metadata-ingestion/docs/dev_guides/classification.md).",
+        description="For details, refer to [Classification](../../../../metadata-ingestion/docs/dev_guides/classification.md).",
     )
 
 
diff --git a/metadata-ingestion/src/datahub/ingestion/glossary/datahub_classifier.py b/metadata-ingestion/src/datahub/ingestion/glossary/datahub_classifier.py
index 94a65d887efbc7..50268768d0ce9f 100644
--- a/metadata-ingestion/src/datahub/ingestion/glossary/datahub_classifier.py
+++ b/metadata-ingestion/src/datahub/ingestion/glossary/datahub_classifier.py
@@ -1,4 +1,3 @@
-from enum import Enum
 from typing import Any, Dict, List, Optional
 
 from datahub_classify.helper_classes import ColumnInfo
@@ -10,6 +9,7 @@
 from datahub.configuration.common import ConfigModel
 from datahub.configuration.pydantic_migration_helpers import PYDANTIC_VERSION_2
 from datahub.ingestion.glossary.classifier import Classifier
+from datahub.utilities.str_enum import StrEnum
 
 
 class NameFactorConfig(ConfigModel):
@@ -33,7 +33,7 @@ class DataTypeFactorConfig(ConfigModel):
     )
 
 
-class ValuePredictionType(str, Enum):
+class ValuePredictionType(StrEnum):
     REGEX = "regex"
     LIBRARY = "library"
 
diff --git a/metadata-ingestion/src/datahub/ingestion/graph/client.py b/metadata-ingestion/src/datahub/ingestion/graph/client.py
index b2a768099c481d..234d7e5e255d74 100644
--- a/metadata-ingestion/src/datahub/ingestion/graph/client.py
+++ b/metadata-ingestion/src/datahub/ingestion/graph/client.py
@@ -1,10 +1,7 @@
 import contextlib
-import enum
 import functools
 import json
 import logging
-import os
-import sys
 import textwrap
 import time
 from dataclasses import dataclass
@@ -24,10 +21,9 @@
     Union,
 )
 
-import click
 from avro.schema import RecordSchema
 from deprecated import deprecated
-from pydantic import BaseModel, ValidationError
+from pydantic import BaseModel
 from requests.models import HTTPError
 
 from datahub.cli import config_utils
@@ -37,6 +33,7 @@
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.emitter.rest_emitter import DatahubRestEmitter
 from datahub.emitter.serialization_helper import post_json_transform
+from datahub.ingestion.graph.config import DatahubClientConfig
 from datahub.ingestion.graph.connections import (
     connections_gql,
     get_id_from_connection_urn,
@@ -69,6 +66,7 @@
     TelemetryClientIdClass,
 )
 from datahub.utilities.perf_timer import PerfTimer
+from datahub.utilities.str_enum import StrEnum
 from datahub.utilities.urns.urn import Urn, guess_entity_type
 
 if TYPE_CHECKING:
@@ -90,26 +88,6 @@
 _MISSING_SERVER_ID = "missing"
 _GRAPH_DUMMY_RUN_ID = "__datahub-graph-client"
 
-ENV_METADATA_HOST_URL = "DATAHUB_GMS_URL"
-ENV_METADATA_TOKEN = "DATAHUB_GMS_TOKEN"
-ENV_METADATA_HOST = "DATAHUB_GMS_HOST"
-ENV_METADATA_PORT = "DATAHUB_GMS_PORT"
-ENV_METADATA_PROTOCOL = "DATAHUB_GMS_PROTOCOL"
-
-
-class DatahubClientConfig(ConfigModel):
-    """Configuration class for holding connectivity to datahub gms"""
-
-    server: str = "http://localhost:8080"
-    token: Optional[str] = None
-    timeout_sec: Optional[int] = None
-    retry_status_codes: Optional[List[int]] = None
-    retry_max_times: Optional[int] = None
-    extra_headers: Optional[Dict[str, str]] = None
-    ca_certificate_path: Optional[str] = None
-    client_certificate_path: Optional[str] = None
-    disable_ssl_verification: bool = False
-
 
 # Alias for backwards compatibility.
 # DEPRECATION: Remove in v0.10.2.
@@ -185,7 +163,7 @@ def frontend_base_url(self) -> str:
         """Get the public-facing base url of the frontend
 
         This url can be used to construct links to the frontend. The url will not include a trailing slash.
-        Note: Only supported with Acryl Cloud.
+        Note: Only supported with DataHub Cloud.
         """
 
         if not self.server_config:
@@ -523,8 +501,8 @@ def get_aspects_for_entity(
         responds to these calls, and will be fixed automatically when the server-side issue is fixed.
 
         :param str entity_urn: The urn of the entity
-        :param List[Type[Aspect]] aspect_type_list: List of aspect type classes being requested (e.g. [datahub.metadata.schema_classes.DatasetProperties])
-        :param List[str] aspects_list: List of aspect names being requested (e.g. [schemaMetadata, datasetProperties])
+        :param aspects: List of aspect names being requested (e.g. [schemaMetadata, datasetProperties])
+        :param aspect_types: List of aspect type classes being requested (e.g. [datahub.metadata.schema_classes.DatasetProperties])
         :return: Optionally, a map of aspect_name to aspect_value as a dictionary if present, aspect_value will be set to None if that aspect was not found. Returns None on HTTP status 404.
         :raises HttpError: if the HTTP response is not a 200
         """
@@ -549,8 +527,10 @@ def get_aspects_for_entity(
 
         return result
 
-    def get_entity_semityped(self, entity_urn: str) -> AspectBag:
-        """Get all non-timeseries aspects for an entity (experimental).
+    def get_entity_semityped(
+        self, entity_urn: str, aspects: Optional[List[str]] = None
+    ) -> AspectBag:
+        """Get (all) non-timeseries aspects for an entity.
 
         This method is called "semityped" because it returns aspects as a dictionary of
         properly typed objects. While the returned dictionary is constrained using a TypedDict,
@@ -560,11 +540,12 @@ def get_entity_semityped(self, entity_urn: str) -> AspectBag:
         something, even if the entity doesn't actually exist in DataHub.
 
         :param entity_urn: The urn of the entity
+        :param aspects: Optional list of aspect names being requested (e.g. ["schemaMetadata", "datasetProperties"])
         :returns: A dictionary of aspect name to aspect value. If an aspect is not found, it will
             not be present in the dictionary. The entity's key aspect will always be present.
         """
 
-        response_json = self.get_entity_raw(entity_urn)
+        response_json = self.get_entity_raw(entity_urn, aspects)
 
         # Now, we parse the response into proper aspect objects.
         result: AspectBag = {}
@@ -632,7 +613,7 @@ def get_domain_urn_by_name(self, domain_name: str) -> Optional[str]:
     def get_connection_json(self, urn: str) -> Optional[dict]:
         """Retrieve a connection config.
 
-        This is only supported with Acryl Cloud.
+        This is only supported with DataHub Cloud.
 
         Args:
             urn: The urn of the connection.
@@ -677,7 +658,7 @@ def set_connection_json(
     ) -> None:
         """Set a connection config.
 
-        This is only supported with Acryl Cloud.
+        This is only supported with DataHub Cloud.
 
         Args:
             urn: The urn of the connection.
@@ -938,7 +919,7 @@ def get_results_by_filter(
     ) -> Iterable[dict]:
         """Fetch all results that match all of the given filters.
 
-        Note: Only supported with Acryl Cloud.
+        Note: Only supported with DataHub Cloud.
 
         Filters are combined conjunctively. If multiple filters are specified, the results will match all of them.
         Note that specifying a platform filter will automatically exclude all entity types that do not have a platform.
@@ -1133,6 +1114,7 @@ def execute_graphql(
         query: str,
         variables: Optional[Dict] = None,
         operation_name: Optional[str] = None,
+        format_exception: bool = True,
     ) -> Dict:
         url = f"{self.config.server}/api/graphql"
 
@@ -1149,13 +1131,14 @@ def execute_graphql(
         )
         result = self._post_generic(url, body)
         if result.get("errors"):
-            raise GraphError(f"Error executing graphql query: {result['errors']}")
+            if format_exception:
+                raise GraphError(f"Error executing graphql query: {result['errors']}")
+            else:
+                raise GraphError(result["errors"])
 
         return result["data"]
 
-    class RelationshipDirection(str, enum.Enum):
-        # FIXME: Upgrade to enum.StrEnum when we drop support for Python 3.10
-
+    class RelationshipDirection(StrEnum):
         INCOMING = "INCOMING"
         OUTGOING = "OUTGOING"
 
@@ -1775,88 +1758,7 @@ def close(self) -> None:
 
 
 def get_default_graph() -> DataHubGraph:
-    graph_config = load_client_config()
+    graph_config = config_utils.load_client_config()
     graph = DataHubGraph(graph_config)
     graph.test_connection()
     return graph
-
-
-class DatahubConfig(BaseModel):
-    gms: DatahubClientConfig
-
-
-config_override: Dict = {}
-
-
-def get_details_from_env() -> Tuple[Optional[str], Optional[str]]:
-    host = os.environ.get(ENV_METADATA_HOST)
-    port = os.environ.get(ENV_METADATA_PORT)
-    token = os.environ.get(ENV_METADATA_TOKEN)
-    protocol = os.environ.get(ENV_METADATA_PROTOCOL, "http")
-    url = os.environ.get(ENV_METADATA_HOST_URL)
-    if port is not None:
-        url = f"{protocol}://{host}:{port}"
-        return url, token
-    # The reason for using host as URL is backward compatibility
-    # If port is not being used we assume someone is using host env var as URL
-    if url is None and host is not None:
-        logger.warning(
-            f"Do not use {ENV_METADATA_HOST} as URL. Use {ENV_METADATA_HOST_URL} instead"
-        )
-    return url or host, token
-
-
-def load_client_config() -> DatahubClientConfig:
-    try:
-        ensure_datahub_config()
-        client_config_dict = config_utils.get_client_config()
-        datahub_config: DatahubClientConfig = DatahubConfig.parse_obj(
-            client_config_dict
-        ).gms
-    except ValidationError as e:
-        click.echo(
-            f"Received error, please check your {config_utils.CONDENSED_DATAHUB_CONFIG_PATH}"
-        )
-        click.echo(e, err=True)
-        sys.exit(1)
-
-    # Override gms & token configs if specified.
-    if len(config_override.keys()) > 0:
-        datahub_config.server = str(config_override.get(ENV_METADATA_HOST_URL))
-        datahub_config.token = config_override.get(ENV_METADATA_TOKEN)
-    elif config_utils.should_skip_config():
-        gms_host_env, gms_token_env = get_details_from_env()
-        if gms_host_env:
-            datahub_config.server = gms_host_env
-        datahub_config.token = gms_token_env
-
-    return datahub_config
-
-
-def ensure_datahub_config() -> None:
-    if not os.path.isfile(config_utils.DATAHUB_CONFIG_PATH):
-        click.secho(
-            f"No {config_utils.CONDENSED_DATAHUB_CONFIG_PATH} file found, generating one for you...",
-            bold=True,
-        )
-        write_gms_config(config_utils.DEFAULT_GMS_HOST, None)
-
-
-def write_gms_config(
-    host: str, token: Optional[str], merge_with_previous: bool = True
-) -> None:
-    config = DatahubConfig(gms=DatahubClientConfig(server=host, token=token))
-    if merge_with_previous:
-        try:
-            previous_config = config_utils.get_client_config()
-            assert isinstance(previous_config, dict)
-        except Exception as e:
-            # ok to fail on this
-            previous_config = {}
-            logger.debug(
-                f"Failed to retrieve config from file {config_utils.DATAHUB_CONFIG_PATH}: {e}. This isn't fatal."
-            )
-        config_dict = {**previous_config, **config.dict()}
-    else:
-        config_dict = config.dict()
-    config_utils.persist_datahub_config(config_dict)
diff --git a/metadata-ingestion/src/datahub/ingestion/graph/config.py b/metadata-ingestion/src/datahub/ingestion/graph/config.py
new file mode 100644
index 00000000000000..cf0ec45b71458c
--- /dev/null
+++ b/metadata-ingestion/src/datahub/ingestion/graph/config.py
@@ -0,0 +1,19 @@
+from typing import Dict, List, Optional
+
+from datahub.configuration.common import ConfigModel
+
+
+class DatahubClientConfig(ConfigModel):
+    """Configuration class for holding connectivity to datahub gms"""
+
+    # TODO: Having a default for the server doesn't make a ton of sense. This should be handled
+    # by callers / the CLI, but the actual client should not have any magic.
+    server: str = "http://localhost:8080"
+    token: Optional[str] = None
+    timeout_sec: Optional[int] = None
+    retry_status_codes: Optional[List[int]] = None
+    retry_max_times: Optional[int] = None
+    extra_headers: Optional[Dict[str, str]] = None
+    ca_certificate_path: Optional[str] = None
+    client_certificate_path: Optional[str] = None
+    disable_ssl_verification: bool = False
diff --git a/metadata-ingestion/src/datahub/ingestion/graph/filters.py b/metadata-ingestion/src/datahub/ingestion/graph/filters.py
index 8974f159171d1e..edb45fa5c2dbc1 100644
--- a/metadata-ingestion/src/datahub/ingestion/graph/filters.py
+++ b/metadata-ingestion/src/datahub/ingestion/graph/filters.py
@@ -110,6 +110,10 @@ def _get_env_filters(env: str) -> List[SearchFilterRule]:
             "field": "customProperties",
             "value": f"instance={env}",
         },
+        {
+            "field": "env",
+            "value": env,
+        }
         # Note that not all entity types have an env (e.g. dashboards / charts).
         # If the env filter is specified, these will be excluded.
     ]
diff --git a/metadata-ingestion/src/datahub/ingestion/reporting/datahub_ingestion_run_summary_provider.py b/metadata-ingestion/src/datahub/ingestion/reporting/datahub_ingestion_run_summary_provider.py
index 2245e27ecedabf..33bfb63feb3fd7 100644
--- a/metadata-ingestion/src/datahub/ingestion/reporting/datahub_ingestion_run_summary_provider.py
+++ b/metadata-ingestion/src/datahub/ingestion/reporting/datahub_ingestion_run_summary_provider.py
@@ -43,6 +43,7 @@ class DatahubIngestionRunSummaryProvider(PipelineRunListener):
     _EXECUTOR_ID: str = "__datahub_cli_"
     _EXECUTION_REQUEST_SOURCE_TYPE: str = "CLI_INGESTION_SOURCE"
     _INGESTION_TASK_NAME: str = "CLI Ingestion"
+    _MAX_SUMMARY_SIZE: int = 800000
 
     @staticmethod
     def get_cur_time_in_ms() -> int:
@@ -209,7 +210,9 @@ def on_completion(
             status=status,
             startTimeMs=self.start_time_ms,
             durationMs=self.get_cur_time_in_ms() - self.start_time_ms,
-            report=summary,
+            # Truncate summary such that the generated MCP will not exceed GMS's payload limit.
+            # Hardcoding the overall size of dataHubExecutionRequestResult to >1MB by trimming summary to 800,000 chars
+            report=summary[-self._MAX_SUMMARY_SIZE :],
             structuredReport=structured_report,
         )
 
diff --git a/metadata-ingestion/src/datahub/ingestion/run/pipeline.py b/metadata-ingestion/src/datahub/ingestion/run/pipeline.py
index 60930f03763ed9..a16a3df57d1bcb 100644
--- a/metadata-ingestion/src/datahub/ingestion/run/pipeline.py
+++ b/metadata-ingestion/src/datahub/ingestion/run/pipeline.py
@@ -221,7 +221,6 @@ def __init__(
         preview_mode: bool = False,
         preview_workunits: int = 10,
         report_to: Optional[str] = None,
-        no_default_report: bool = False,
         no_progress: bool = False,
     ):
         self.config = config
@@ -252,6 +251,9 @@ def __init__(
             )
 
         if self.config.sink is None:
+            logger.info(
+                "No sink configured, attempting to use the default datahub-rest sink."
+            )
             with _add_init_error_context("configure the default rest sink"):
                 self.sink_type = "datahub-rest"
                 self.sink = _make_default_rest_sink(self.ctx)
@@ -276,7 +278,7 @@ def __init__(
 
         with set_graph_context(self.graph):
             with _add_init_error_context("configure reporters"):
-                self._configure_reporting(report_to, no_default_report)
+                self._configure_reporting(report_to)
 
             with _add_init_error_context(
                 f"find a registered source for type {self.source_type}"
@@ -323,15 +325,19 @@ def _configure_transforms(self) -> None:
         # Add the system metadata transformer at the end of the list.
         self.transformers.append(SystemMetadataTransformer(self.ctx))
 
-    def _configure_reporting(
-        self, report_to: Optional[str], no_default_report: bool
-    ) -> None:
-        if report_to == "datahub":
+    def _configure_reporting(self, report_to: Optional[str]) -> None:
+        if self.dry_run:
+            # In dry run mode, we don't want to report anything.
+            return
+
+        if not report_to:
+            # Reporting is disabled.
+            pass
+        elif report_to == "datahub":
             # we add the default datahub reporter unless a datahub reporter is already configured
-            if not no_default_report and (
-                not self.config.reporting
-                or "datahub" not in [x.type for x in self.config.reporting]
-            ):
+            if not self.config.reporting or "datahub" not in [
+                reporter.type for reporter in self.config.reporting
+            ]:
                 self.config.reporting.append(
                     ReporterConfig.parse_obj({"type": "datahub"})
                 )
@@ -406,7 +412,6 @@ def create(
         preview_mode: bool = False,
         preview_workunits: int = 10,
         report_to: Optional[str] = "datahub",
-        no_default_report: bool = False,
         no_progress: bool = False,
         raw_config: Optional[dict] = None,
     ) -> "Pipeline":
@@ -417,7 +422,6 @@ def create(
             preview_mode=preview_mode,
             preview_workunits=preview_workunits,
             report_to=report_to,
-            no_default_report=no_default_report,
             no_progress=no_progress,
         )
 
diff --git a/metadata-ingestion/src/datahub/ingestion/run/pipeline_config.py b/metadata-ingestion/src/datahub/ingestion/run/pipeline_config.py
index 51b657ad5bf777..98629ba030695a 100644
--- a/metadata-ingestion/src/datahub/ingestion/run/pipeline_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/run/pipeline_config.py
@@ -1,14 +1,12 @@
 import datetime
 import logging
-import os
 import uuid
 from typing import Any, Dict, List, Optional
 
-from pydantic import Field, root_validator, validator
+from pydantic import Field, validator
 
-from datahub.configuration import config_loader
 from datahub.configuration.common import ConfigModel, DynamicTypedConfig
-from datahub.ingestion.graph.client import DatahubClientConfig, load_client_config
+from datahub.ingestion.graph.client import DatahubClientConfig
 from datahub.ingestion.sink.file import FileSinkConfig
 
 logger = logging.getLogger(__name__)
@@ -103,34 +101,6 @@ def run_id_should_be_semantic(
             assert v is not None
             return v
 
-    @root_validator(pre=True)
-    def default_sink_is_datahub_rest(cls, values: Dict[str, Any]) -> Any:
-        if "sink" not in values:
-            config = load_client_config()
-            # update this
-            default_sink_config = {
-                "type": "datahub-rest",
-                "config": config.dict(exclude_defaults=True),
-            }
-            # resolve env variables if present
-            default_sink_config = config_loader.resolve_env_variables(
-                default_sink_config, environ=os.environ
-            )
-            values["sink"] = default_sink_config
-
-        return values
-
-    @validator("datahub_api", always=True)
-    def datahub_api_should_use_rest_sink_as_default(
-        cls, v: Optional[DatahubClientConfig], values: Dict[str, Any], **kwargs: Any
-    ) -> Optional[DatahubClientConfig]:
-        if v is None and "sink" in values and hasattr(values["sink"], "type"):
-            sink_type = values["sink"].type
-            if sink_type == "datahub-rest":
-                sink_config = values["sink"].config
-                v = DatahubClientConfig.parse_obj_allow_extras(sink_config)
-        return v
-
     @classmethod
     def from_dict(
         cls, resolved_dict: dict, raw_dict: Optional[dict] = None
diff --git a/metadata-ingestion/src/datahub/ingestion/sink/datahub_rest.py b/metadata-ingestion/src/datahub/ingestion/sink/datahub_rest.py
index a9f788acf66d38..6d7105bd264416 100644
--- a/metadata-ingestion/src/datahub/ingestion/sink/datahub_rest.py
+++ b/metadata-ingestion/src/datahub/ingestion/sink/datahub_rest.py
@@ -202,6 +202,8 @@ def _write_done_callback(
                 record_urn = _get_urn(record_envelope)
                 if record_urn:
                     e.info["urn"] = record_urn
+                if workunit_id := record_envelope.metadata.get("workunit_id"):
+                    e.info["workunit_id"] = workunit_id
 
                 if not self.treat_errors_as_warnings:
                     self.report.report_failure({"error": e.message, "info": e.info})
diff --git a/metadata-ingestion/src/datahub/ingestion/source/abs/source.py b/metadata-ingestion/src/datahub/ingestion/source/abs/source.py
index c9833f69825998..66f268799b2f1f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/abs/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/abs/source.py
@@ -8,29 +8,10 @@
 from collections import OrderedDict
 from datetime import datetime
 from pathlib import PurePath
-from typing import Any, Dict, Iterable, List, Optional, Tuple
+from typing import Dict, Iterable, List, Optional, Tuple
 
 import smart_open.compression as so_compression
 from more_itertools import peekable
-from pyspark.sql.types import (
-    ArrayType,
-    BinaryType,
-    BooleanType,
-    ByteType,
-    DateType,
-    DecimalType,
-    DoubleType,
-    FloatType,
-    IntegerType,
-    LongType,
-    MapType,
-    NullType,
-    ShortType,
-    StringType,
-    StructField,
-    StructType,
-    TimestampType,
-)
 from smart_open import open as smart_open
 
 from datahub.emitter.mce_builder import (
@@ -48,7 +29,7 @@
     platform_name,
     support_status,
 )
-from datahub.ingestion.api.source import MetadataWorkUnitProcessor, SourceReport
+from datahub.ingestion.api.source import MetadataWorkUnitProcessor
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.source.abs.config import DataLakeSourceConfig, PathSpec
 from datahub.ingestion.source.abs.report import DataLakeSourceReport
@@ -72,22 +53,14 @@
     StatefulIngestionSourceBase,
 )
 from datahub.metadata.com.linkedin.pegasus2avro.schema import (
-    BooleanTypeClass,
-    BytesTypeClass,
-    DateTypeClass,
-    NullTypeClass,
-    NumberTypeClass,
-    RecordTypeClass,
     SchemaField,
     SchemaFieldDataType,
     SchemaMetadata,
     StringTypeClass,
-    TimeTypeClass,
 )
 from datahub.metadata.schema_classes import (
     DataPlatformInstanceClass,
     DatasetPropertiesClass,
-    MapTypeClass,
     OperationClass,
     OperationTypeClass,
     OtherSchemaClass,
@@ -100,55 +73,12 @@
 logging.getLogger("py4j").setLevel(logging.ERROR)
 logger: logging.Logger = logging.getLogger(__name__)
 
-# for a list of all types, see https://spark.apache.org/docs/3.0.3/api/python/_modules/pyspark/sql/types.html
-_field_type_mapping = {
-    NullType: NullTypeClass,
-    StringType: StringTypeClass,
-    BinaryType: BytesTypeClass,
-    BooleanType: BooleanTypeClass,
-    DateType: DateTypeClass,
-    TimestampType: TimeTypeClass,
-    DecimalType: NumberTypeClass,
-    DoubleType: NumberTypeClass,
-    FloatType: NumberTypeClass,
-    ByteType: BytesTypeClass,
-    IntegerType: NumberTypeClass,
-    LongType: NumberTypeClass,
-    ShortType: NumberTypeClass,
-    ArrayType: NullTypeClass,
-    MapType: MapTypeClass,
-    StructField: RecordTypeClass,
-    StructType: RecordTypeClass,
-}
 PAGE_SIZE = 1000
 
 # Hack to support the .gzip extension with smart_open.
 so_compression.register_compressor(".gzip", so_compression._COMPRESSOR_REGISTRY[".gz"])
 
 
-def get_column_type(
-    report: SourceReport, dataset_name: str, column_type: str
-) -> SchemaFieldDataType:
-    """
-    Maps known Spark types to datahub types
-    """
-    TypeClass: Any = None
-
-    for field_type, type_class in _field_type_mapping.items():
-        if isinstance(column_type, field_type):
-            TypeClass = type_class
-            break
-
-    # if still not found, report the warning
-    if TypeClass is None:
-        report.report_warning(
-            dataset_name, f"unable to map type {column_type} to metadata schema"
-        )
-        TypeClass = NullTypeClass
-
-    return SchemaFieldDataType(type=TypeClass())
-
-
 # config flags to emit telemetry for
 config_options_to_report = [
     "platform",
@@ -198,11 +128,6 @@ class TableData:
 @support_status(SupportStatus.INCUBATING)
 @capability(SourceCapability.DATA_PROFILING, "Optionally enabled via configuration")
 @capability(SourceCapability.TAGS, "Can extract ABS object/container tags if enabled")
-@capability(
-    SourceCapability.DELETION_DETECTION,
-    "Optionally enabled via `stateful_ingestion.remove_stale_metadata`",
-    supported=True,
-)
 class ABSSource(StatefulIngestionSourceBase):
     source_config: DataLakeSourceConfig
     report: DataLakeSourceReport
diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/aws_common.py b/metadata-ingestion/src/datahub/ingestion/source/aws/aws_common.py
index ba358d2465bbc9..ce45a5c9b95dcc 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/aws_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/aws_common.py
@@ -1,3 +1,4 @@
+from datetime import datetime, timedelta, timezone
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
 
 import boto3
@@ -73,6 +74,8 @@ class AwsConnectionConfig(ConfigModel):
         - dbt source
     """
 
+    _credentials_expiration: Optional[datetime] = None
+
     aws_access_key_id: Optional[str] = Field(
         default=None,
         description=f"AWS access key ID. {AUTODETECT_CREDENTIALS_DOC_LINK}",
@@ -88,7 +91,7 @@ class AwsConnectionConfig(ConfigModel):
     aws_role: Optional[Union[str, List[Union[str, AwsAssumeRoleConfig]]]] = Field(
         default=None,
         description="AWS roles to assume. If using the string format, the role ARN can be specified directly. "
-        "If using the object format, the role can be specified in the RoleArn field and additional available arguments are documented at https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/sts.html?highlight=assume_role#STS.Client.assume_role",
+        "If using the object format, the role can be specified in the RoleArn field and additional available arguments are the same as [boto3's STS.Client.assume_role](https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/sts.html?highlight=assume_role#STS.Client.assume_role).",
     )
     aws_profile: Optional[str] = Field(
         default=None,
@@ -115,6 +118,11 @@ class AwsConnectionConfig(ConfigModel):
         description="Advanced AWS configuration options. These are passed directly to [botocore.config.Config](https://botocore.amazonaws.com/v1/documentation/api/latest/reference/config.html).",
     )
 
+    def allowed_cred_refresh(self) -> bool:
+        if self._normalized_aws_roles():
+            return True
+        return False
+
     def _normalized_aws_roles(self) -> List[AwsAssumeRoleConfig]:
         if not self.aws_role:
             return []
@@ -153,11 +161,14 @@ def get_session(self) -> Session:
             }
 
             for role in self._normalized_aws_roles():
-                credentials = assume_role(
-                    role,
-                    self.aws_region,
-                    credentials=credentials,
-                )
+                if self._should_refresh_credentials():
+                    credentials = assume_role(
+                        role,
+                        self.aws_region,
+                        credentials=credentials,
+                    )
+                    if isinstance(credentials["Expiration"], datetime):
+                        self._credentials_expiration = credentials["Expiration"]
 
             session = Session(
                 aws_access_key_id=credentials["AccessKeyId"],
@@ -168,6 +179,12 @@ def get_session(self) -> Session:
 
         return session
 
+    def _should_refresh_credentials(self) -> bool:
+        if self._credentials_expiration is None:
+            return True
+        remaining_time = self._credentials_expiration - datetime.now(timezone.utc)
+        return remaining_time < timedelta(minutes=5)
+
     def get_credentials(self) -> Dict[str, Optional[str]]:
         credentials = self.get_session().get_credentials()
         if credentials is not None:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
index f7e1e2610e7e28..58fb1cb1eb2c28 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
@@ -167,8 +167,8 @@ class GlueSourceConfig(
         default=False,
         description="If an S3 Objects Tags should be created for the Tables ingested by Glue.",
     )
-    profiling: Optional[GlueProfilingConfig] = Field(
-        default=None,
+    profiling: GlueProfilingConfig = Field(
+        default_factory=GlueProfilingConfig,
         description="Configs to ingest data profiles from glue table",
     )
     # Custom Stateful Ingestion settings
@@ -186,7 +186,7 @@ class GlueSourceConfig(
     )
 
     def is_profiling_enabled(self) -> bool:
-        return self.profiling is not None and is_profiling_enabled(
+        return self.profiling.enabled and is_profiling_enabled(
             self.profiling.operation_config
         )
 
@@ -867,34 +867,39 @@ def _create_profile_mcp(
             # instantiate column profile class for each column
             column_profile = DatasetFieldProfileClass(fieldPath=column_name)
 
-            if self.source_config.profiling.unique_count in column_params:
-                column_profile.uniqueCount = int(
-                    float(column_params[self.source_config.profiling.unique_count])
-                )
-            if self.source_config.profiling.unique_proportion in column_params:
-                column_profile.uniqueProportion = float(
-                    column_params[self.source_config.profiling.unique_proportion]
-                )
-            if self.source_config.profiling.null_count in column_params:
-                column_profile.nullCount = int(
-                    float(column_params[self.source_config.profiling.null_count])
-                )
-            if self.source_config.profiling.null_proportion in column_params:
-                column_profile.nullProportion = float(
-                    column_params[self.source_config.profiling.null_proportion]
-                )
-            if self.source_config.profiling.min in column_params:
-                column_profile.min = column_params[self.source_config.profiling.min]
-            if self.source_config.profiling.max in column_params:
-                column_profile.max = column_params[self.source_config.profiling.max]
-            if self.source_config.profiling.mean in column_params:
-                column_profile.mean = column_params[self.source_config.profiling.mean]
-            if self.source_config.profiling.median in column_params:
-                column_profile.median = column_params[
-                    self.source_config.profiling.median
-                ]
-            if self.source_config.profiling.stdev in column_params:
-                column_profile.stdev = column_params[self.source_config.profiling.stdev]
+            if not self.source_config.profiling.profile_table_level_only:
+                if self.source_config.profiling.unique_count in column_params:
+                    column_profile.uniqueCount = int(
+                        float(column_params[self.source_config.profiling.unique_count])
+                    )
+                if self.source_config.profiling.unique_proportion in column_params:
+                    column_profile.uniqueProportion = float(
+                        column_params[self.source_config.profiling.unique_proportion]
+                    )
+                if self.source_config.profiling.null_count in column_params:
+                    column_profile.nullCount = int(
+                        float(column_params[self.source_config.profiling.null_count])
+                    )
+                if self.source_config.profiling.null_proportion in column_params:
+                    column_profile.nullProportion = float(
+                        column_params[self.source_config.profiling.null_proportion]
+                    )
+                if self.source_config.profiling.min in column_params:
+                    column_profile.min = column_params[self.source_config.profiling.min]
+                if self.source_config.profiling.max in column_params:
+                    column_profile.max = column_params[self.source_config.profiling.max]
+                if self.source_config.profiling.mean in column_params:
+                    column_profile.mean = column_params[
+                        self.source_config.profiling.mean
+                    ]
+                if self.source_config.profiling.median in column_params:
+                    column_profile.median = column_params[
+                        self.source_config.profiling.median
+                    ]
+                if self.source_config.profiling.stdev in column_params:
+                    column_profile.stdev = column_params[
+                        self.source_config.profiling.stdev
+                    ]
 
             dataset_profile.fieldProfiles.append(column_profile)
 
@@ -914,9 +919,7 @@ def _create_profile_mcp(
     def get_profile_if_enabled(
         self, mce: MetadataChangeEventClass, database_name: str, table_name: str
     ) -> Iterable[MetadataWorkUnit]:
-        # We don't need both checks only the second one
-        # but then lint believes that GlueProfilingConfig can be None
-        if self.source_config.profiling and self.source_config.is_profiling_enabled():
+        if self.source_config.is_profiling_enabled():
             # for cross-account ingestion
             kwargs = dict(
                 DatabaseName=database_name,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker.py b/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker.py
index acbc6eb9a0e442..b63fa57f069b5b 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker.py
@@ -1,5 +1,5 @@
 from collections import defaultdict
-from typing import DefaultDict, Dict, Iterable, List, Optional
+from typing import TYPE_CHECKING, DefaultDict, Dict, Iterable, List, Optional
 
 from datahub.ingestion.api.common import PipelineContext
 from datahub.ingestion.api.decorators import (
@@ -33,6 +33,9 @@
     StatefulIngestionSourceBase,
 )
 
+if TYPE_CHECKING:
+    from mypy_boto3_sagemaker import SageMakerClient
+
 
 @platform_name("SageMaker")
 @config_class(SagemakerSourceConfig)
@@ -56,6 +59,7 @@ def __init__(self, config: SagemakerSourceConfig, ctx: PipelineContext):
         self.report = SagemakerSourceReport()
         self.sagemaker_client = config.sagemaker_client
         self.env = config.env
+        self.client_factory = ClientFactory(config)
 
     @classmethod
     def create(cls, config_dict, ctx):
@@ -92,7 +96,7 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
         # extract jobs if specified
         if self.source_config.extract_jobs is not False:
             job_processor = JobProcessor(
-                sagemaker_client=self.sagemaker_client,
+                sagemaker_client=self.client_factory.get_client,
                 env=self.env,
                 report=self.report,
                 job_type_filter=self.source_config.extract_jobs,
@@ -118,3 +122,15 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
 
     def get_report(self):
         return self.report
+
+
+class ClientFactory:
+    def __init__(self, config: SagemakerSourceConfig):
+        self.config = config
+        self._cached_client = self.config.sagemaker_client
+
+    def get_client(self) -> "SageMakerClient":
+        if self.config.allowed_cred_refresh():
+            # Always fetch the client dynamically with auto-refresh logic
+            return self.config.sagemaker_client
+        return self._cached_client
diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/jobs.py b/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/jobs.py
index a1a5a008842372..73a83295ec8cba 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/jobs.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/jobs.py
@@ -4,6 +4,7 @@
 from typing import (
     TYPE_CHECKING,
     Any,
+    Callable,
     DefaultDict,
     Dict,
     Iterable,
@@ -147,7 +148,7 @@ class JobProcessor:
     """
 
     # boto3 SageMaker client
-    sagemaker_client: "SageMakerClient"
+    sagemaker_client: Callable[[], "SageMakerClient"]
     env: str
     report: SagemakerSourceReport
     # config filter for specific job types to ingest (see metadata-ingestion README)
@@ -170,8 +171,7 @@ class JobProcessor:
 
     def get_jobs(self, job_type: JobType, job_spec: JobInfo) -> List[Any]:
         jobs = []
-
-        paginator = self.sagemaker_client.get_paginator(job_spec.list_command)
+        paginator = self.sagemaker_client().get_paginator(job_spec.list_command)
         for page in paginator.paginate():
             page_jobs: List[Any] = page[job_spec.list_key]
 
@@ -269,7 +269,7 @@ def get_job_details(self, job_name: str, job_type: JobType) -> Dict[str, Any]:
         describe_command = job_type_to_info[job_type].describe_command
         describe_name_key = job_type_to_info[job_type].describe_name_key
 
-        return getattr(self.sagemaker_client, describe_command)(
+        return getattr(self.sagemaker_client(), describe_command)(
             **{describe_name_key: job_name}
         )
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
index 7a96b2f0643ab0..4ec287b885dea9 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
@@ -4,7 +4,6 @@
 import os
 from typing import Iterable, List, Optional
 
-from datahub.emitter.mce_builder import make_dataset_urn
 from datahub.ingestion.api.common import PipelineContext
 from datahub.ingestion.api.decorators import (
     SupportStatus,
@@ -21,15 +20,12 @@
     TestConnectionReport,
 )
 from datahub.ingestion.api.workunit import MetadataWorkUnit
-from datahub.ingestion.source.bigquery_v2.bigquery_audit import (
-    BigqueryTableIdentifier,
-    BigQueryTableRef,
-)
+from datahub.ingestion.source.bigquery_v2.bigquery_audit import BigqueryTableIdentifier
 from datahub.ingestion.source.bigquery_v2.bigquery_config import BigQueryV2Config
 from datahub.ingestion.source.bigquery_v2.bigquery_report import BigQueryV2Report
 from datahub.ingestion.source.bigquery_v2.bigquery_schema import (
-    BigqueryProject,
     BigQuerySchemaApi,
+    get_projects,
 )
 from datahub.ingestion.source.bigquery_v2.bigquery_schema_gen import (
     BigQuerySchemaGenerator,
@@ -37,8 +33,16 @@
 from datahub.ingestion.source.bigquery_v2.bigquery_test_connection import (
     BigQueryTestConnection,
 )
+from datahub.ingestion.source.bigquery_v2.common import (
+    BigQueryFilter,
+    BigQueryIdentifierBuilder,
+)
 from datahub.ingestion.source.bigquery_v2.lineage import BigqueryLineageExtractor
 from datahub.ingestion.source.bigquery_v2.profiler import BigqueryProfiler
+from datahub.ingestion.source.bigquery_v2.queries_extractor import (
+    BigQueryQueriesExtractor,
+    BigQueryQueriesExtractorConfig,
+)
 from datahub.ingestion.source.bigquery_v2.usage import BigQueryUsageExtractor
 from datahub.ingestion.source.state.profiling_state_handler import ProfilingHandler
 from datahub.ingestion.source.state.redundant_run_skip_handler import (
@@ -51,6 +55,7 @@
 from datahub.ingestion.source.state.stateful_ingestion_base import (
     StatefulIngestionSourceBase,
 )
+from datahub.ingestion.source_report.ingestion_stage import QUERIES_EXTRACTION
 from datahub.sql_parsing.schema_resolver import SchemaResolver
 from datahub.utilities.registries.domain_registry import DomainRegistry
 
@@ -109,12 +114,11 @@ def __init__(self, ctx: PipelineContext, config: BigQueryV2Config):
         BigqueryTableIdentifier._BIGQUERY_DEFAULT_SHARDED_TABLE_REGEX = (
             self.config.sharded_table_pattern
         )
-        if self.config.enable_legacy_sharded_table_support:
-            BigqueryTableIdentifier._BQ_SHARDED_TABLE_SUFFIX = ""
 
         self.bigquery_data_dictionary = BigQuerySchemaApi(
-            self.report.schema_api_perf,
-            self.config.get_bigquery_client(),
+            report=self.report.schema_api_perf,
+            projects_client=config.get_projects_client(),
+            client=config.get_bigquery_client(),
         )
         if self.config.extract_policy_tags_from_catalog:
             self.bigquery_data_dictionary.datacatalog_client = (
@@ -122,6 +126,8 @@ def __init__(self, ctx: PipelineContext, config: BigQueryV2Config):
             )
 
         self.sql_parser_schema_resolver = self._init_schema_resolver()
+        self.filters = BigQueryFilter(self.config, self.report)
+        self.identifiers = BigQueryIdentifierBuilder(self.config, self.report)
 
         redundant_lineage_run_skip_handler: Optional[
             RedundantLineageRunSkipHandler
@@ -138,7 +144,8 @@ def __init__(self, ctx: PipelineContext, config: BigQueryV2Config):
         self.lineage_extractor = BigqueryLineageExtractor(
             config,
             self.report,
-            dataset_urn_builder=self.gen_dataset_urn_from_raw_ref,
+            schema_resolver=self.sql_parser_schema_resolver,
+            identifiers=self.identifiers,
             redundant_run_skip_handler=redundant_lineage_run_skip_handler,
         )
 
@@ -155,7 +162,7 @@ def __init__(self, ctx: PipelineContext, config: BigQueryV2Config):
             config,
             self.report,
             schema_resolver=self.sql_parser_schema_resolver,
-            dataset_urn_builder=self.gen_dataset_urn_from_raw_ref,
+            identifiers=self.identifiers,
             redundant_run_skip_handler=redundant_usage_run_skip_handler,
         )
 
@@ -178,7 +185,7 @@ def __init__(self, ctx: PipelineContext, config: BigQueryV2Config):
             self.domain_registry,
             self.sql_parser_schema_resolver,
             self.profiler,
-            self.gen_dataset_urn,
+            self.identifiers,
         )
 
         self.add_config_to_report()
@@ -195,7 +202,9 @@ def test_connection(config_dict: dict) -> TestConnectionReport:
 
     def _init_schema_resolver(self) -> SchemaResolver:
         schema_resolution_required = (
-            self.config.lineage_parse_view_ddl or self.config.lineage_use_sql_parser
+            self.config.use_queries_v2
+            or self.config.lineage_parse_view_ddl
+            or self.config.lineage_use_sql_parser
         )
         schema_ingestion_enabled = (
             self.config.include_schema_metadata
@@ -231,89 +240,72 @@ def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
         ]
 
     def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
-        projects = self._get_projects()
+        projects = get_projects(
+            self.bq_schema_extractor.schema_api,
+            self.report,
+            self.filters,
+        )
         if not projects:
             return
 
-        if self.config.include_schema_metadata:
-            for project in projects:
-                yield from self.bq_schema_extractor.get_project_workunits(project)
+        for project in projects:
+            yield from self.bq_schema_extractor.get_project_workunits(project)
 
-        if self.config.include_usage_statistics:
-            yield from self.usage_extractor.get_usage_workunits(
-                [p.id for p in projects], self.bq_schema_extractor.table_refs
-            )
+        if self.config.use_queries_v2:
+            # Always ingest View and Snapshot lineage with schema ingestion
+            self.report.set_ingestion_stage("*", "View and Snapshot Lineage")
 
-        if self.config.include_table_lineage:
-            yield from self.lineage_extractor.get_lineage_workunits(
+            yield from self.lineage_extractor.get_lineage_workunits_for_views_and_snapshots(
                 [p.id for p in projects],
-                self.sql_parser_schema_resolver,
                 self.bq_schema_extractor.view_refs_by_project,
                 self.bq_schema_extractor.view_definitions,
                 self.bq_schema_extractor.snapshot_refs_by_project,
                 self.bq_schema_extractor.snapshots_by_ref,
-                self.bq_schema_extractor.table_refs,
             )
 
-    def _get_projects(self) -> List[BigqueryProject]:
-        logger.info("Getting projects")
-        if self.config.project_ids or self.config.project_id:
-            project_ids = self.config.project_ids or [self.config.project_id]  # type: ignore
-            return [
-                BigqueryProject(id=project_id, name=project_id)
-                for project_id in project_ids
-            ]
-        else:
-            return list(self._query_project_list())
-
-    def _query_project_list(self) -> Iterable[BigqueryProject]:
-        try:
-            projects = self.bigquery_data_dictionary.get_projects()
-
+            # if both usage and lineage are disabled then skip queries extractor piece
             if (
-                not projects
-            ):  # Report failure on exception and if empty list is returned
-                self.report.failure(
-                    title="Get projects didn't return any project. ",
-                    message="Maybe resourcemanager.projects.get permission is missing for the service account. "
-                    "You can assign predefined roles/bigquery.metadataViewer role to your service account.",
-                )
-        except Exception as e:
-            self.report.failure(
-                title="Failed to get BigQuery Projects",
-                message="Maybe resourcemanager.projects.get permission is missing for the service account. "
-                "You can assign predefined roles/bigquery.metadataViewer role to your service account.",
-                exc=e,
+                not self.config.include_usage_statistics
+                and not self.config.include_table_lineage
+            ):
+                return
+
+            self.report.set_ingestion_stage("*", QUERIES_EXTRACTION)
+
+            queries_extractor = BigQueryQueriesExtractor(
+                connection=self.config.get_bigquery_client(),
+                schema_api=self.bq_schema_extractor.schema_api,
+                config=BigQueryQueriesExtractorConfig(
+                    window=self.config,
+                    user_email_pattern=self.config.usage.user_email_pattern,
+                    include_lineage=self.config.include_table_lineage,
+                    include_usage_statistics=self.config.include_usage_statistics,
+                    include_operations=self.config.usage.include_operational_stats,
+                    top_n_queries=self.config.usage.top_n_queries,
+                ),
+                structured_report=self.report,
+                filters=self.filters,
+                identifiers=self.identifiers,
+                schema_resolver=self.sql_parser_schema_resolver,
+                discovered_tables=self.bq_schema_extractor.table_refs,
             )
-            projects = []
-
-        for project in projects:
-            if self.config.project_id_pattern.allowed(project.id):
-                yield project
-            else:
-                self.report.report_dropped(project.id)
-
-    def gen_dataset_urn(
-        self, project_id: str, dataset_name: str, table: str, use_raw_name: bool = False
-    ) -> str:
-        datahub_dataset_name = BigqueryTableIdentifier(project_id, dataset_name, table)
-        return make_dataset_urn(
-            self.platform,
-            (
-                str(datahub_dataset_name)
-                if not use_raw_name
-                else datahub_dataset_name.raw_table_name()
-            ),
-            self.config.env,
-        )
+            self.report.queries_extractor = queries_extractor.report
+            yield from queries_extractor.get_workunits_internal()
+        else:
+            if self.config.include_usage_statistics:
+                yield from self.usage_extractor.get_usage_workunits(
+                    [p.id for p in projects], self.bq_schema_extractor.table_refs
+                )
 
-    def gen_dataset_urn_from_raw_ref(self, ref: BigQueryTableRef) -> str:
-        return self.gen_dataset_urn(
-            ref.table_identifier.project_id,
-            ref.table_identifier.dataset,
-            ref.table_identifier.table,
-            use_raw_name=True,
-        )
+            if self.config.include_table_lineage:
+                yield from self.lineage_extractor.get_lineage_workunits(
+                    [p.id for p in projects],
+                    self.bq_schema_extractor.view_refs_by_project,
+                    self.bq_schema_extractor.view_definitions,
+                    self.bq_schema_extractor.snapshot_refs_by_project,
+                    self.bq_schema_extractor.snapshots_by_ref,
+                    self.bq_schema_extractor.table_refs,
+                )
 
     def get_report(self) -> BigQueryV2Report:
         return self.report
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_audit.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_audit.py
index bc00517567bbd4..319c838d2658ad 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_audit.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_audit.py
@@ -7,7 +7,6 @@
 
 from dateutil import parser
 
-from datahub.emitter.mce_builder import make_dataset_urn
 from datahub.utilities.parsing_util import (
     get_first_missing_key,
     get_first_missing_key_any,
@@ -213,13 +212,6 @@ def get_sanitized_table_ref(self) -> "BigQueryTableRef":
             BigqueryTableIdentifier.from_string_name(sanitized_table)
         )
 
-    def to_urn(self, env: str) -> str:
-        return make_dataset_urn(
-            "bigquery",
-            f"{self.table_identifier.project_id}.{self.table_identifier.dataset}.{self.table_identifier.table}",
-            env,
-        )
-
     def __str__(self) -> str:
         return f"projects/{self.table_identifier.project_id}/datasets/{self.table_identifier.dataset}/tables/{self.table_identifier.table}"
 
@@ -294,19 +286,27 @@ def from_entry(
                 job.get("jobName", {}).get("jobId"),
             ),
             project_id=job.get("jobName", {}).get("projectId"),
-            default_dataset=job_query_conf["defaultDataset"]
-            if job_query_conf["defaultDataset"]
-            else None,
-            start_time=parser.parse(job["jobStatistics"]["startTime"])
-            if job["jobStatistics"]["startTime"]
-            else None,
-            end_time=parser.parse(job["jobStatistics"]["endTime"])
-            if job["jobStatistics"]["endTime"]
-            else None,
-            numAffectedRows=int(job["jobStatistics"]["queryOutputRowCount"])
-            if "queryOutputRowCount" in job["jobStatistics"]
-            and job["jobStatistics"]["queryOutputRowCount"]
-            else None,
+            default_dataset=(
+                job_query_conf["defaultDataset"]
+                if job_query_conf["defaultDataset"]
+                else None
+            ),
+            start_time=(
+                parser.parse(job["jobStatistics"]["startTime"])
+                if job["jobStatistics"]["startTime"]
+                else None
+            ),
+            end_time=(
+                parser.parse(job["jobStatistics"]["endTime"])
+                if job["jobStatistics"]["endTime"]
+                else None
+            ),
+            numAffectedRows=(
+                int(job["jobStatistics"]["queryOutputRowCount"])
+                if "queryOutputRowCount" in job["jobStatistics"]
+                and job["jobStatistics"]["queryOutputRowCount"]
+                else None
+            ),
             statementType=job_query_conf.get("statementType", "UNKNOWN"),
         )
         # destinationTable
@@ -376,18 +376,26 @@ def from_exported_bigquery_audit_metadata(
             query=query_config["query"],
             job_name=job["jobName"],
             project_id=QueryEvent._get_project_id_from_job_name(job["jobName"]),
-            default_dataset=query_config["defaultDataset"]
-            if query_config.get("defaultDataset")
-            else None,
-            start_time=parser.parse(job["jobStats"]["startTime"])
-            if job["jobStats"]["startTime"]
-            else None,
-            end_time=parser.parse(job["jobStats"]["endTime"])
-            if job["jobStats"]["endTime"]
-            else None,
-            numAffectedRows=int(query_stats["outputRowCount"])
-            if query_stats.get("outputRowCount")
-            else None,
+            default_dataset=(
+                query_config["defaultDataset"]
+                if query_config.get("defaultDataset")
+                else None
+            ),
+            start_time=(
+                parser.parse(job["jobStats"]["startTime"])
+                if job["jobStats"]["startTime"]
+                else None
+            ),
+            end_time=(
+                parser.parse(job["jobStats"]["endTime"])
+                if job["jobStats"]["endTime"]
+                else None
+            ),
+            numAffectedRows=(
+                int(query_stats["outputRowCount"])
+                if query_stats.get("outputRowCount")
+                else None
+            ),
             statementType=query_config.get("statementType", "UNKNOWN"),
         )
         # jobName
@@ -445,18 +453,26 @@ def from_entry_v2(
             timestamp=row.timestamp,
             actor_email=payload["authenticationInfo"]["principalEmail"],
             query=query_config["query"],
-            default_dataset=query_config["defaultDataset"]
-            if "defaultDataset" in query_config and query_config["defaultDataset"]
-            else None,
-            start_time=parser.parse(job["jobStats"]["startTime"])
-            if job["jobStats"]["startTime"]
-            else None,
-            end_time=parser.parse(job["jobStats"]["endTime"])
-            if job["jobStats"]["endTime"]
-            else None,
-            numAffectedRows=int(query_stats["outputRowCount"])
-            if "outputRowCount" in query_stats and query_stats["outputRowCount"]
-            else None,
+            default_dataset=(
+                query_config["defaultDataset"]
+                if "defaultDataset" in query_config and query_config["defaultDataset"]
+                else None
+            ),
+            start_time=(
+                parser.parse(job["jobStats"]["startTime"])
+                if job["jobStats"]["startTime"]
+                else None
+            ),
+            end_time=(
+                parser.parse(job["jobStats"]["endTime"])
+                if job["jobStats"]["endTime"]
+                else None
+            ),
+            numAffectedRows=(
+                int(query_stats["outputRowCount"])
+                if "outputRowCount" in query_stats and query_stats["outputRowCount"]
+                else None
+            ),
             statementType=query_config.get("statementType", "UNKNOWN"),
         )
         query_event.job_name = job.get("jobName")
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py
index fe961dbd780f6f..2a34fb82c2050c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py
@@ -1,26 +1,33 @@
+import json
 import logging
 import os
+import re
+import tempfile
 from datetime import timedelta
 from typing import Any, Dict, List, Optional, Union
 
-from google.cloud import bigquery, datacatalog_v1
+from google.cloud import bigquery, datacatalog_v1, resourcemanager_v3
 from google.cloud.logging_v2.client import Client as GCPLoggingClient
 from pydantic import Field, PositiveInt, PrivateAttr, root_validator, validator
 
 from datahub.configuration.common import AllowDenyPattern, ConfigModel
+from datahub.configuration.source_common import (
+    EnvConfigMixin,
+    LowerCaseDatasetUrnConfigMixin,
+    PlatformInstanceConfigMixin,
+)
 from datahub.configuration.validate_field_removal import pydantic_removed_field
+from datahub.configuration.validate_multiline_string import pydantic_multiline_string
 from datahub.ingestion.glossary.classification_mixin import (
     ClassificationSourceConfigMixin,
 )
-from datahub.ingestion.source.sql.sql_config import SQLCommonConfig
+from datahub.ingestion.source.sql.sql_config import SQLCommonConfig, SQLFilterConfig
 from datahub.ingestion.source.state.stateful_ingestion_base import (
     StatefulLineageConfigMixin,
     StatefulProfilingConfigMixin,
     StatefulUsageConfigMixin,
 )
 from datahub.ingestion.source.usage.usage_common import BaseUsageConfig
-from datahub.ingestion.source_config.bigquery import BigQueryBaseConfig
-from datahub.ingestion.source_config.usage.bigquery_usage import BigQueryCredential
 
 logger = logging.getLogger(__name__)
 
@@ -28,21 +35,119 @@
     os.getenv("DATAHUB_BIGQUERY_SCHEMA_PARALLELISM", 20)
 )
 
+# Regexp for sharded tables.
+# A sharded table is a table that has a suffix of the form _yyyymmdd or yyyymmdd, where yyyymmdd is a date.
+# The regexp checks for valid dates in the suffix (e.g. 20200101, 20200229, 20201231) and if the date is not valid
+# then it is not a sharded table.
+_BIGQUERY_DEFAULT_SHARDED_TABLE_REGEX: str = (
+    "((.+\\D)[_$]?)?(\\d\\d\\d\\d(?:0[1-9]|1[0-2])(?:0[1-9]|[12][0-9]|3[01]))$"
+)
+
+
+class BigQueryBaseConfig(ConfigModel):
+    rate_limit: bool = Field(
+        default=False, description="Should we rate limit requests made to API."
+    )
+    requests_per_min: int = Field(
+        default=60,
+        description="Used to control number of API calls made per min. Only used when `rate_limit` is set to `True`.",
+    )
+
+    temp_table_dataset_prefix: str = Field(
+        default="_",
+        description="If you are creating temp tables in a dataset with a particular prefix you can use this config to set the prefix for the dataset. This is to support workflows from before bigquery's introduction of temp tables. By default we use `_` because of datasets that begin with an underscore are hidden by default https://cloud.google.com/bigquery/docs/datasets#dataset-naming.",
+    )
+
+    sharded_table_pattern: str = Field(
+        deprecated=True,
+        default=_BIGQUERY_DEFAULT_SHARDED_TABLE_REGEX,
+        description="The regex pattern to match sharded tables and group as one table. This is a very low level config parameter, only change if you know what you are doing, ",
+    )
+
+    @validator("sharded_table_pattern")
+    def sharded_table_pattern_is_a_valid_regexp(cls, v):
+        try:
+            re.compile(v)
+        except Exception as e:
+            raise ValueError(
+                "sharded_table_pattern configuration pattern is invalid."
+            ) from e
+        return v
+
+    @root_validator(pre=True, skip_on_failure=True)
+    def project_id_backward_compatibility_configs_set(cls, values: Dict) -> Dict:
+        project_id = values.pop("project_id", None)
+        project_ids = values.get("project_ids")
+
+        if not project_ids and project_id:
+            values["project_ids"] = [project_id]
+        elif project_ids and project_id:
+            logging.warning(
+                "Please use `project_ids` config. Config `project_id` will be ignored."
+            )
+        return values
+
 
 class BigQueryUsageConfig(BaseUsageConfig):
     _query_log_delay_removed = pydantic_removed_field("query_log_delay")
 
     max_query_duration: timedelta = Field(
         default=timedelta(minutes=15),
-        description="Correction to pad start_time and end_time with. For handling the case where the read happens within our time range but the query completion event is delayed and happens after the configured end time.",
+        description="Correction to pad start_time and end_time with. For handling the case where the read happens "
+        "within our time range but the query completion event is delayed and happens after the configured"
+        " end time.",
     )
 
     apply_view_usage_to_tables: bool = Field(
         default=False,
-        description="Whether to apply view's usage to its base tables. If set to False, uses sql parser and applies usage to views / tables mentioned in the query. If set to True, usage is applied to base tables only.",
+        description="Whether to apply view's usage to its base tables. If set to False, uses sql parser and applies "
+        "usage to views / tables mentioned in the query. If set to True, usage is applied to base tables "
+        "only.",
     )
 
 
+class BigQueryCredential(ConfigModel):
+    project_id: str = Field(description="Project id to set the credentials")
+    private_key_id: str = Field(description="Private key id")
+    private_key: str = Field(
+        description="Private key in a form of '-----BEGIN PRIVATE KEY-----\\nprivate-key\\n-----END PRIVATE KEY-----\\n'"
+    )
+    client_email: str = Field(description="Client email")
+    client_id: str = Field(description="Client Id")
+    auth_uri: str = Field(
+        default="https://accounts.google.com/o/oauth2/auth",
+        description="Authentication uri",
+    )
+    token_uri: str = Field(
+        default="https://oauth2.googleapis.com/token", description="Token uri"
+    )
+    auth_provider_x509_cert_url: str = Field(
+        default="https://www.googleapis.com/oauth2/v1/certs",
+        description="Auth provider x509 certificate url",
+    )
+    type: str = Field(default="service_account", description="Authentication type")
+    client_x509_cert_url: Optional[str] = Field(
+        default=None,
+        description="If not set it will be default to https://www.googleapis.com/robot/v1/metadata/x509/client_email",
+    )
+
+    _fix_private_key_newlines = pydantic_multiline_string("private_key")
+
+    @root_validator(skip_on_failure=True)
+    def validate_config(cls, values: Dict[str, Any]) -> Dict[str, Any]:
+        if values.get("client_x509_cert_url") is None:
+            values[
+                "client_x509_cert_url"
+            ] = f'https://www.googleapis.com/robot/v1/metadata/x509/{values["client_email"]}'
+        return values
+
+    def create_credential_temp_file(self) -> str:
+        with tempfile.NamedTemporaryFile(delete=False) as fp:
+            cred_json = json.dumps(self.dict(), indent=4, separators=(",", ": "))
+            fp.write(cred_json.encode())
+            return fp.name
+
+
 class BigQueryConnectionConfig(ConfigModel):
     credential: Optional[BigQueryCredential] = Field(
         default=None, description="BigQuery credential informations"
@@ -74,6 +179,9 @@ def get_bigquery_client(self) -> bigquery.Client:
         client_options = self.extra_client_options
         return bigquery.Client(self.project_on_behalf, **client_options)
 
+    def get_projects_client(self) -> resourcemanager_v3.ProjectsClient:
+        return resourcemanager_v3.ProjectsClient()
+
     def get_policy_tag_manager_client(self) -> datacatalog_v1.PolicyTagManagerClient:
         return datacatalog_v1.PolicyTagManagerClient()
 
@@ -98,19 +206,139 @@ def get_sql_alchemy_url(self) -> str:
         return "bigquery://"
 
 
+class BigQueryFilterConfig(SQLFilterConfig):
+    project_ids: List[str] = Field(
+        default_factory=list,
+        description=(
+            "Ingests specified project_ids. Use this property if you want to specify what projects to ingest or "
+            "don't want to give project resourcemanager.projects.list to your service account. "
+            "Overrides `project_id_pattern`."
+        ),
+    )
+    project_labels: List[str] = Field(
+        default_factory=list,
+        description=(
+            "Ingests projects with the specified labels. Set value in the format of `key:value`. Use this property to "
+            "define which projects to ingest based"
+            "on project-level labels. If project_ids or project_id is set, this configuration has no effect. The "
+            "ingestion process filters projects by label first, and then applies the project_id_pattern."
+        ),
+    )
+
+    project_id_pattern: AllowDenyPattern = Field(
+        default=AllowDenyPattern.allow_all(),
+        description="Regex patterns for project_id to filter in ingestion.",
+    )
+
+    dataset_pattern: AllowDenyPattern = Field(
+        default=AllowDenyPattern.allow_all(),
+        description="Regex patterns for dataset to filter in ingestion. Specify regex to only match the schema name. "
+        "e.g. to match all tables in schema analytics, use the regex 'analytics'",
+    )
+
+    match_fully_qualified_names: bool = Field(
+        default=True,
+        description="[deprecated] Whether `dataset_pattern` is matched against fully qualified dataset name "
+        "`<project_id>.<dataset_name>`.",
+    )
+
+    table_snapshot_pattern: AllowDenyPattern = Field(
+        default=AllowDenyPattern.allow_all(),
+        description="Regex patterns for table snapshots to filter in ingestion. Specify regex to match the entire "
+        "snapshot name in database.schema.snapshot format. e.g. to match all snapshots starting with "
+        "customer in Customer database and public schema, use the regex 'Customer.public.customer.*'",
+    )
+
+    # NOTE: `schema_pattern` is added here only to hide it from docs.
+    schema_pattern: AllowDenyPattern = Field(
+        default=AllowDenyPattern.allow_all(),
+        hidden_from_docs=True,
+    )
+
+    @root_validator(pre=False, skip_on_failure=True)
+    def backward_compatibility_configs_set(cls, values: Dict) -> Dict:
+        dataset_pattern: Optional[AllowDenyPattern] = values.get("dataset_pattern")
+        schema_pattern = values.get("schema_pattern")
+        if (
+            dataset_pattern == AllowDenyPattern.allow_all()
+            and schema_pattern != AllowDenyPattern.allow_all()
+        ):
+            logging.warning(
+                "dataset_pattern is not set but schema_pattern is set, using schema_pattern as dataset_pattern. "
+                "schema_pattern will be deprecated, please use dataset_pattern instead."
+            )
+            values["dataset_pattern"] = schema_pattern
+            dataset_pattern = schema_pattern
+        elif (
+            dataset_pattern != AllowDenyPattern.allow_all()
+            and schema_pattern != AllowDenyPattern.allow_all()
+        ):
+            logging.warning(
+                "schema_pattern will be ignored in favour of dataset_pattern. schema_pattern will be deprecated,"
+                " please use dataset_pattern only."
+            )
+
+        match_fully_qualified_names = values.get("match_fully_qualified_names")
+
+        if (
+            dataset_pattern is not None
+            and dataset_pattern != AllowDenyPattern.allow_all()
+            and match_fully_qualified_names is not None
+            and not match_fully_qualified_names
+        ):
+            logger.warning(
+                "Please update `dataset_pattern` to match against fully qualified schema name "
+                "`<project_id>.<dataset_name>` and set config `match_fully_qualified_names : True`."
+                "The config option `match_fully_qualified_names` is deprecated and will be "
+                "removed in a future release."
+            )
+        elif match_fully_qualified_names and dataset_pattern is not None:
+            adjusted = False
+            for lst in [dataset_pattern.allow, dataset_pattern.deny]:
+                for i, pattern in enumerate(lst):
+                    if "." not in pattern:
+                        if pattern.startswith("^"):
+                            lst[i] = r"^.*\." + pattern[1:]
+                        else:
+                            lst[i] = r".*\." + pattern
+                        adjusted = True
+            if adjusted:
+                logger.warning(
+                    "`dataset_pattern` was adjusted to match against fully qualified schema names,"
+                    " of the form `<project_id>.<dataset_name>`."
+                )
+
+        return values
+
+
+class BigQueryIdentifierConfig(
+    PlatformInstanceConfigMixin, EnvConfigMixin, LowerCaseDatasetUrnConfigMixin
+):
+    include_data_platform_instance: bool = Field(
+        default=False,
+        description="Whether to create a DataPlatformInstance aspect, equal to the BigQuery project id."
+        " If enabled, will cause redundancy in the browse path for BigQuery entities in the UI,"
+        " because the project id is represented as the top-level container.",
+    )
+
+    enable_legacy_sharded_table_support: bool = Field(
+        default=True,
+        description="Use the legacy sharded table urn suffix added.",
+    )
+
+
 class BigQueryV2Config(
     BigQueryConnectionConfig,
     BigQueryBaseConfig,
+    BigQueryFilterConfig,
+    # BigQueryFilterConfig must come before (higher precedence) the SQLCommon config, so that the documentation overrides are applied.
+    BigQueryIdentifierConfig,
     SQLCommonConfig,
     StatefulUsageConfigMixin,
     StatefulLineageConfigMixin,
     StatefulProfilingConfigMixin,
     ClassificationSourceConfigMixin,
 ):
-    project_id_pattern: AllowDenyPattern = Field(
-        default=AllowDenyPattern.allow_all(),
-        description="Regex patterns for project_id to filter in ingestion.",
-    )
 
     include_schema_metadata: bool = Field(
         default=True,
@@ -141,37 +369,15 @@ class BigQueryV2Config(
         description="Capture BigQuery dataset labels as DataHub tag",
     )
 
-    dataset_pattern: AllowDenyPattern = Field(
-        default=AllowDenyPattern.allow_all(),
-        description="Regex patterns for dataset to filter in ingestion. Specify regex to only match the schema name. e.g. to match all tables in schema analytics, use the regex 'analytics'",
-    )
-
-    match_fully_qualified_names: bool = Field(
-        default=True,
-        description="[deprecated] Whether `dataset_pattern` is matched against fully qualified dataset name `<project_id>.<dataset_name>`.",
-    )
-
     include_external_url: bool = Field(
         default=True,
         description="Whether to populate BigQuery Console url to Datasets/Tables",
     )
 
-    include_data_platform_instance: bool = Field(
-        default=False,
-        description="Whether to create a DataPlatformInstance aspect, equal to the BigQuery project id."
-        " If enabled, will cause redundancy in the browse path for BigQuery entities in the UI,"
-        " because the project id is represented as the top-level container.",
-    )
-
     include_table_snapshots: Optional[bool] = Field(
         default=True, description="Whether table snapshots should be ingested."
     )
 
-    table_snapshot_pattern: AllowDenyPattern = Field(
-        default=AllowDenyPattern.allow_all(),
-        description="Regex patterns for table snapshots to filter in ingestion. Specify regex to match the entire snapshot name in database.schema.snapshot format. e.g. to match all snapshots starting with customer in Customer database and public schema, use the regex 'Customer.public.customer.*'",
-    )
-
     debug_include_full_payloads: bool = Field(
         default=False,
         description="Include full payload into events. It is only for debugging and internal use.",
@@ -180,17 +386,27 @@ class BigQueryV2Config(
     number_of_datasets_process_in_batch: int = Field(
         hidden_from_docs=True,
         default=10000,
-        description="Number of table queried in batch when getting metadata. This is a low level config property which should be touched with care.",
+        description="Number of table queried in batch when getting metadata. This is a low level config property "
+        "which should be touched with care.",
     )
 
     number_of_datasets_process_in_batch_if_profiling_enabled: int = Field(
         default=1000,
-        description="Number of partitioned table queried in batch when getting metadata. This is a low level config property which should be touched with care. This restriction is needed because we query partitions system view which throws error if we try to touch too many tables.",
+        description="Number of partitioned table queried in batch when getting metadata. This is a low level config "
+        "property which should be touched with care. This restriction is needed because we query "
+        "partitions system view which throws error if we try to touch too many tables.",
     )
 
     use_tables_list_query_v2: bool = Field(
         default=False,
-        description="List tables using an improved query that extracts partitions and last modified timestamps more accurately. Requires the ability to read table data. Automatically enabled when profiling is enabled.",
+        description="List tables using an improved query that extracts partitions and last modified timestamps more "
+        "accurately. Requires the ability to read table data. Automatically enabled when profiling is "
+        "enabled.",
+    )
+
+    use_queries_v2: bool = Field(
+        default=False,
+        description="If enabled, uses the new queries extractor to extract queries from bigquery.",
     )
 
     @property
@@ -199,24 +415,11 @@ def have_table_data_read_permission(self) -> bool:
 
     column_limit: int = Field(
         default=300,
-        description="Maximum number of columns to process in a table. This is a low level config property which should be touched with care. This restriction is needed because excessively wide tables can result in failure to ingest the schema.",
-    )
-    # The inheritance hierarchy is wonky here, but these options need modifications.
-    project_id: Optional[str] = Field(
-        default=None,
-        description="[deprecated] Use project_id_pattern or project_ids instead.",
-    )
-    project_ids: List[str] = Field(
-        default_factory=list,
-        description=(
-            "Ingests specified project_ids. Use this property if you want to specify what projects to ingest or "
-            "don't want to give project resourcemanager.projects.list to your service account. "
-            "Overrides `project_id_pattern`."
-        ),
+        description="Maximum number of columns to process in a table. This is a low level config property which "
+        "should be touched with care. This restriction is needed because excessively wide tables can "
+        "result in failure to ingest the schema.",
     )
 
-    storage_project_id: None = Field(default=None, hidden_from_docs=True)
-
     lineage_use_sql_parser: bool = Field(
         default=True,
         description="Use sql parser to resolve view/table lineage.",
@@ -242,11 +445,6 @@ def have_table_data_read_permission(self) -> bool:
         description="This flag enables the data lineage extraction from Data Lineage API exposed by Google Data Catalog. NOTE: This extractor can't build views lineage. It's recommended to enable the view's DDL parsing. Read the docs to have more information about: https://cloud.google.com/data-catalog/docs/concepts/about-data-lineage",
     )
 
-    enable_legacy_sharded_table_support: bool = Field(
-        default=True,
-        description="Use the legacy sharded table urn suffix added.",
-    )
-
     extract_policy_tags_from_catalog: bool = Field(
         default=False,
         description=(
@@ -269,6 +467,7 @@ def have_table_data_read_permission(self) -> bool:
         default=True,
         description="Option to enable/disable lineage generation. Is enabled by default.",
     )
+
     max_query_duration: timedelta = Field(
         default=timedelta(minutes=15),
         description="Correction to pad start_time and end_time with. For handling the case where the read happens within our time range but the query completion event is delayed and happens after the configured end time.",
@@ -323,6 +522,30 @@ def have_table_data_read_permission(self) -> bool:
         " Set to 1 to disable.",
     )
 
+    # include_view_lineage and include_view_column_lineage are inherited from SQLCommonConfig
+    # but not used in bigquery so we hide them from docs.
+    include_view_lineage: bool = Field(default=True, hidden_from_docs=True)
+
+    include_view_column_lineage: bool = Field(default=True, hidden_from_docs=True)
+
+    @root_validator(pre=True)
+    def set_include_schema_metadata(cls, values: Dict) -> Dict:
+        # Historically this is used to disable schema ingestion
+        if (
+            "include_tables" in values
+            and "include_views" in values
+            and not values["include_tables"]
+            and not values["include_views"]
+        ):
+            values["include_schema_metadata"] = False
+            values["include_table_snapshots"] = False
+            logger.info(
+                "include_tables and include_views are both set to False."
+                " Disabling schema metadata ingestion for tables, views, and snapshots."
+            )
+
+        return values
+
     @root_validator(skip_on_failure=True)
     def profile_default_settings(cls, values: Dict) -> Dict:
         # Extra default SQLAlchemy option for better connection pooling and threading.
@@ -342,70 +565,6 @@ def validate_bigquery_audit_metadata_datasets(
 
         return v
 
-    @root_validator(pre=False, skip_on_failure=True)
-    def backward_compatibility_configs_set(cls, values: Dict) -> Dict:
-        project_id = values.get("project_id")
-        project_id_pattern = values.get("project_id_pattern")
-
-        if project_id_pattern == AllowDenyPattern.allow_all() and project_id:
-            logging.warning(
-                "project_id_pattern is not set but project_id is set, source will only ingest the project_id project. project_id will be deprecated, please use project_id_pattern instead."
-            )
-            values["project_id_pattern"] = AllowDenyPattern(allow=[f"^{project_id}$"])
-        elif project_id_pattern != AllowDenyPattern.allow_all() and project_id:
-            logging.warning(
-                "use project_id_pattern whenever possible. project_id will be deprecated, please use project_id_pattern only if possible."
-            )
-
-        dataset_pattern: Optional[AllowDenyPattern] = values.get("dataset_pattern")
-        schema_pattern = values.get("schema_pattern")
-        if (
-            dataset_pattern == AllowDenyPattern.allow_all()
-            and schema_pattern != AllowDenyPattern.allow_all()
-        ):
-            logging.warning(
-                "dataset_pattern is not set but schema_pattern is set, using schema_pattern as dataset_pattern. schema_pattern will be deprecated, please use dataset_pattern instead."
-            )
-            values["dataset_pattern"] = schema_pattern
-            dataset_pattern = schema_pattern
-        elif (
-            dataset_pattern != AllowDenyPattern.allow_all()
-            and schema_pattern != AllowDenyPattern.allow_all()
-        ):
-            logging.warning(
-                "schema_pattern will be ignored in favour of dataset_pattern. schema_pattern will be deprecated, please use dataset_pattern only."
-            )
-
-        match_fully_qualified_names = values.get("match_fully_qualified_names")
-
-        if (
-            dataset_pattern is not None
-            and dataset_pattern != AllowDenyPattern.allow_all()
-            and match_fully_qualified_names is not None
-            and not match_fully_qualified_names
-        ):
-            logger.warning(
-                "Please update `dataset_pattern` to match against fully qualified schema name `<project_id>.<dataset_name>` and set config `match_fully_qualified_names : True`."
-                "The config option `match_fully_qualified_names` is deprecated and will be removed in a future release."
-            )
-        elif match_fully_qualified_names and dataset_pattern is not None:
-            adjusted = False
-            for lst in [dataset_pattern.allow, dataset_pattern.deny]:
-                for i, pattern in enumerate(lst):
-                    if "." not in pattern:
-                        if pattern.startswith("^"):
-                            lst[i] = r"^.*\." + pattern[1:]
-                        else:
-                            lst[i] = r".*\." + pattern
-                        adjusted = True
-            if adjusted:
-                logger.warning(
-                    "`dataset_pattern` was adjusted to match against fully qualified schema names,"
-                    " of the form `<project_id>.<dataset_name>`."
-                )
-
-        return values
-
     def get_table_pattern(self, pattern: List[str]) -> str:
         return "|".join(pattern) if pattern else ""
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_queries.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_queries.py
new file mode 100644
index 00000000000000..ed27aae19ce963
--- /dev/null
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_queries.py
@@ -0,0 +1,90 @@
+import logging
+from dataclasses import dataclass, field
+from typing import Iterable, Optional
+
+from pydantic import Field
+from typing_extensions import Self
+
+from datahub.configuration.time_window_config import BaseTimeWindowConfig
+from datahub.ingestion.api.common import PipelineContext
+from datahub.ingestion.api.source import Source, SourceReport
+from datahub.ingestion.api.workunit import MetadataWorkUnit
+from datahub.ingestion.source.bigquery_v2.bigquery_config import (
+    BigQueryConnectionConfig,
+    BigQueryFilterConfig,
+    BigQueryIdentifierConfig,
+)
+from datahub.ingestion.source.bigquery_v2.bigquery_report import (
+    BigQueryQueriesExtractorReport,
+    BigQuerySchemaApiPerfReport,
+)
+from datahub.ingestion.source.bigquery_v2.bigquery_schema import BigQuerySchemaApi
+from datahub.ingestion.source.bigquery_v2.common import (
+    BigQueryFilter,
+    BigQueryIdentifierBuilder,
+)
+from datahub.ingestion.source.bigquery_v2.queries_extractor import (
+    BigQueryQueriesExtractor,
+    BigQueryQueriesExtractorConfig,
+)
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass
+class BigQueryQueriesSourceReport(SourceReport):
+    window: Optional[BaseTimeWindowConfig] = None
+    queries_extractor: Optional[BigQueryQueriesExtractorReport] = None
+    schema_api_perf: BigQuerySchemaApiPerfReport = field(
+        default_factory=BigQuerySchemaApiPerfReport
+    )
+
+
+class BigQueryQueriesSourceConfig(
+    BigQueryQueriesExtractorConfig, BigQueryFilterConfig, BigQueryIdentifierConfig
+):
+    connection: BigQueryConnectionConfig = Field(
+        default_factory=BigQueryConnectionConfig
+    )
+
+
+class BigQueryQueriesSource(Source):
+    def __init__(self, ctx: PipelineContext, config: BigQueryQueriesSourceConfig):
+        self.ctx = ctx
+        self.config = config
+        self.report = BigQueryQueriesSourceReport()
+
+        self.filters = BigQueryFilter(self.config, self.report)
+        self.identifiers = BigQueryIdentifierBuilder(self.config, self.report)
+
+        self.connection = self.config.connection.get_bigquery_client()
+
+        self.queries_extractor = BigQueryQueriesExtractor(
+            connection=self.connection,
+            schema_api=BigQuerySchemaApi(
+                self.report.schema_api_perf,
+                self.connection,
+                projects_client=self.config.connection.get_projects_client(),
+            ),
+            config=self.config,
+            structured_report=self.report,
+            filters=self.filters,
+            identifiers=self.identifiers,
+            graph=self.ctx.graph,
+        )
+        self.report.queries_extractor = self.queries_extractor.report
+
+    @classmethod
+    def create(cls, config_dict: dict, ctx: PipelineContext) -> Self:
+        config = BigQueryQueriesSourceConfig.parse_obj(config_dict)
+        return cls(ctx, config)
+
+    def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
+        self.report.window = self.config.window
+
+        # TODO: Disable auto status processor?
+        # TODO: Don't emit lineage, usage, operations  for ghost entities
+        return self.queries_extractor.get_workunits_internal()
+
+    def get_report(self) -> BigQueryQueriesSourceReport:
+        return self.report
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_report.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_report.py
index 4cfcc3922ddc3d..b333bcf695a464 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_report.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_report.py
@@ -11,6 +11,7 @@
 from datahub.ingestion.source.sql.sql_generic_profiler import ProfilingSqlReport
 from datahub.ingestion.source_report.ingestion_stage import IngestionStageReport
 from datahub.ingestion.source_report.time_window import BaseTimeWindowReport
+from datahub.sql_parsing.sql_parsing_aggregator import SqlAggregatorReport
 from datahub.utilities.lossy_collections import LossyDict, LossyList
 from datahub.utilities.perf_timer import PerfTimer
 from datahub.utilities.stats_collections import TopKDict, int_top_k_dict
@@ -30,8 +31,9 @@ class BigQuerySchemaApiPerfReport(Report):
     num_get_views_for_dataset_api_requests: int = 0
     num_get_snapshots_for_dataset_api_requests: int = 0
 
-    list_projects: PerfTimer = field(default_factory=PerfTimer)
-    list_datasets: PerfTimer = field(default_factory=PerfTimer)
+    list_projects_timer: PerfTimer = field(default_factory=PerfTimer)
+    list_projects_with_labels_timer: PerfTimer = field(default_factory=PerfTimer)
+    list_datasets_timer: PerfTimer = field(default_factory=PerfTimer)
 
     get_columns_for_dataset_sec: float = 0
     get_tables_for_dataset_sec: float = 0
@@ -56,6 +58,18 @@ class BigQueryProcessingPerfReport(Report):
     usage_state_size: Optional[str] = None
 
 
+@dataclass
+class BigQueryQueriesExtractorReport(Report):
+    query_log_fetch_timer: PerfTimer = field(default_factory=PerfTimer)
+    audit_log_preprocessing_timer: PerfTimer = field(default_factory=PerfTimer)
+    audit_log_load_timer: PerfTimer = field(default_factory=PerfTimer)
+    sql_aggregator: Optional[SqlAggregatorReport] = None
+    num_queries_by_project: TopKDict[str, int] = field(default_factory=int_top_k_dict)
+
+    num_total_queries: int = 0
+    num_unique_queries: int = 0
+
+
 @dataclass
 class BigQueryV2Report(
     ProfilingSqlReport,
@@ -141,10 +155,8 @@ class BigQueryV2Report(
 
     snapshots_scanned: int = 0
 
-    num_view_definitions_parsed: int = 0
-    num_view_definitions_failed_parsing: int = 0
-    num_view_definitions_failed_column_parsing: int = 0
-    view_definitions_parsing_failures: LossyList[str] = field(default_factory=LossyList)
+    # view lineage
+    sql_aggregator: Optional[SqlAggregatorReport] = None
 
     read_reasons_stat: Counter[str] = field(default_factory=collections.Counter)
     operation_types_stat: Counter[str] = field(default_factory=collections.Counter)
@@ -169,5 +181,7 @@ class BigQueryV2Report(
     usage_end_time: Optional[datetime] = None
     stateful_usage_ingestion_enabled: bool = False
 
+    queries_extractor: Optional[BigQueryQueriesExtractorReport] = None
+
     def set_ingestion_stage(self, project_id: str, stage: str) -> None:
         self.report_ingestion_stage_start(f"{project_id}: {stage}")
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema.py
index d73ac46c862ea1..7c1abe2ce35691 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema.py
@@ -2,10 +2,12 @@
 from collections import defaultdict
 from dataclasses import dataclass, field
 from datetime import datetime, timezone
-from typing import Any, Dict, Iterable, Iterator, List, Optional
+from functools import lru_cache
+from typing import Any, Dict, FrozenSet, Iterable, Iterator, List, Optional
 
 from google.api_core import retry
-from google.cloud import bigquery, datacatalog_v1
+from google.cloud import bigquery, datacatalog_v1, resourcemanager_v3
+from google.cloud.bigquery import retry as bq_retry
 from google.cloud.bigquery.table import (
     RowIterator,
     TableListItem,
@@ -13,12 +15,14 @@
     TimePartitioningType,
 )
 
+from datahub.ingestion.api.source import SourceReport
 from datahub.ingestion.source.bigquery_v2.bigquery_audit import BigqueryTableIdentifier
 from datahub.ingestion.source.bigquery_v2.bigquery_helper import parse_labels
 from datahub.ingestion.source.bigquery_v2.bigquery_report import (
     BigQuerySchemaApiPerfReport,
     BigQueryV2Report,
 )
+from datahub.ingestion.source.bigquery_v2.common import BigQueryFilter
 from datahub.ingestion.source.bigquery_v2.queries import (
     BigqueryQuery,
     BigqueryTableType,
@@ -144,17 +148,35 @@ def __init__(
         self,
         report: BigQuerySchemaApiPerfReport,
         client: bigquery.Client,
+        projects_client: resourcemanager_v3.ProjectsClient,
         datacatalog_client: Optional[datacatalog_v1.PolicyTagManagerClient] = None,
     ) -> None:
         self.bq_client = client
+        self.projects_client = projects_client
         self.report = report
         self.datacatalog_client = datacatalog_client
 
     def get_query_result(self, query: str) -> RowIterator:
+        def _should_retry(exc: BaseException) -> bool:
+            logger.debug(f"Exception occured for job query. Reason: {exc}")
+            # Jobs sometimes fail with transient errors.
+            # This is not currently handled by the python-bigquery client.
+            # https://github.com/googleapis/python-bigquery/issues/23
+            return "Retrying the job may solve the problem" in str(exc)
+
         logger.debug(f"Query : {query}")
-        resp = self.bq_client.query(query)
+        resp = self.bq_client.query(
+            query,
+            job_retry=retry.Retry(
+                predicate=lambda exc: (
+                    bq_retry.DEFAULT_JOB_RETRY._predicate(exc) or _should_retry(exc)
+                ),
+                deadline=bq_retry.DEFAULT_JOB_RETRY._deadline,
+            ),
+        )
         return resp.result()
 
+    @lru_cache(maxsize=1)
     def get_projects(self, max_results_per_page: int = 100) -> List[BigqueryProject]:
         def _should_retry(exc: BaseException) -> bool:
             logger.debug(
@@ -165,7 +187,7 @@ def _should_retry(exc: BaseException) -> bool:
 
         page_token = None
         projects: List[BigqueryProject] = []
-        with self.report.list_projects:
+        with self.report.list_projects_timer:
             while True:
                 try:
                     self.report.num_list_projects_api_requests += 1
@@ -175,7 +197,7 @@ def _should_retry(exc: BaseException) -> bool:
                     # 'Quota exceeded: Your user exceeded quota for concurrent project.lists requests.'
                     # Hence, added the api request retry of 15 min.
                     # We already tried adding rate_limit externally, proving max_result and page_size
-                    # to restrict the request calls inside list_project but issue still occured.
+                    # to restrict the request calls inside list_project but issue still occurred.
                     projects_iterator = self.bq_client.list_projects(
                         max_results=max_results_per_page,
                         page_token=page_token,
@@ -202,10 +224,31 @@ def _should_retry(exc: BaseException) -> bool:
                     return []
         return projects
 
+    @lru_cache(maxsize=1)
+    def get_projects_with_labels(self, labels: FrozenSet[str]) -> List[BigqueryProject]:
+        with self.report.list_projects_with_labels_timer:
+            try:
+                projects = []
+                labels_query = " OR ".join([f"labels.{label}" for label in labels])
+                for project in self.projects_client.search_projects(query=labels_query):
+                    projects.append(
+                        BigqueryProject(
+                            id=project.project_id, name=project.display_name
+                        )
+                    )
+
+                return projects
+
+            except Exception as e:
+                logger.error(
+                    f"Error getting projects with labels: {labels}. {e}", exc_info=True
+                )
+                return []
+
     def get_datasets_for_project_id(
         self, project_id: str, maxResults: Optional[int] = None
     ) -> List[BigqueryDataset]:
-        with self.report.list_datasets:
+        with self.report.list_datasets_timer:
             self.report.num_list_datasets_api_requests += 1
             datasets = self.bq_client.list_datasets(project_id, max_results=maxResults)
             return [
@@ -579,3 +622,78 @@ def _make_bigquery_table_snapshot(snapshot: bigquery.Row) -> BigqueryTableSnapsh
                 table=snapshot.base_table_name,
             ),
         )
+
+
+def query_project_list(
+    schema_api: BigQuerySchemaApi,
+    report: SourceReport,
+    filters: BigQueryFilter,
+) -> Iterable[BigqueryProject]:
+    try:
+        projects = schema_api.get_projects()
+
+        if not projects:  # Report failure on exception and if empty list is returned
+            report.failure(
+                title="Get projects didn't return any project. ",
+                message="Maybe resourcemanager.projects.get permission is missing for the service account. "
+                "You can assign predefined roles/bigquery.metadataViewer role to your service account.",
+            )
+    except Exception as e:
+        report.failure(
+            title="Failed to get BigQuery Projects",
+            message="Maybe resourcemanager.projects.get permission is missing for the service account. "
+            "You can assign predefined roles/bigquery.metadataViewer role to your service account.",
+            exc=e,
+        )
+        projects = []
+
+    for project in projects:
+        if filters.filter_config.project_id_pattern.allowed(project.id):
+            yield project
+        else:
+            logger.debug(
+                f"Ignoring project {project.id} as it's not allowed by project_id_pattern"
+            )
+
+
+def get_projects(
+    schema_api: BigQuerySchemaApi,
+    report: SourceReport,
+    filters: BigQueryFilter,
+) -> List[BigqueryProject]:
+    logger.info("Getting projects")
+    if filters.filter_config.project_ids:
+        return [
+            BigqueryProject(id=project_id, name=project_id)
+            for project_id in filters.filter_config.project_ids
+        ]
+    elif filters.filter_config.project_labels:
+        return list(query_project_list_from_labels(schema_api, report, filters))
+    else:
+        return list(query_project_list(schema_api, report, filters))
+
+
+def query_project_list_from_labels(
+    schema_api: BigQuerySchemaApi,
+    report: SourceReport,
+    filters: BigQueryFilter,
+) -> Iterable[BigqueryProject]:
+    projects = schema_api.get_projects_with_labels(
+        frozenset(filters.filter_config.project_labels)
+    )
+
+    if not projects:  # Report failure on exception and if empty list is returned
+        report.report_failure(
+            "metadata-extraction",
+            "Get projects didn't return any project with any of the specified label(s). "
+            "Maybe resourcemanager.projects.list permission is missing for the service account. "
+            "You can assign predefined roles/bigquery.metadataViewer role to your service account.",
+        )
+
+    for project in projects:
+        if filters.filter_config.project_id_pattern.allowed(project.id):
+            yield project
+        else:
+            logger.debug(
+                f"Ignoring project {project.id} as it's not allowed by project_id_pattern"
+            )
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py
index 46ec75edb9734b..29228565d08865 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py
@@ -1,16 +1,12 @@
 import logging
 import re
 from collections import defaultdict
-from typing import Callable, Dict, Iterable, List, Optional, Set, Type, Union, cast
+from typing import Dict, Iterable, List, Optional, Set, Type, Union, cast
 
 from google.cloud.bigquery.table import TableListItem
 
 from datahub.configuration.pattern_utils import is_schema_allowed, is_tag_allowed
-from datahub.emitter.mce_builder import (
-    make_data_platform_urn,
-    make_dataplatform_instance_urn,
-    make_tag_urn,
-)
+from datahub.emitter.mce_builder import make_tag_urn
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.emitter.mcp_builder import BigQueryDatasetKey, ContainerKey, ProjectIdKey
 from datahub.ingestion.api.workunit import MetadataWorkUnit
@@ -41,6 +37,7 @@
 from datahub.ingestion.source.bigquery_v2.common import (
     BQ_EXTERNAL_DATASET_URL_TEMPLATE,
     BQ_EXTERNAL_TABLE_URL_TEMPLATE,
+    BigQueryIdentifierBuilder,
 )
 from datahub.ingestion.source.bigquery_v2.profiler import BigqueryProfiler
 from datahub.ingestion.source.common.subtypes import (
@@ -160,16 +157,15 @@ def __init__(
         domain_registry: Optional[DomainRegistry],
         sql_parser_schema_resolver: SchemaResolver,
         profiler: BigqueryProfiler,
-        dataset_urn_builder: Callable[[str, str, str], str],
+        identifiers: BigQueryIdentifierBuilder,
     ):
         self.config = config
         self.report = report
-        self.bigquery_data_dictionary = bigquery_data_dictionary
+        self.schema_api = bigquery_data_dictionary
         self.domain_registry = domain_registry
         self.sql_parser_schema_resolver = sql_parser_schema_resolver
         self.profiler = profiler
-        self.gen_dataset_urn = dataset_urn_builder
-        self.platform: str = "bigquery"
+        self.identifiers = identifiers
 
         self.classification_handler = ClassificationHandler(self.config, self.report)
         self.data_reader: Optional[BigQueryDataReader] = None
@@ -192,7 +188,11 @@ def __init__(
 
     @property
     def store_table_refs(self):
-        return self.config.include_table_lineage or self.config.include_usage_statistics
+        return (
+            self.config.include_table_lineage
+            or self.config.include_usage_statistics
+            or self.config.use_queries_v2
+        )
 
     def get_project_workunits(
         self, project: BigqueryProject
@@ -205,12 +205,8 @@ def get_dataplatform_instance_aspect(
         self, dataset_urn: str, project_id: str
     ) -> MetadataWorkUnit:
         aspect = DataPlatformInstanceClass(
-            platform=make_data_platform_urn(self.platform),
-            instance=(
-                make_dataplatform_instance_urn(self.platform, project_id)
-                if self.config.include_data_platform_instance
-                else None
-            ),
+            platform=self.identifiers.make_data_platform_urn(),
+            instance=self.identifiers.make_dataplatform_instance_urn(project_id),
         )
         return MetadataChangeProposalWrapper(
             entityUrn=dataset_urn, aspect=aspect
@@ -220,7 +216,7 @@ def gen_dataset_key(self, db_name: str, schema: str) -> ContainerKey:
         return BigQueryDatasetKey(
             project_id=db_name,
             dataset_id=schema,
-            platform=self.platform,
+            platform=self.identifiers.platform,
             env=self.config.env,
             backcompat_env_as_instance=True,
         )
@@ -228,7 +224,7 @@ def gen_dataset_key(self, db_name: str, schema: str) -> ContainerKey:
     def gen_project_id_key(self, database: str) -> ContainerKey:
         return ProjectIdKey(
             project_id=database,
-            platform=self.platform,
+            platform=self.identifiers.platform,
             env=self.config.env,
             backcompat_env_as_instance=True,
         )
@@ -285,14 +281,12 @@ def _process_project(
 
         project_id = bigquery_project.id
         try:
-            bigquery_project.datasets = (
-                self.bigquery_data_dictionary.get_datasets_for_project_id(project_id)
+            bigquery_project.datasets = self.schema_api.get_datasets_for_project_id(
+                project_id
             )
         except Exception as e:
 
-            if (
-                self.config.project_id or self.config.project_ids
-            ) and "not enabled BigQuery." in str(e):
+            if self.config.project_ids and "not enabled BigQuery." in str(e):
                 action_mesage = (
                     "The project has not enabled BigQuery API. "
                     "Did you mistype project id in recipe ?"
@@ -322,7 +316,8 @@ def _process_project(
                     f"Excluded project '{project_id}' since no datasets were found. {action_message}"
                 )
             else:
-                yield from self.gen_project_id_containers(project_id)
+                if self.config.include_schema_metadata:
+                    yield from self.gen_project_id_containers(project_id)
                 self.report.warning(
                     title="No datasets found in project",
                     message=action_message,
@@ -330,7 +325,8 @@ def _process_project(
                 )
             return
 
-        yield from self.gen_project_id_containers(project_id)
+        if self.config.include_schema_metadata:
+            yield from self.gen_project_id_containers(project_id)
 
         self.report.num_project_datasets_to_scan[project_id] = len(
             bigquery_project.datasets
@@ -402,9 +398,10 @@ def _process_schema(
     ) -> Iterable[MetadataWorkUnit]:
         dataset_name = bigquery_dataset.name
 
-        yield from self.gen_dataset_containers(
-            dataset_name, project_id, bigquery_dataset.labels
-        )
+        if self.config.include_schema_metadata:
+            yield from self.gen_dataset_containers(
+                dataset_name, project_id, bigquery_dataset.labels
+            )
 
         columns = None
 
@@ -414,12 +411,8 @@ def _process_schema(
                 max_calls=self.config.requests_per_min, period=60
             )
 
-        if (
-            self.config.include_tables
-            or self.config.include_views
-            or self.config.include_table_snapshots
-        ):
-            columns = self.bigquery_data_dictionary.get_columns_for_dataset(
+        if self.config.include_schema_metadata:
+            columns = self.schema_api.get_columns_for_dataset(
                 project_id=project_id,
                 dataset_name=dataset_name,
                 column_limit=self.config.column_limit,
@@ -428,6 +421,27 @@ def _process_schema(
                 report=self.report,
                 rate_limiter=rate_limiter,
             )
+        elif self.store_table_refs:
+            # Need table_refs to calculate lineage and usage
+            for table_item in self.schema_api.list_tables(dataset_name, project_id):
+                identifier = BigqueryTableIdentifier(
+                    project_id=project_id,
+                    dataset=dataset_name,
+                    table=table_item.table_id,
+                )
+                if not self.config.table_pattern.allowed(identifier.raw_table_name()):
+                    self.report.report_dropped(identifier.raw_table_name())
+                    continue
+                try:
+                    self.table_refs.add(
+                        str(BigQueryTableRef(identifier).get_sanitized_table_ref())
+                    )
+                except Exception as e:
+                    logger.warning(
+                        f"Could not create table ref for {table_item.path}: {e}"
+                    )
+            yield from []
+            return
 
         if self.config.include_tables:
             db_tables[dataset_name] = list(
@@ -457,31 +471,10 @@ def _process_schema(
                         )
                     ),
                 )
-        elif self.store_table_refs:
-            # Need table_refs to calculate lineage and usage
-            for table_item in self.bigquery_data_dictionary.list_tables(
-                dataset_name, project_id
-            ):
-                identifier = BigqueryTableIdentifier(
-                    project_id=project_id,
-                    dataset=dataset_name,
-                    table=table_item.table_id,
-                )
-                if not self.config.table_pattern.allowed(identifier.raw_table_name()):
-                    self.report.report_dropped(identifier.raw_table_name())
-                    continue
-                try:
-                    self.table_refs.add(
-                        str(BigQueryTableRef(identifier).get_sanitized_table_ref())
-                    )
-                except Exception as e:
-                    logger.warning(
-                        f"Could not create table ref for {table_item.path}: {e}"
-                    )
 
         if self.config.include_views:
             db_views[dataset_name] = list(
-                self.bigquery_data_dictionary.get_views_for_dataset(
+                self.schema_api.get_views_for_dataset(
                     project_id,
                     dataset_name,
                     self.config.is_profiling_enabled(),
@@ -500,7 +493,7 @@ def _process_schema(
 
         if self.config.include_table_snapshots:
             db_snapshots[dataset_name] = list(
-                self.bigquery_data_dictionary.get_snapshots_for_dataset(
+                self.schema_api.get_snapshots_for_dataset(
                     project_id,
                     dataset_name,
                     self.config.is_profiling_enabled(),
@@ -747,7 +740,9 @@ def gen_view_dataset_workunits(
             viewLogic=view_definition_string or "",
         )
         yield MetadataChangeProposalWrapper(
-            entityUrn=self.gen_dataset_urn(project_id, dataset_name, table.name),
+            entityUrn=self.identifiers.gen_dataset_urn(
+                project_id, dataset_name, table.name
+            ),
             aspect=view_properties_aspect,
         ).as_workunit()
 
@@ -786,7 +781,9 @@ def gen_dataset_workunits(
         tags_to_add: Optional[List[str]] = None,
         custom_properties: Optional[Dict[str, str]] = None,
     ) -> Iterable[MetadataWorkUnit]:
-        dataset_urn = self.gen_dataset_urn(project_id, dataset_name, table.name)
+        dataset_urn = self.identifiers.gen_dataset_urn(
+            project_id, dataset_name, table.name
+        )
 
         status = Status(removed=False)
         yield MetadataChangeProposalWrapper(
@@ -954,7 +951,7 @@ def gen_schema_metadata(
     ) -> MetadataWorkUnit:
         schema_metadata = SchemaMetadata(
             schemaName=str(dataset_name),
-            platform=make_data_platform_urn(self.platform),
+            platform=self.identifiers.make_data_platform_urn(),
             version=0,
             hash="",
             platformSchema=MySqlDDL(tableSchema=""),
@@ -985,7 +982,7 @@ def get_tables_for_dataset(
             # https://cloud.google.com/bigquery/docs/information-schema-partitions
             max_batch_size: int = (
                 self.config.number_of_datasets_process_in_batch
-                if not self.config.is_profiling_enabled()
+                if not self.config.have_table_data_read_permission
                 else self.config.number_of_datasets_process_in_batch_if_profiling_enabled
             )
 
@@ -999,7 +996,7 @@ def get_tables_for_dataset(
             for table_item in table_items:
                 items_to_get[table_item] = table_items[table_item]
                 if len(items_to_get) % max_batch_size == 0:
-                    yield from self.bigquery_data_dictionary.get_tables_for_dataset(
+                    yield from self.schema_api.get_tables_for_dataset(
                         project_id,
                         dataset_name,
                         items_to_get,
@@ -1009,7 +1006,7 @@ def get_tables_for_dataset(
                     items_to_get.clear()
 
             if items_to_get:
-                yield from self.bigquery_data_dictionary.get_tables_for_dataset(
+                yield from self.schema_api.get_tables_for_dataset(
                     project_id,
                     dataset_name,
                     items_to_get,
@@ -1028,9 +1025,7 @@ def get_core_table_details(
         # Dict to store sharded table and the last seen max shard id
         sharded_tables: Dict[str, TableListItem] = {}
 
-        for table in self.bigquery_data_dictionary.list_tables(
-            dataset_name, project_id
-        ):
+        for table in self.schema_api.list_tables(dataset_name, project_id):
             table_identifier = BigqueryTableIdentifier(
                 project_id=project_id,
                 dataset=dataset_name,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_test_connection.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_test_connection.py
index 3aac78c154b2ee..27beb7b0254c41 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_test_connection.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_test_connection.py
@@ -12,6 +12,7 @@
 from datahub.ingestion.source.bigquery_v2.bigquery_config import BigQueryV2Config
 from datahub.ingestion.source.bigquery_v2.bigquery_report import BigQueryV2Report
 from datahub.ingestion.source.bigquery_v2.bigquery_schema import BigQuerySchemaApi
+from datahub.ingestion.source.bigquery_v2.common import BigQueryIdentifierBuilder
 from datahub.ingestion.source.bigquery_v2.lineage import BigqueryLineageExtractor
 from datahub.ingestion.source.bigquery_v2.usage import BigQueryUsageExtractor
 from datahub.sql_parsing.schema_resolver import SchemaResolver
@@ -96,7 +97,9 @@ def metadata_read_capability_test(
                 client: bigquery.Client = config.get_bigquery_client()
                 assert client
                 bigquery_data_dictionary = BigQuerySchemaApi(
-                    BigQueryV2Report().schema_api_perf, client
+                    report=BigQueryV2Report().schema_api_perf,
+                    projects_client=config.get_projects_client(),
+                    client=client,
                 )
                 result = bigquery_data_dictionary.get_datasets_for_project_id(
                     project_id, 10
@@ -134,7 +137,10 @@ def lineage_capability_test(
         report: BigQueryV2Report,
     ) -> CapabilityReport:
         lineage_extractor = BigqueryLineageExtractor(
-            connection_conf, report, lambda ref: ""
+            connection_conf,
+            report,
+            schema_resolver=SchemaResolver(platform="bigquery"),
+            identifiers=BigQueryIdentifierBuilder(connection_conf, report),
         )
         for project_id in project_ids:
             try:
@@ -158,7 +164,7 @@ def usage_capability_test(
             connection_conf,
             report,
             schema_resolver=SchemaResolver(platform="bigquery"),
-            dataset_urn_builder=lambda ref: "",
+            identifiers=BigQueryIdentifierBuilder(connection_conf, report),
         )
         for project_id in project_ids:
             try:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/common.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/common.py
index e38ab07855b8be..5d2358fb8d05ea 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/common.py
@@ -1,5 +1,103 @@
+from typing import Optional
+
+from datahub.configuration.common import AllowDenyPattern
+from datahub.configuration.pattern_utils import is_schema_allowed
+from datahub.emitter.mce_builder import (
+    make_data_platform_urn,
+    make_dataplatform_instance_urn,
+    make_dataset_urn,
+    make_user_urn,
+)
+from datahub.ingestion.api.source import SourceReport
+from datahub.ingestion.source.bigquery_v2.bigquery_audit import (
+    BigqueryTableIdentifier,
+    BigQueryTableRef,
+)
+from datahub.ingestion.source.bigquery_v2.bigquery_config import (
+    BigQueryFilterConfig,
+    BigQueryIdentifierConfig,
+)
+
 BQ_DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
 BQ_DATE_SHARD_FORMAT = "%Y%m%d"
 
 BQ_EXTERNAL_TABLE_URL_TEMPLATE = "https://console.cloud.google.com/bigquery?project={project}&ws=!1m5!1m4!4m3!1s{project}!2s{dataset}!3s{table}"
 BQ_EXTERNAL_DATASET_URL_TEMPLATE = "https://console.cloud.google.com/bigquery?project={project}&ws=!1m4!1m3!3m2!1s{project}!2s{dataset}"
+
+BQ_SYSTEM_TABLES_PATTERN = [r".*\.INFORMATION_SCHEMA\..*", r".*\.__TABLES__.*"]
+
+
+class BigQueryIdentifierBuilder:
+    platform = "bigquery"
+
+    def __init__(
+        self,
+        identifier_config: BigQueryIdentifierConfig,
+        structured_reporter: SourceReport,
+    ) -> None:
+        self.identifier_config = identifier_config
+        if self.identifier_config.enable_legacy_sharded_table_support:
+            BigqueryTableIdentifier._BQ_SHARDED_TABLE_SUFFIX = ""
+        self.structured_reporter = structured_reporter
+
+    def gen_dataset_urn(
+        self, project_id: str, dataset_name: str, table: str, use_raw_name: bool = False
+    ) -> str:
+        datahub_dataset_name = BigqueryTableIdentifier(project_id, dataset_name, table)
+        return make_dataset_urn(
+            self.platform,
+            (
+                str(datahub_dataset_name)
+                if not use_raw_name
+                else datahub_dataset_name.raw_table_name()
+            ),
+            self.identifier_config.env,
+        )
+
+    def gen_dataset_urn_from_raw_ref(self, ref: BigQueryTableRef) -> str:
+        return self.gen_dataset_urn(
+            ref.table_identifier.project_id,
+            ref.table_identifier.dataset,
+            ref.table_identifier.table,
+            use_raw_name=True,
+        )
+
+    def gen_user_urn(self, user_email: str) -> str:
+        return make_user_urn(user_email.split("@")[0])
+
+    def make_data_platform_urn(self) -> str:
+        return make_data_platform_urn(self.platform)
+
+    def make_dataplatform_instance_urn(self, project_id: str) -> Optional[str]:
+        return (
+            make_dataplatform_instance_urn(self.platform, project_id)
+            if self.identifier_config.include_data_platform_instance
+            else None
+        )
+
+
+class BigQueryFilter:
+    def __init__(
+        self, filter_config: BigQueryFilterConfig, structured_reporter: SourceReport
+    ) -> None:
+        self.filter_config = filter_config
+        self.structured_reporter = structured_reporter
+
+    def is_allowed(self, table_id: BigqueryTableIdentifier) -> bool:
+        return AllowDenyPattern(deny=BQ_SYSTEM_TABLES_PATTERN).allowed(
+            str(table_id)
+        ) and (
+            self.is_project_allowed(table_id.project_id)
+            and is_schema_allowed(
+                self.filter_config.dataset_pattern,
+                table_id.dataset,
+                table_id.project_id,
+                self.filter_config.match_fully_qualified_names,
+            )
+            and self.filter_config.table_pattern.allowed(str(table_id))
+        )  # TODO: use view_pattern ?
+
+    def is_project_allowed(self, project_id: str) -> bool:
+        if self.filter_config.project_ids:
+            return project_id in self.filter_config.project_ids
+        return self.filter_config.project_id_pattern.allowed(project_id)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py
index 496bd64d3b4fe2..c9d0738bea7dca 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py
@@ -24,6 +24,7 @@
 from datahub.configuration.pattern_utils import is_schema_allowed
 from datahub.emitter import mce_builder
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.ingestion.api.source_helpers import auto_workunit
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.source.bigquery_v2.bigquery_audit import (
     AuditLogEntry,
@@ -42,7 +43,10 @@
     BigQuerySchemaApi,
     BigqueryTableSnapshot,
 )
-from datahub.ingestion.source.bigquery_v2.common import BQ_DATETIME_FORMAT
+from datahub.ingestion.source.bigquery_v2.common import (
+    BQ_DATETIME_FORMAT,
+    BigQueryIdentifierBuilder,
+)
 from datahub.ingestion.source.bigquery_v2.queries import (
     BQ_FILTER_RULE_TEMPLATE_V2_LINEAGE,
     bigquery_audit_metadata_query_template_lineage,
@@ -50,6 +54,7 @@
 from datahub.ingestion.source.state.redundant_run_skip_handler import (
     RedundantLineageRunSkipHandler,
 )
+from datahub.ingestion.source_report.ingestion_stage import LINEAGE_EXTRACTION
 from datahub.metadata.schema_classes import (
     AuditStampClass,
     DatasetLineageTypeClass,
@@ -60,6 +65,7 @@
     UpstreamLineageClass,
 )
 from datahub.sql_parsing.schema_resolver import SchemaResolver
+from datahub.sql_parsing.sql_parsing_aggregator import SqlParsingAggregator
 from datahub.sql_parsing.sqlglot_lineage import SqlParsingResult, sqlglot_lineage
 from datahub.utilities import memory_footprint
 from datahub.utilities.file_backed_collections import FileBackedDict
@@ -198,39 +204,21 @@ def make_lineage_edges_from_parsing_result(
     return list(table_edges.values())
 
 
-def make_lineage_edge_for_snapshot(
-    snapshot: BigqueryTableSnapshot,
-) -> Optional[LineageEdge]:
-    if snapshot.base_table_identifier:
-        base_table_name = str(
-            BigQueryTableRef.from_bigquery_table(snapshot.base_table_identifier)
-        )
-        return LineageEdge(
-            table=base_table_name,
-            column_mapping=frozenset(
-                LineageEdgeColumnMapping(
-                    out_column=column.field_path,
-                    in_columns=frozenset([column.field_path]),
-                )
-                for column in snapshot.columns
-            ),
-            auditStamp=datetime.now(timezone.utc),
-            type=DatasetLineageTypeClass.TRANSFORMED,
-        )
-    return None
-
-
 class BigqueryLineageExtractor:
     def __init__(
         self,
         config: BigQueryV2Config,
         report: BigQueryV2Report,
-        dataset_urn_builder: Callable[[BigQueryTableRef], str],
+        *,
+        schema_resolver: SchemaResolver,
+        identifiers: BigQueryIdentifierBuilder,
         redundant_run_skip_handler: Optional[RedundantLineageRunSkipHandler] = None,
     ):
         self.config = config
         self.report = report
-        self.dataset_urn_builder = dataset_urn_builder
+        self.schema_resolver = schema_resolver
+
+        self.identifiers = identifiers
         self.audit_log_api = BigQueryAuditLogApi(
             report.audit_log_api_perf,
             self.config.rate_limit,
@@ -243,6 +231,23 @@ def __init__(
             self.report.lineage_end_time,
         ) = self.get_time_window()
 
+        self.datasets_skip_audit_log_lineage: Set[str] = set()
+
+        self.aggregator = SqlParsingAggregator(
+            platform=self.identifiers.platform,
+            platform_instance=self.identifiers.identifier_config.platform_instance,
+            env=self.identifiers.identifier_config.env,
+            schema_resolver=self.schema_resolver,
+            eager_graph_load=False,
+            generate_lineage=True,
+            generate_queries=True,
+            generate_usage_statistics=False,
+            generate_query_usage_statistics=False,
+            generate_operations=False,
+            format_queries=True,
+        )
+        self.report.sql_aggregator = self.aggregator.report
+
     def get_time_window(self) -> Tuple[datetime, datetime]:
         if self.redundant_run_skip_handler:
             return self.redundant_run_skip_handler.suggest_run_time_window(
@@ -268,10 +273,46 @@ def _should_ingest_lineage(self) -> bool:
 
         return True
 
+    def get_lineage_workunits_for_views_and_snapshots(
+        self,
+        projects: List[str],
+        view_refs_by_project: Dict[str, Set[str]],
+        view_definitions: FileBackedDict[str],
+        snapshot_refs_by_project: Dict[str, Set[str]],
+        snapshots_by_ref: FileBackedDict[BigqueryTableSnapshot],
+    ) -> Iterable[MetadataWorkUnit]:
+        for project in projects:
+            if self.config.lineage_parse_view_ddl:
+                for view in view_refs_by_project[project]:
+                    self.datasets_skip_audit_log_lineage.add(view)
+                    self.aggregator.add_view_definition(
+                        view_urn=self.identifiers.gen_dataset_urn_from_raw_ref(
+                            BigQueryTableRef.from_string_name(view)
+                        ),
+                        view_definition=view_definitions[view],
+                        default_db=project,
+                    )
+
+            for snapshot_ref in snapshot_refs_by_project[project]:
+                snapshot = snapshots_by_ref[snapshot_ref]
+                if not snapshot.base_table_identifier:
+                    continue
+                self.datasets_skip_audit_log_lineage.add(snapshot_ref)
+                snapshot_urn = self.identifiers.gen_dataset_urn_from_raw_ref(
+                    BigQueryTableRef.from_string_name(snapshot_ref)
+                )
+                base_table_urn = self.identifiers.gen_dataset_urn_from_raw_ref(
+                    BigQueryTableRef(snapshot.base_table_identifier)
+                )
+                self.aggregator.add_known_lineage_mapping(
+                    upstream_urn=base_table_urn, downstream_urn=snapshot_urn
+                )
+
+        yield from auto_workunit(self.aggregator.gen_metadata())
+
     def get_lineage_workunits(
         self,
         projects: List[str],
-        sql_parser_schema_resolver: SchemaResolver,
         view_refs_by_project: Dict[str, Set[str]],
         view_definitions: FileBackedDict[str],
         snapshot_refs_by_project: Dict[str, Set[str]],
@@ -280,39 +321,22 @@ def get_lineage_workunits(
     ) -> Iterable[MetadataWorkUnit]:
         if not self._should_ingest_lineage():
             return
-        datasets_skip_audit_log_lineage: Set[str] = set()
-        dataset_lineage: Dict[str, Set[LineageEdge]] = {}
-        for project in projects:
-            self.populate_snapshot_lineage(
-                dataset_lineage,
-                snapshot_refs_by_project[project],
-                snapshots_by_ref,
-            )
-
-            if self.config.lineage_parse_view_ddl:
-                self.populate_view_lineage_with_sql_parsing(
-                    dataset_lineage,
-                    view_refs_by_project[project],
-                    view_definitions,
-                    sql_parser_schema_resolver,
-                    project,
-                )
 
-            datasets_skip_audit_log_lineage.update(dataset_lineage.keys())
-            for lineage_key in dataset_lineage.keys():
-                yield from self.gen_lineage_workunits_for_table(
-                    dataset_lineage, BigQueryTableRef.from_string_name(lineage_key)
-                )
+        yield from self.get_lineage_workunits_for_views_and_snapshots(
+            projects,
+            view_refs_by_project,
+            view_definitions,
+            snapshot_refs_by_project,
+            snapshots_by_ref,
+        )
 
         if self.config.use_exported_bigquery_audit_metadata:
             projects = ["*"]  # project_id not used when using exported metadata
 
         for project in projects:
-            self.report.set_ingestion_stage(project, "Lineage Extraction")
+            self.report.set_ingestion_stage(project, LINEAGE_EXTRACTION)
             yield from self.generate_lineage(
                 project,
-                sql_parser_schema_resolver,
-                datasets_skip_audit_log_lineage,
                 table_refs,
             )
 
@@ -325,8 +349,6 @@ def get_lineage_workunits(
     def generate_lineage(
         self,
         project_id: str,
-        sql_parser_schema_resolver: SchemaResolver,
-        datasets_skip_audit_log_lineage: Set[str],
         table_refs: Set[str],
     ) -> Iterable[MetadataWorkUnit]:
         logger.info(f"Generate lineage for {project_id}")
@@ -336,9 +358,7 @@ def generate_lineage(
                     lineage = self.lineage_via_catalog_lineage_api(project_id)
                 else:
                     events = self._get_parsed_audit_log_events(project_id)
-                    lineage = self._create_lineage_map(
-                        events, sql_parser_schema_resolver
-                    )
+                    lineage = self._create_lineage_map(events)
             except Exception as e:
                 self.report.lineage_failed_extraction.append(project_id)
                 self.report.warning(
@@ -364,7 +384,7 @@ def generate_lineage(
             # as they may contain indirectly referenced tables.
             if (
                 lineage_key not in table_refs
-                or lineage_key in datasets_skip_audit_log_lineage
+                or lineage_key in self.datasets_skip_audit_log_lineage
             ):
                 continue
 
@@ -372,62 +392,10 @@ def generate_lineage(
                 lineage, BigQueryTableRef.from_string_name(lineage_key)
             )
 
-    def populate_view_lineage_with_sql_parsing(
-        self,
-        view_lineage: Dict[str, Set[LineageEdge]],
-        view_refs: Set[str],
-        view_definitions: FileBackedDict[str],
-        sql_parser_schema_resolver: SchemaResolver,
-        default_project: str,
-    ) -> None:
-        for view in view_refs:
-            view_definition = view_definitions[view]
-            raw_view_lineage = sqlglot_lineage(
-                view_definition,
-                schema_resolver=sql_parser_schema_resolver,
-                default_db=default_project,
-            )
-            if raw_view_lineage.debug_info.table_error:
-                logger.debug(
-                    f"Failed to parse lineage for view {view}: {raw_view_lineage.debug_info.table_error}"
-                )
-                self.report.num_view_definitions_failed_parsing += 1
-                self.report.view_definitions_parsing_failures.append(
-                    f"Table-level sql parsing error for view {view}: {raw_view_lineage.debug_info.table_error}"
-                )
-                continue
-            elif raw_view_lineage.debug_info.column_error:
-                self.report.num_view_definitions_failed_column_parsing += 1
-                self.report.view_definitions_parsing_failures.append(
-                    f"Column-level sql parsing error for view {view}: {raw_view_lineage.debug_info.column_error}"
-                )
-            else:
-                self.report.num_view_definitions_parsed += 1
-
-            ts = datetime.now(timezone.utc)
-            view_lineage[view] = set(
-                make_lineage_edges_from_parsing_result(
-                    raw_view_lineage,
-                    audit_stamp=ts,
-                    lineage_type=DatasetLineageTypeClass.VIEW,
-                )
-            )
-
-    def populate_snapshot_lineage(
-        self,
-        snapshot_lineage: Dict[str, Set[LineageEdge]],
-        snapshot_refs: Set[str],
-        snapshots_by_ref: FileBackedDict[BigqueryTableSnapshot],
-    ) -> None:
-        for snapshot in snapshot_refs:
-            lineage_edge = make_lineage_edge_for_snapshot(snapshots_by_ref[snapshot])
-            if lineage_edge:
-                snapshot_lineage[snapshot] = {lineage_edge}
-
     def gen_lineage_workunits_for_table(
         self, lineage: Dict[str, Set[LineageEdge]], table_ref: BigQueryTableRef
     ) -> Iterable[MetadataWorkUnit]:
-        dataset_urn = self.dataset_urn_builder(table_ref)
+        dataset_urn = self.identifiers.gen_dataset_urn_from_raw_ref(table_ref)
 
         lineage_info = self.get_lineage_for_table(
             bq_table=table_ref,
@@ -479,7 +447,9 @@ def lineage_via_catalog_lineage_api(
         lineage_client: lineage_v1.LineageClient = lineage_v1.LineageClient()
 
         data_dictionary = BigQuerySchemaApi(
-            self.report.schema_api_perf, self.config.get_bigquery_client()
+            self.report.schema_api_perf,
+            self.config.get_bigquery_client(),
+            self.config.get_projects_client(),
         )
 
         # Filtering datasets
@@ -682,7 +652,6 @@ def _parse_exported_bigquery_audit_metadata(
     def _create_lineage_map(
         self,
         entries: Iterable[QueryEvent],
-        sql_parser_schema_resolver: SchemaResolver,
     ) -> Dict[str, Set[LineageEdge]]:
         logger.info("Entering create lineage map function")
         lineage_map: Dict[str, Set[LineageEdge]] = collections.defaultdict(set)
@@ -746,7 +715,7 @@ def _create_lineage_map(
                     query = e.query
                 raw_lineage = sqlglot_lineage(
                     query,
-                    schema_resolver=sql_parser_schema_resolver,
+                    schema_resolver=self.schema_resolver,
                     default_db=e.project_id,
                 )
                 logger.debug(
@@ -870,7 +839,9 @@ def get_lineage_for_table(
         # even if the lineage is same but the order is different.
         for upstream in sorted(self.get_upstream_tables(bq_table, lineage_metadata)):
             upstream_table = BigQueryTableRef.from_string_name(upstream.table)
-            upstream_table_urn = self.dataset_urn_builder(upstream_table)
+            upstream_table_urn = self.identifiers.gen_dataset_urn_from_raw_ref(
+                upstream_table
+            )
 
             # Generate table-level lineage.
             upstream_table_class = UpstreamClass(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/queries_extractor.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/queries_extractor.py
new file mode 100644
index 00000000000000..1e2a12c6adb87e
--- /dev/null
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/queries_extractor.py
@@ -0,0 +1,492 @@
+import functools
+import logging
+import pathlib
+import tempfile
+from datetime import datetime, timezone
+from typing import Collection, Dict, Iterable, List, Optional, TypedDict
+
+from google.cloud.bigquery import Client
+from pydantic import Field, PositiveInt
+
+from datahub.configuration.common import AllowDenyPattern
+from datahub.configuration.time_window_config import (
+    BaseTimeWindowConfig,
+    get_time_bucket,
+)
+from datahub.ingestion.api.source import SourceReport
+from datahub.ingestion.api.source_helpers import auto_workunit
+from datahub.ingestion.api.workunit import MetadataWorkUnit
+from datahub.ingestion.graph.client import DataHubGraph
+from datahub.ingestion.source.bigquery_v2.bigquery_audit import (
+    BigqueryTableIdentifier,
+    BigQueryTableRef,
+)
+from datahub.ingestion.source.bigquery_v2.bigquery_config import BigQueryBaseConfig
+from datahub.ingestion.source.bigquery_v2.bigquery_report import (
+    BigQueryQueriesExtractorReport,
+)
+from datahub.ingestion.source.bigquery_v2.bigquery_schema import (
+    BigqueryProject,
+    BigQuerySchemaApi,
+    get_projects,
+)
+from datahub.ingestion.source.bigquery_v2.common import (
+    BQ_DATETIME_FORMAT,
+    BigQueryFilter,
+    BigQueryIdentifierBuilder,
+)
+from datahub.ingestion.source.usage.usage_common import BaseUsageConfig
+from datahub.metadata.urns import CorpUserUrn
+from datahub.sql_parsing.schema_resolver import SchemaResolver
+from datahub.sql_parsing.sql_parsing_aggregator import (
+    ObservedQuery,
+    SqlParsingAggregator,
+)
+from datahub.sql_parsing.sqlglot_utils import get_query_fingerprint
+from datahub.utilities.file_backed_collections import (
+    ConnectionWrapper,
+    FileBackedDict,
+    FileBackedList,
+)
+from datahub.utilities.time import datetime_to_ts_millis
+
+logger = logging.getLogger(__name__)
+
+
+class BigQueryTableReference(TypedDict):
+    project_id: str
+    dataset_id: str
+    table_id: str
+
+
+class DMLJobStatistics(TypedDict):
+    inserted_row_count: int
+    deleted_row_count: int
+    updated_row_count: int
+
+
+class BigQueryJob(TypedDict):
+    job_id: str
+    project_id: str
+    creation_time: datetime
+    user_email: str
+    query: str
+    session_id: Optional[str]
+    query_hash: Optional[str]
+
+    statement_type: str
+    destination_table: Optional[BigQueryTableReference]
+    referenced_tables: List[BigQueryTableReference]
+    # NOTE: This does not capture referenced_view unlike GCP Logging Event
+
+
+class BigQueryQueriesExtractorConfig(BigQueryBaseConfig):
+    # TODO: Support stateful ingestion for the time windows.
+    window: BaseTimeWindowConfig = BaseTimeWindowConfig()
+
+    local_temp_path: Optional[pathlib.Path] = Field(
+        default=None,
+        description="Local path to store the audit log.",
+        # TODO: For now, this is simply an advanced config to make local testing easier.
+        # Eventually, we will want to store date-specific files in the directory and use it as a cache.
+        hidden_from_docs=True,
+    )
+
+    user_email_pattern: AllowDenyPattern = Field(
+        default=AllowDenyPattern.allow_all(),
+        description="regex patterns for user emails to filter in usage.",
+    )
+
+    top_n_queries: PositiveInt = Field(
+        default=10, description="Number of top queries to save to each table."
+    )
+
+    include_lineage: bool = True
+    include_queries: bool = True
+    include_usage_statistics: bool = True
+    include_query_usage_statistics: bool = True
+    include_operations: bool = True
+
+    region_qualifiers: List[str] = Field(
+        default=["region-us", "region-eu"],
+        description="BigQuery regions to be scanned for bigquery jobs. "
+        "See [this](https://cloud.google.com/bigquery/docs/information-schema-jobs#scope_and_syntax) for details.",
+    )
+
+
+class BigQueryQueriesExtractor:
+    """
+    Extracts query audit log and generates usage/lineage/operation workunits.
+
+    Some notable differences in this wrt older usage extraction method are:
+    1. For every lineage/operation workunit, corresponding query id is also present
+    2. Operation aspect for a particular query is emitted at max once(last occurence) for a day
+    3. "DROP" operation accounts for usage here
+    4. userEmail is not populated in datasetUsageStatistics aspect, only user urn
+
+    """
+
+    def __init__(
+        self,
+        connection: Client,
+        schema_api: BigQuerySchemaApi,
+        config: BigQueryQueriesExtractorConfig,
+        structured_report: SourceReport,
+        filters: BigQueryFilter,
+        identifiers: BigQueryIdentifierBuilder,
+        graph: Optional[DataHubGraph] = None,
+        schema_resolver: Optional[SchemaResolver] = None,
+        discovered_tables: Optional[Collection[str]] = None,
+    ):
+        self.connection = connection
+
+        self.config = config
+        self.filters = filters
+        self.identifiers = identifiers
+        self.schema_api = schema_api
+        self.report = BigQueryQueriesExtractorReport()
+        self.discovered_tables = set(discovered_tables) if discovered_tables else None
+
+        self.structured_report = structured_report
+
+        self.aggregator = SqlParsingAggregator(
+            platform=self.identifiers.platform,
+            platform_instance=self.identifiers.identifier_config.platform_instance,
+            env=self.identifiers.identifier_config.env,
+            schema_resolver=schema_resolver,
+            graph=graph,
+            eager_graph_load=False,
+            generate_lineage=self.config.include_lineage,
+            generate_queries=self.config.include_queries,
+            generate_usage_statistics=self.config.include_usage_statistics,
+            generate_query_usage_statistics=self.config.include_query_usage_statistics,
+            usage_config=BaseUsageConfig(
+                bucket_duration=self.config.window.bucket_duration,
+                start_time=self.config.window.start_time,
+                end_time=self.config.window.end_time,
+                user_email_pattern=self.config.user_email_pattern,
+                top_n_queries=self.config.top_n_queries,
+            ),
+            generate_operations=self.config.include_operations,
+            is_temp_table=self.is_temp_table,
+            is_allowed_table=self.is_allowed_table,
+            format_queries=False,
+        )
+        self.report.sql_aggregator = self.aggregator.report
+
+    @functools.cached_property
+    def local_temp_path(self) -> pathlib.Path:
+        if self.config.local_temp_path:
+            assert self.config.local_temp_path.is_dir()
+            return self.config.local_temp_path
+
+        path = pathlib.Path(tempfile.mkdtemp())
+        path.mkdir(parents=True, exist_ok=True)
+        logger.info(f"Using local temp path: {path}")
+        return path
+
+    def is_temp_table(self, name: str) -> bool:
+        try:
+            table = BigqueryTableIdentifier.from_string_name(name)
+
+            if table.dataset.startswith(self.config.temp_table_dataset_prefix):
+                return True
+
+            # This is also a temp table if
+            #   1. this name would be allowed by the dataset patterns, and
+            #   2. we have a list of discovered tables, and
+            #   3. it's not in the discovered tables list
+            if (
+                self.filters.is_allowed(table)
+                and self.discovered_tables
+                and str(BigQueryTableRef(table)) not in self.discovered_tables
+            ):
+                return True
+
+        except Exception:
+            logger.warning(f"Error parsing table name {name} ")
+        return False
+
+    def is_allowed_table(self, name: str) -> bool:
+        try:
+            table = BigqueryTableIdentifier.from_string_name(name)
+            if (
+                self.discovered_tables
+                and str(BigQueryTableRef(table)) not in self.discovered_tables
+            ):
+                return False
+            return self.filters.is_allowed(table)
+        except Exception:
+            logger.warning(f"Error parsing table name {name} ")
+            return False
+
+    def get_workunits_internal(
+        self,
+    ) -> Iterable[MetadataWorkUnit]:
+        # TODO: Add some logic to check if the cached audit log is stale or not.
+        audit_log_file = self.local_temp_path / "audit_log.sqlite"
+        use_cached_audit_log = audit_log_file.exists()
+
+        queries: FileBackedList[ObservedQuery]
+        if use_cached_audit_log:
+            logger.info("Using cached audit log")
+            shared_connection = ConnectionWrapper(audit_log_file)
+            queries = FileBackedList(shared_connection)
+        else:
+            audit_log_file.unlink(missing_ok=True)
+
+            shared_connection = ConnectionWrapper(audit_log_file)
+            queries = FileBackedList(shared_connection)
+            entry: ObservedQuery
+
+            with self.report.query_log_fetch_timer:
+                for project in get_projects(
+                    self.schema_api, self.structured_report, self.filters
+                ):
+                    for entry in self.fetch_query_log(project):
+                        self.report.num_queries_by_project[project.id] += 1
+                        queries.append(entry)
+        self.report.num_total_queries = len(queries)
+
+        with self.report.audit_log_preprocessing_timer:
+            # Preprocessing stage that deduplicates the queries using query hash per usage bucket
+            # Using regular dictionary with
+            #   key: usage bucket
+            #   value: File backed dictionary with query hash as key and observed query as value
+            # This structure is chosen in order to maintain order of execution of queries
+
+            queries_deduped: Dict[int, FileBackedDict[ObservedQuery]]
+            queries_deduped = self.deduplicate_queries(queries)
+            self.report.num_unique_queries = len(
+                set(
+                    query_hash
+                    for bucket in queries_deduped.values()
+                    for query_hash in bucket
+                )
+            )
+
+        with self.report.audit_log_load_timer:
+            i = 0
+            for queries_in_bucket in queries_deduped.values():
+                # Ordering is essential for column-level lineage via temporary table
+                for row in queries_in_bucket.sql_query_iterator(
+                    "select value from data order by last_query_timestamp asc",
+                ):
+                    query = queries_in_bucket.deserializer(row["value"])
+                    if i > 0 and i % 10000 == 0:
+                        logger.info(f"Added {i} query log entries to SQL aggregator")
+
+                    self.aggregator.add(query)
+                    i += 1
+
+        yield from auto_workunit(self.aggregator.gen_metadata())
+
+    def deduplicate_queries(
+        self, queries: FileBackedList[ObservedQuery]
+    ) -> Dict[int, FileBackedDict[ObservedQuery]]:
+
+        # This fingerprint based deduplication is done here to reduce performance hit due to
+        # repetitive sql parsing while adding observed query to aggregator that would otherwise
+        # parse same query multiple times. In future, aggregator may absorb this deduplication.
+        # With current implementation, it is possible that "Operation"(e.g. INSERT) is reported
+        # only once per day, although it may have happened multiple times throughout the day.
+
+        queries_deduped: Dict[int, FileBackedDict[ObservedQuery]] = dict()
+
+        for i, query in enumerate(queries):
+            if i > 0 and i % 10000 == 0:
+                logger.info(f"Preprocessing completed for {i} query log entries")
+
+            # query = ObservedQuery(**asdict(query))
+
+            time_bucket = 0
+            if query.timestamp:
+                time_bucket = datetime_to_ts_millis(
+                    get_time_bucket(query.timestamp, self.config.window.bucket_duration)
+                )
+
+            # Not using original BQ query hash as it's not always present
+            query.query_hash = get_query_fingerprint(
+                query.query, self.identifiers.platform, fast=True
+            )
+
+            if time_bucket not in queries_deduped:
+                # TODO: Cleanup, etc as required for file backed dicts after use
+                queries_deduped[time_bucket] = FileBackedDict[ObservedQuery](
+                    extra_columns={"last_query_timestamp": lambda e: e.timestamp}
+                )
+
+            observed_query = queries_deduped[time_bucket].get(query.query_hash)
+
+            # If the query already exists for this time bucket, update its attributes
+            if observed_query is not None:
+                observed_query.usage_multiplier += 1
+                observed_query.timestamp = query.timestamp
+            else:
+                queries_deduped[time_bucket][query.query_hash] = query
+
+        return queries_deduped
+
+    def fetch_query_log(self, project: BigqueryProject) -> Iterable[ObservedQuery]:
+
+        # Multi-regions from https://cloud.google.com/bigquery/docs/locations#supported_locations
+        regions = self.config.region_qualifiers
+
+        for region in regions:
+            with self.structured_report.report_exc(
+                f"Error fetching query log from BQ Project {project.id} for {region}"
+            ):
+                yield from self.fetch_region_query_log(project, region)
+
+    def fetch_region_query_log(
+        self, project: BigqueryProject, region: str
+    ) -> Iterable[ObservedQuery]:
+
+        # Each region needs to be a different query
+        query_log_query = _build_enriched_query_log_query(
+            project_id=project.id,
+            region=region,
+            start_time=self.config.window.start_time,
+            end_time=self.config.window.end_time,
+        )
+
+        logger.info(f"Fetching query log from BQ Project {project.id} for {region}")
+        resp = self.connection.query(query_log_query)
+
+        for i, row in enumerate(resp):
+            if i > 0 and i % 1000 == 0:
+                logger.info(f"Processed {i} query log rows so far")
+            try:
+                entry = self._parse_audit_log_row(row)
+            except Exception as e:
+                self.structured_report.warning(
+                    "Error parsing query log row",
+                    context=f"{row}",
+                    exc=e,
+                )
+            else:
+                yield entry
+
+    def _parse_audit_log_row(self, row: BigQueryJob) -> ObservedQuery:
+        timestamp: datetime = row["creation_time"]
+        timestamp = timestamp.astimezone(timezone.utc)
+
+        # Usually bigquery identifiers are always referred as <dataset>.<table> and only
+        # temporary tables are referred as <table> alone without project or dataset name.
+        # Note that temporary tables can also be referenced using _SESSION.<table>
+        # More details here - https://cloud.google.com/bigquery/docs/multi-statement-queries
+        # Also _ at start considers this as temp dataset as per `temp_table_dataset_prefix` config
+        TEMP_TABLE_QUALIFIER = "_SESSION"
+
+        query = _extract_query_text(row)
+
+        entry = ObservedQuery(
+            query=query,
+            session_id=row["session_id"],
+            timestamp=row["creation_time"],
+            user=(
+                CorpUserUrn.from_string(
+                    self.identifiers.gen_user_urn(row["user_email"])
+                )
+                if row["user_email"]
+                else None
+            ),
+            default_db=row["project_id"],
+            default_schema=TEMP_TABLE_QUALIFIER,
+            query_hash=row["query_hash"],
+            extra_info={
+                "job_id": row["job_id"],
+                "statement_type": row["statement_type"],
+                "destination_table": row["destination_table"],
+                "referenced_tables": row["referenced_tables"],
+            },
+        )
+
+        return entry
+
+
+def _extract_query_text(row: BigQueryJob) -> str:
+    # We wrap select statements in a CTE to make them parseable as DML statement.
+    # This is a workaround to support the case where the user runs a query and inserts the result into a table.
+    # NOTE This will result in showing modified query instead of original query in DataHub UI
+    # Alternatively, this support needs to be added more natively in aggregator.add_observed_query
+    if (
+        row["statement_type"] == "SELECT"
+        and row["destination_table"]
+        and not row["destination_table"]["table_id"].startswith("anon")
+    ):
+        table_name = BigqueryTableIdentifier(
+            row["destination_table"]["project_id"],
+            row["destination_table"]["dataset_id"],
+            row["destination_table"]["table_id"],
+        ).raw_table_name()
+        query = f"""CREATE TABLE `{table_name}` AS
+                (
+                    {row["query"]}
+                )"""
+    else:
+        query = row["query"]
+    return query
+
+
+def _build_enriched_query_log_query(
+    project_id: str,
+    region: str,
+    start_time: datetime,
+    end_time: datetime,
+) -> str:
+
+    audit_start_time = start_time.strftime(BQ_DATETIME_FORMAT)
+    audit_end_time = end_time.strftime(BQ_DATETIME_FORMAT)
+
+    # List of all statement types
+    # https://cloud.google.com/bigquery/docs/reference/auditlogs/rest/Shared.Types/BigQueryAuditMetadata.QueryStatementType
+    UNSUPPORTED_STATEMENT_TYPES = [
+        # procedure
+        "CREATE_PROCEDURE",
+        "DROP_PROCEDURE",
+        "CALL",
+        "SCRIPT",  # individual statements in executed procedure are present as separate jobs
+        # schema
+        "CREATE_SCHEMA",
+        "DROP_SCHEMA",
+        # function
+        "CREATE_FUNCTION",
+        "CREATE_TABLE_FUNCTION",
+        "DROP_FUNCTION",
+        # policies
+        "CREATE_ROW_ACCESS_POLICY",
+        "DROP_ROW_ACCESS_POLICY",
+    ]
+
+    unsupported_statement_types = ",".join(
+        [f"'{statement_type}'" for statement_type in UNSUPPORTED_STATEMENT_TYPES]
+    )
+
+    # NOTE the use of partition column creation_time as timestamp here.
+    # Currently, only required columns are fetched. There are more columns such as
+    # total_slot_ms, job_type, total_bytes_billed, dml_statistics(inserted_row_count, etc)
+    # that may be fetched as required in future. Refer below link for list of all columns
+    # https://cloud.google.com/bigquery/docs/information-schema-jobs#schema
+    return f"""\
+        SELECT
+            job_id,
+            project_id,
+            creation_time,
+            user_email,
+            query,
+            session_info.session_id as session_id,
+            query_info.query_hashes.normalized_literals as query_hash,
+            statement_type,
+            destination_table,
+            referenced_tables
+        FROM
+            `{project_id}`.`{region}`.INFORMATION_SCHEMA.JOBS
+        WHERE
+            creation_time >= '{audit_start_time}' AND
+            creation_time <= '{audit_end_time}' AND
+            error_result is null AND
+            not CONTAINS_SUBSTR(query, '.INFORMATION_SCHEMA.') AND
+            statement_type not in ({unsupported_statement_types})
+        ORDER BY creation_time
+    """
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/usage.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/usage.py
index 6824d630a2277a..876ffab85ba311 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/usage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/usage.py
@@ -26,7 +26,6 @@
     BaseTimeWindowConfig,
     get_time_bucket,
 )
-from datahub.emitter.mce_builder import make_user_urn
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.api.closeable import Closeable
 from datahub.ingestion.api.source_helpers import auto_empty_dataset_usage_statistics
@@ -44,7 +43,10 @@
 )
 from datahub.ingestion.source.bigquery_v2.bigquery_config import BigQueryV2Config
 from datahub.ingestion.source.bigquery_v2.bigquery_report import BigQueryV2Report
-from datahub.ingestion.source.bigquery_v2.common import BQ_DATETIME_FORMAT
+from datahub.ingestion.source.bigquery_v2.common import (
+    BQ_DATETIME_FORMAT,
+    BigQueryIdentifierBuilder,
+)
 from datahub.ingestion.source.bigquery_v2.queries import (
     BQ_FILTER_RULE_TEMPLATE_V2_USAGE,
     bigquery_audit_metadata_query_template_usage,
@@ -313,13 +315,13 @@ def __init__(
         report: BigQueryV2Report,
         *,
         schema_resolver: SchemaResolver,
-        dataset_urn_builder: Callable[[BigQueryTableRef], str],
+        identifiers: BigQueryIdentifierBuilder,
         redundant_run_skip_handler: Optional[RedundantUsageRunSkipHandler] = None,
     ):
         self.config: BigQueryV2Config = config
         self.report: BigQueryV2Report = report
         self.schema_resolver = schema_resolver
-        self.dataset_urn_builder = dataset_urn_builder
+        self.identifiers = identifiers
         # Replace hash of query with uuid if there are hash conflicts
         self.uuid_to_query: Dict[str, str] = {}
 
@@ -404,7 +406,9 @@ def _get_workunits_internal(
                         bucket_duration=self.config.bucket_duration,
                     ),
                     dataset_urns={
-                        self.dataset_urn_builder(BigQueryTableRef.from_string_name(ref))
+                        self.identifiers.gen_dataset_urn_from_raw_ref(
+                            BigQueryTableRef.from_string_name(ref)
+                        )
                         for ref in table_refs
                     },
                 )
@@ -535,7 +539,7 @@ def _generate_usage_workunits(
                     user_freq=entry.user_freq,
                     column_freq=entry.column_freq,
                     bucket_duration=self.config.bucket_duration,
-                    resource_urn_builder=self.dataset_urn_builder,
+                    resource_urn_builder=self.identifiers.gen_dataset_urn_from_raw_ref,
                     top_n_queries=self.config.usage.top_n_queries,
                     format_sql_queries=self.config.usage.format_sql_queries,
                     queries_character_limit=self.config.usage.queries_character_limit,
@@ -710,12 +714,14 @@ def _create_operation_workunit(
         affected_datasets = []
         if event.query_event and event.query_event.referencedTables:
             for table in event.query_event.referencedTables:
-                affected_datasets.append(table.to_urn(self.config.env))
+                affected_datasets.append(
+                    self.identifiers.gen_dataset_urn_from_raw_ref(table)
+                )
 
         operation_aspect = OperationClass(
             timestampMillis=reported_time,
             lastUpdatedTimestamp=operational_meta.last_updated_timestamp,
-            actor=make_user_urn(operational_meta.actor_email.split("@")[0]),
+            actor=self.identifiers.gen_user_urn(operational_meta.actor_email),
             operationType=operational_meta.statement_type,
             customOperationType=operational_meta.custom_type,
             affectedDatasets=affected_datasets,
@@ -729,7 +735,7 @@ def _create_operation_workunit(
                 operation_aspect.numAffectedRows = event.query_event.numAffectedRows
 
         return MetadataChangeProposalWrapper(
-            entityUrn=destination_table.to_urn(env=self.config.env),
+            entityUrn=self.identifiers.gen_dataset_urn_from_raw_ref(destination_table),
             aspect=operation_aspect,
         ).as_workunit()
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/common/subtypes.py b/metadata-ingestion/src/datahub/ingestion/source/common/subtypes.py
index 0d9fc8225532c9..4bc120fbecf8f1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/common/subtypes.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/common/subtypes.py
@@ -1,7 +1,7 @@
-from enum import Enum
+from datahub.utilities.str_enum import StrEnum
 
 
-class DatasetSubTypes(str, Enum):
+class DatasetSubTypes(StrEnum):
     # Generic SubTypes
     TABLE = "Table"
     VIEW = "View"
@@ -18,12 +18,15 @@ class DatasetSubTypes(str, Enum):
     QLIK_DATASET = "Qlik Dataset"
     BIGQUERY_TABLE_SNAPSHOT = "Bigquery Table Snapshot"
     SIGMA_DATASET = "Sigma Dataset"
+    SAC_MODEL = "Model"
+    SAC_IMPORT_DATA_MODEL = "Import Data Model"
+    SAC_LIVE_DATA_MODEL = "Live Data Model"
 
     # TODO: Create separate entity...
     NOTEBOOK = "Notebook"
 
 
-class DatasetContainerSubTypes(str, Enum):
+class DatasetContainerSubTypes(StrEnum):
     # Generic SubTypes
     DATABASE = "Database"
     SCHEMA = "Schema"
@@ -38,7 +41,7 @@ class DatasetContainerSubTypes(str, Enum):
     ABS_CONTAINER = "ABS container"
 
 
-class BIContainerSubTypes(str, Enum):
+class BIContainerSubTypes(StrEnum):
     LOOKER_FOLDER = "Folder"
     LOOKML_PROJECT = "LookML Project"
     LOOKML_MODEL = "LookML Model"
@@ -52,11 +55,11 @@ class BIContainerSubTypes(str, Enum):
     MODE_COLLECTION = "Collection"
 
 
-class JobContainerSubTypes(str, Enum):
+class JobContainerSubTypes(StrEnum):
     NIFI_PROCESS_GROUP = "Process Group"
 
 
-class BIAssetSubTypes(str, Enum):
+class BIAssetSubTypes(StrEnum):
     # Generic SubTypes
     REPORT = "Report"
 
@@ -69,5 +72,10 @@ class BIAssetSubTypes(str, Enum):
 
     # Mode
     MODE_REPORT = "Report"
+    MODE_DATASET = "Dataset"
     MODE_QUERY = "Query"
     MODE_CHART = "Chart"
+
+    # SAP Analytics Cloud
+    SAC_STORY = "Story"
+    SAC_APPLICATION = "Application"
diff --git a/metadata-ingestion/src/datahub/ingestion/source/confluent_schema_registry.py b/metadata-ingestion/src/datahub/ingestion/source/confluent_schema_registry.py
index fba71240282c43..f40e6504f11885 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/confluent_schema_registry.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/confluent_schema_registry.py
@@ -249,7 +249,7 @@ def _get_schema_and_fields(
 
         if topic_subject is not None:
             logger.debug(
-                f"The {schema_type_str} schema subject:'{topic_subject}' is found for {kafka_entity}:'{topic}'."
+                f"The {schema_type_str} schema subject:'{topic_subject}' is found for {kafka_entity}: '{topic}'."
             )
             try:
                 registered_schema = self.schema_registry_client.get_latest_version(
@@ -257,12 +257,13 @@ def _get_schema_and_fields(
                 )
                 schema = registered_schema.schema
             except Exception as e:
-                logger.warning(
-                    f"For {kafka_entity}: {topic}, failed to get {schema_type_str} schema from schema registry using subject:'{topic_subject}': {e}."
-                )
-                self.report.report_warning(
-                    topic,
-                    f"failed to get {schema_type_str} schema from schema registry using subject:'{topic_subject}': {e}.",
+                self.report.warning(
+                    title="Failed to get subject schema from schema registry",
+                    message=f"Failed to get {kafka_entity} {schema_type_str or ''} schema from schema registry",
+                    context=f"{topic}: {topic_subject}"
+                    if not is_subject
+                    else topic_subject,
+                    exc=e,
                 )
         else:
             logger.debug(
@@ -270,10 +271,11 @@ def _get_schema_and_fields(
             )
             if not is_key_schema:
                 # Value schema is always expected. Report a warning.
-                self.report.report_warning(
-                    topic,
-                    f"The schema registry subject for the {schema_type_str} schema is not found."
-                    f" The {kafka_entity} is either schema-less, or no messages have been written to the {kafka_entity} yet.",
+                self.report.warning(
+                    title="Unable to find a matching subject name for the topic in the schema registry",
+                    message=f"The {kafka_entity} {schema_type_str or ''} is either schema-less, or no messages have been written to the {kafka_entity} yet. "
+                    "If this is unexpected, check the topic_subject_map and topic_naming related configs.",
+                    context=topic,
                 )
 
         # Obtain the schema fields from schema for the topic.
diff --git a/metadata-ingestion/src/datahub/ingestion/source/csv_enricher.py b/metadata-ingestion/src/datahub/ingestion/source/csv_enricher.py
index feee89ba579837..e3f9a150ad0001 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/csv_enricher.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/csv_enricher.py
@@ -12,11 +12,12 @@
 from datahub.ingestion.api.common import PipelineContext
 from datahub.ingestion.api.decorators import (
     SupportStatus,
+    capability,
     config_class,
     platform_name,
     support_status,
 )
-from datahub.ingestion.api.source import Source, SourceReport
+from datahub.ingestion.api.source import Source, SourceCapability, SourceReport
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.source_config.csv_enricher import CSVEnricherConfig
 from datahub.metadata.schema_classes import (
@@ -96,6 +97,10 @@ class CSVEnricherReport(SourceReport):
 @platform_name("CSV Enricher")
 @config_class(CSVEnricherConfig)
 @support_status(SupportStatus.INCUBATING)
+@capability(SourceCapability.DOMAINS, "Supported by default")
+@capability(SourceCapability.TAGS, "Supported by default")
+@capability(SourceCapability.DESCRIPTIONS, "Supported by default")
+@capability(SourceCapability.OWNERSHIP, "Supported by default")
 class CSVEnricherSource(Source):
     """
     :::tip Looking to ingest a CSV data file into DataHub, as an asset?
diff --git a/metadata-ingestion/src/datahub/ingestion/source/data_lake_common/path_spec.py b/metadata-ingestion/src/datahub/ingestion/source/data_lake_common/path_spec.py
index 71765f9be5e323..bc19940afdd1e3 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/data_lake_common/path_spec.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/data_lake_common/path_spec.py
@@ -1,6 +1,8 @@
+import datetime
 import logging
 import os
 import re
+from enum import Enum
 from typing import Any, Dict, List, Optional, Tuple, Union
 
 import parse
@@ -28,6 +30,57 @@
     "gzip",
 ]
 
+java_to_python_mapping = {
+    "yyyy": "Y",
+    "MM": "m",
+    "dd": "d",
+    "HH": "H",
+    "mm": "M",
+    "ss": "S",
+}
+
+
+class SortKeyType(Enum):
+    STRING = "STRING"
+    INTEGER = "INTEGER"
+    FLOAT = "FLOAT"
+    DATETIME = "DATETIME"
+    DATE = "DATE"
+
+    def __str__(self):
+        return self.value
+
+
+class SortKey(ConfigModel):
+    key: str = Field(
+        description="The key to sort on. This can be a compound key based on the path_spec variables."
+    )
+    type: SortKeyType = Field(
+        default=SortKeyType.STRING,
+        description="The date format to use when sorting. This is used to parse the date from the key. The format should follow the java [SimpleDateFormat](https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html) format.",
+    )
+
+    date_format: Optional[str] = Field(
+        default=None,
+        type=str,
+        description="The date format to use when sorting. This is used to parse the date from the key. The format should follow the java [SimpleDateFormat](https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html) format.",
+    )
+
+    @pydantic.validator("date_format", always=True)
+    def convert_date_format_to_python_format(cls, v: Optional[str]) -> Optional[str]:
+        if v is None:
+            return None
+        else:
+            for java_format, python_format in java_to_python_mapping.items():
+                v = v.replace(java_format, f"%{python_format}")
+        return v
+
+
+class FolderTraversalMethod(Enum):
+    ALL = "ALL"
+    MIN_MAX = "MIN_MAX"
+    MAX = "MAX"
+
 
 class PathSpec(ConfigModel):
     class Config:
@@ -37,7 +90,7 @@ class Config:
         description="Path to table. Name variable `{table}` is used to mark the folder with dataset. In absence of `{table}`, file level dataset will be created. Check below examples for more details."
     )
     exclude: Optional[List[str]] = Field(
-        default=None,
+        default=[],
         description="list of paths in glob pattern which will be excluded while scanning for the datasets",
     )
     file_types: List[str] = Field(
@@ -55,6 +108,13 @@ class Config:
         description="Display name of the dataset.Combination of named variables from include path and strings",
     )
 
+    # This is not used yet, but will be used in the future to sort the partitions
+    sort_key: Optional[SortKey] = Field(
+        hidden_from_docs=True,
+        default=None,
+        description="Sort key to use when sorting the partitions. This is useful when the partitions are not sorted in the order of the data. The key can be a compound key based on the path_spec variables.",
+    )
+
     enable_compression: bool = Field(
         default=True,
         description="Enable or disable processing compressed files. Currently .gz and .bz files are supported.",
@@ -70,8 +130,41 @@ class Config:
         description="Allow double stars in the include path. This can affect performance significantly if enabled",
     )
 
-    def allowed(self, path: str) -> bool:
+    autodetect_partitions: bool = Field(
+        default=True,
+        description="Autodetect partition(s) from the path. If set to true, it will autodetect partition key/value if the folder format is {partition_key}={partition_value} for example `year=2024`",
+    )
+
+    traversal_method: FolderTraversalMethod = Field(
+        default=FolderTraversalMethod.MAX,
+        description="Method to traverse the folder. ALL: Traverse all the folders, MIN_MAX: Traverse the folders by finding min and max value, MAX: Traverse the folder with max value",
+    )
+
+    include_hidden_folders: bool = Field(
+        default=False,
+        description="Include hidden folders in the traversal (folders starting with . or _",
+    )
+
+    def is_path_hidden(self, path: str) -> bool:
+        # Split the path into directories and filename
+        dirs, filename = os.path.split(path)
+
+        # Check the filename
+        if filename.startswith(".") or filename.startswith("_"):
+            return True
+
+        # Check each directory in the path
+        for dir in dirs.split(os.sep):
+            if dir.startswith(".") or dir.startswith("_"):
+                return True
+
+        return False
+
+    def allowed(self, path: str, ignore_ext: bool = False) -> bool:
         logger.debug(f"Checking file to inclusion: {path}")
+        if self.is_path_hidden(path) and not self.include_hidden_folders:
+            return False
+
         if not pathlib.PurePath(path).globmatch(
             self.glob_include, flags=pathlib.GLOBSTAR
         ):
@@ -86,16 +179,20 @@ def allowed(self, path: str) -> bool:
         logger.debug(f"{path} is not excluded")
         ext = os.path.splitext(path)[1].strip(".")
 
-        if (ext == "" and self.default_extension is None) and (
-            ext != "*" and ext not in self.file_types
-        ):
-            return False
+        if not ignore_ext:
+            if (ext == "" and self.default_extension is None) and (
+                ext != "*" and ext not in self.file_types
+            ):
+                return False
 
-        logger.debug(f"{path} had selected extension {ext}")
-        logger.debug(f"{path} allowed for dataset creation")
+            logger.debug(f"{path} had selected extension {ext}")
+            logger.debug(f"{path} allowed for dataset creation")
         return True
 
     def dir_allowed(self, path: str) -> bool:
+        if self.glob_include.endswith("**"):
+            return self.allowed(path, ignore_ext=True)
+
         path_slash = path.count("/")
         glob_slash = self.glob_include.count("/")
         if path_slash > glob_slash:
@@ -126,13 +223,30 @@ def dir_allowed(self, path: str) -> bool:
     @classmethod
     def get_parsable_include(cls, include: str) -> str:
         parsable_include = include
-        for i in range(parsable_include.count("*")):
-            parsable_include = parsable_include.replace("*", f"{{folder[{i}]}}", 1)
+        if parsable_include.endswith("/{table}/**"):
+            # Remove the last two characters to make it parsable if it ends with {table}/** which marks autodetect partition
+            parsable_include = parsable_include[:-2]
+        else:
+            # Replace all * with {folder[i]} to make it parsable
+            for i in range(parsable_include.count("*")):
+                parsable_include = parsable_include.replace("*", f"{{folder[{i}]}}", 1)
         return parsable_include
 
     def get_named_vars(self, path: str) -> Union[None, parse.Result, parse.Match]:
+        if self.include.endswith("{table}/**"):
+            # If we have a partial path with ** at the end, we need to truncate the path to parse correctly
+            # parse needs to have exact number of folders to parse correctly and in case of ** we don't know the number of folders
+            # so we need to truncate the path to the last folder before ** to parse and get named vars correctly
+            splits = len(self.include[: self.include.find("{table}/")].split("/"))
+            path = "/".join(path.split("/", splits)[:-1]) + "/"
+
         return self.compiled_include.parse(path)
 
+    def get_folder_named_vars(
+        self, path: str
+    ) -> Union[None, parse.Result, parse.Match]:
+        return self.compiled_folder_include.parse(path)
+
     @pydantic.root_validator()
     def validate_no_double_stars(cls, values: Dict) -> Dict:
         if "include" not in values:
@@ -227,6 +341,125 @@ def compiled_include(self):
         logger.debug(f"Setting compiled_include: {compiled_include}")
         return compiled_include
 
+    @cached_property
+    def compiled_folder_include(self):
+        parsable_folder_include = PathSpec.get_parsable_include(self.include).rsplit(
+            "/", 1
+        )[0]
+        logger.debug(f"parsable_folder_include: {parsable_folder_include}")
+        compiled_folder_include = parse.compile(parsable_folder_include)
+        logger.debug(f"Setting compiled_folder_include: {compiled_folder_include}")
+        return compiled_folder_include
+
+    @cached_property
+    def extract_variable_names(self):
+        # Regular expression to find all substrings enclosed in {}
+        pattern = r"\{(.*?)\}"
+        # Find all matches
+        matches = re.findall(pattern, self.include.split("{table}/")[1])
+        return matches
+
+    def get_partition_from_path(self, path: str) -> Optional[List[Tuple[str, str]]]:
+        # Automatic partition detection supports four methods to get partiton keys and values from path:
+        # Let's say we have the following path => year=2024/month=10/day=11 for this example you can specify the following path spec expressions:
+        #   1. User can specify partition_key and partition_value in the path like => {partition_key[0]}={partition_value[0]}/{partition_key[1]}={partition_value[1]}/{partition_key[2]}={partition_value[2]}
+        #   2. User can specify only partition key and the partition key will be used as partition name like => year={year}/month={month}/day={day}
+        #   3. You omit specifying anything and it will detect partiton key and value based on the equal signs (this only works if partitioned are specified in the key=value way.
+        #   4. if the path is in the form of /value1/value2/value3 we infer it from the path and assign partition_0, partition_1, partition_2 etc
+
+        partition_keys: List[Tuple[str, str]] = []
+        if self.include.find("{table}/"):
+            named_vars = self.get_named_vars(path)
+            if named_vars:
+                # If user has specified partition_key and partition_value in the path_spec then we use it to get partition keys
+                if "partition_key" in named_vars.named and (
+                    (
+                        "partition_value" in named_vars.named
+                        and len(named_vars.named["partition_key"])
+                        == len(named_vars.named["partition_value"])
+                    )
+                    or (
+                        "partition" in named_vars.named
+                        and len(named_vars.named["partition_key"])
+                        == len(named_vars.named["partition"])
+                    )
+                ):
+                    for key in named_vars.named["partition_key"]:
+                        # We need to support both partition_value and partition as both were in our docs
+                        if (
+                            "partition_value" in named_vars
+                            and key in named_vars.named["partition_value"]
+                        ) or (
+                            "partition" in named_vars
+                            and key in named_vars.named["partition"]
+                        ):
+                            partition_keys.append(
+                                (
+                                    named_vars.named["partition_key"][key],
+                                    named_vars.named["partition_value"][key]
+                                    if "partition_value" in named_vars.named
+                                    else named_vars.named["partition"][key],
+                                )
+                            )
+                    return partition_keys
+                else:
+                    # TODO: Fix this message
+                    logger.debug(
+                        "Partition key or value not found. Fallbacking another mechanism to get partition keys"
+                    )
+
+                partition_vars = self.extract_variable_names
+                if partition_vars:
+                    for partition_key in partition_vars:
+                        pkey: str = partition_key
+                        index: Optional[int] = None
+                        # We need to recreate the key and index from the partition_key
+                        if partition_key.find("[") != -1:
+                            pkey, index = partition_key.strip("]").split("[")
+                        else:
+                            pkey = partition_key
+                            index = None
+
+                        if pkey in named_vars.named:
+                            if index and index in named_vars.named[pkey]:
+                                partition_keys.append(
+                                    (f"{pkey}_{index}", named_vars.named[pkey][index])
+                                )
+                            else:
+                                partition_keys.append(
+                                    (partition_key, named_vars.named[partition_key])
+                                )
+                    return partition_keys
+
+            # If user did not specified partition_key and partition_value in the path_spec then we use the default mechanism to get partition keys
+            if len(self.include.split("{table}/")) == 2:
+                num_slash = len(self.include.split("{table}/")[0].split("/"))
+                partition = path.split("/", num_slash)[num_slash]
+            else:
+                return None
+            if partition.endswith("/"):
+                partition = partition[:-1]
+
+            # If partition is in the form of key=value we infer it from the path
+            if partition.find("=") != -1:
+                partition = partition.rsplit("/", 1)[0]
+                for partition_key in partition.split("/"):
+                    if partition_key.find("=") != -1:
+                        partition_keys.append(tuple(partition_key.split("=")))
+            else:
+                partition_split = partition.rsplit("/", 1)
+                if len(partition_split) == 1:
+                    return None
+                partition = partition_split[0]
+                # If partition is in the form of /value1/value2/value3 we infer it from the path and assign partition_0, partition_1, partition_2 etc
+                num = 0
+                for partition_value in partition.split("/"):
+                    partition_keys.append((f"partition_{num}", partition_value))
+                    num += 1
+            return partition_keys
+
+        return None
+
     @cached_property
     def glob_include(self):
         glob_include = re.sub(r"\{[^}]+\}", "*", self.include)
@@ -244,10 +477,23 @@ def validate_path_spec(cls, values: Dict) -> Dict[str, Any]:
                 )
                 return values
 
+        if values["include"] and values["autodetect_partitions"]:
+            include = values["include"]
+            if include.endswith("/"):
+                include = include[:-1]
+
+            if include.endswith("{table}"):
+                values["include"] = include + "/**"
+
         include_ext = os.path.splitext(values["include"])[1].strip(".")
+        if not include_ext:
+            include_ext = (
+                "*"  # if no extension is provided, we assume all files are allowed
+            )
+
         if (
             include_ext not in values["file_types"]
-            and include_ext != "*"
+            and include_ext not in ["*", ""]
             and not values["default_extension"]
             and include_ext not in SUPPORTED_COMPRESSIONS
         ):
@@ -263,6 +509,45 @@ def _extract_table_name(self, named_vars: dict) -> str:
             raise ValueError("path_spec.table_name is not set")
         return self.table_name.format_map(named_vars)
 
+    # TODO: Add support to sort partition folders by the defined partition key pattern. This is not implemented yet.
+    def extract_datetime_partition(
+        self, path: str, is_folder: bool = False
+    ) -> Optional[datetime.datetime]:
+        if self.sort_key is None:
+            return None
+
+        if not self.sort_key.date_format and self.sort_key.type not in [
+            SortKeyType.DATETIME,
+            SortKeyType.DATE,
+        ]:
+            return None
+
+        if is_folder:
+            parsed_vars = self.get_folder_named_vars(path)
+        else:
+            parsed_vars = self.get_named_vars(path)
+        if parsed_vars is None:
+            return None
+
+        partition_format = self.sort_key.key
+        datetime_format = self.sort_key.date_format
+        if datetime_format is None:
+            return None
+
+        for var_key in parsed_vars.named:
+            var = parsed_vars.named[var_key]
+            if isinstance(var, dict):
+                for key in var:
+                    template_key = var_key + f"[{key}]"
+                    partition_format = partition_format.replace(
+                        f"{{{template_key}}}", var[key]
+                    )
+            else:
+                partition_format.replace(f"{{{var_key}}}", var)
+        return datetime.datetime.strptime(partition_format, datetime_format).replace(
+            tzinfo=datetime.timezone.utc
+        )
+
     def extract_table_name_and_path(self, path: str) -> Tuple[str, str]:
         parsed_vars = self.get_named_vars(path)
         if parsed_vars is None or "table" not in parsed_vars.named:
@@ -273,4 +558,4 @@ def extract_table_name_and_path(self, path: str) -> Tuple[str, str]:
             table_path = (
                 "/".join(path.split("/")[:depth]) + "/" + parsed_vars.named["table"]
             )
-            return self._extract_table_name(parsed_vars.named), table_path
+        return self._extract_table_name(parsed_vars.named), table_path
diff --git a/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_cloud.py b/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_cloud.py
index 8a99f096b51676..0672b9ce6f781c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_cloud.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_cloud.py
@@ -40,8 +40,7 @@ class DBTCloudConfig(DBTCommonConfig):
 
     metadata_endpoint: str = Field(
         default="https://metadata.cloud.getdbt.com/graphql",
-        description="The dbt Cloud metadata API endpoint. This is deprecated, and will be removed in a future release. Please use access_url instead.",
-        deprecated=True,
+        description="The dbt Cloud metadata API endpoint. If not provided, we will try to infer it from the access_url.",
     )
 
     token: str = Field(
@@ -66,13 +65,39 @@ class DBTCloudConfig(DBTCommonConfig):
     @root_validator(pre=True)
     def set_metadata_endpoint(cls, values: dict) -> dict:
         if values.get("access_url") and not values.get("metadata_endpoint"):
-            parsed_uri = urlparse(values["access_url"])
-            values[
-                "metadata_endpoint"
-            ] = f"{parsed_uri.scheme}://metadata.{parsed_uri.netloc}/graphql"
+            metadata_endpoint = infer_metadata_endpoint(values["access_url"])
+            if metadata_endpoint is None:
+                raise ValueError(
+                    "Unable to infer the metadata endpoint from the access URL. Please provide a metadata endpoint."
+                )
+            values["metadata_endpoint"] = metadata_endpoint
         return values
 
 
+def infer_metadata_endpoint(access_url: str) -> Optional[str]:
+    # See https://docs.getdbt.com/docs/cloud/about-cloud/access-regions-ip-addresses#api-access-urls
+    # and https://docs.getdbt.com/docs/dbt-cloud-apis/discovery-querying#discovery-api-endpoints
+
+    try:
+        parsed_uri = urlparse(access_url)
+        assert parsed_uri.scheme is not None
+        assert parsed_uri.hostname is not None
+    except Exception as e:
+        logger.debug(f"Unable to parse access URL {access_url}: {e}", exc_info=e)
+        return None
+
+    if parsed_uri.hostname.endswith(".dbt.com"):
+        # For cell-based deployments.
+        # prefix.region.dbt.com -> prefix.metadata.region.dbt.com
+        hostname_parts = parsed_uri.hostname.split(".", maxsplit=1)
+        return f"{parsed_uri.scheme}://{hostname_parts[0]}.metadata.{hostname_parts[1]}/graphql"
+    elif parsed_uri.hostname.endswith(".getdbt.com"):
+        return f"{parsed_uri.scheme}://metadata.{parsed_uri.netloc}/graphql"
+    else:
+        # The self-hosted variants also have the metadata. prefix.
+        return f"{parsed_uri.scheme}://metadata.{parsed_uri.netloc}/graphql"
+
+
 _DBT_GRAPHQL_COMMON_FIELDS = """
   runId
   accountId
diff --git a/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_common.py b/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_common.py
index 9972e9e46369d9..8d67551b9e1f2f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_common.py
@@ -276,6 +276,12 @@ class DBTCommonConfig(
         DBTEntitiesEnabled(),
         description="Controls for enabling / disabling metadata emission for different dbt entities (models, test definitions, test results, etc.)",
     )
+    prefer_sql_parser_lineage: bool = Field(
+        default=False,
+        description="Normally we use dbt's metadata to generate table lineage. When enabled, we prefer results from the SQL parser when generating lineage instead. "
+        "This can be useful when dbt models reference tables directly, instead of using the ref() macro. "
+        "This requires that `skip_sources_in_lineage` is enabled.",
+    )
     skip_sources_in_lineage: bool = Field(
         default=False,
         description="[Experimental] When enabled, dbt sources will not be included in the lineage graph. "
@@ -431,15 +437,27 @@ def validate_include_column_lineage(
 
         return include_column_lineage
 
-    @validator("skip_sources_in_lineage")
+    @validator("skip_sources_in_lineage", always=True)
     def validate_skip_sources_in_lineage(
         cls, skip_sources_in_lineage: bool, values: Dict
     ) -> bool:
-        entites_enabled: Optional[DBTEntitiesEnabled] = values.get("entities_enabled")
+        entities_enabled: Optional[DBTEntitiesEnabled] = values.get("entities_enabled")
+        prefer_sql_parser_lineage: Optional[bool] = values.get(
+            "prefer_sql_parser_lineage"
+        )
+
+        if prefer_sql_parser_lineage and not skip_sources_in_lineage:
+            raise ValueError(
+                "`prefer_sql_parser_lineage` requires that `skip_sources_in_lineage` is enabled."
+            )
+
         if (
             skip_sources_in_lineage
-            and entites_enabled
-            and entites_enabled.sources == EmitDirective.YES
+            and entities_enabled
+            and entities_enabled.sources == EmitDirective.YES
+            # When `prefer_sql_parser_lineage` is enabled, it's ok to have `skip_sources_in_lineage` enabled
+            # without also disabling sources.
+            and not prefer_sql_parser_lineage
         ):
             raise ValueError(
                 "When `skip_sources_in_lineage` is enabled, `entities_enabled.sources` must be set to NO."
@@ -516,6 +534,9 @@ class DBTNode:
     columns: List[DBTColumn] = field(default_factory=list)
     upstream_nodes: List[str] = field(default_factory=list)  # list of upstream dbt_name
     upstream_cll: List[DBTColumnLineageInfo] = field(default_factory=list)
+    raw_sql_parsing_result: Optional[
+        SqlParsingResult
+    ] = None  # only set for nodes that don't depend on ephemeral models
     cll_debug_info: Optional[SqlParsingDebugInfo] = None
 
     meta: Dict[str, Any] = field(default_factory=dict)
@@ -749,23 +770,30 @@ def make_mapping_upstream_lineage(
     downstream_urn: str,
     node: DBTNode,
     convert_column_urns_to_lowercase: bool,
+    skip_sources_in_lineage: bool,
 ) -> UpstreamLineageClass:
     cll = []
-    for column in node.columns or []:
-        field_name = column.name
-        if convert_column_urns_to_lowercase:
-            field_name = field_name.lower()
-
-        cll.append(
-            FineGrainedLineage(
-                upstreamType=FineGrainedLineageUpstreamType.FIELD_SET,
-                upstreams=[mce_builder.make_schema_field_urn(upstream_urn, field_name)],
-                downstreamType=FineGrainedLineageDownstreamType.FIELD,
-                downstreams=[
-                    mce_builder.make_schema_field_urn(downstream_urn, field_name)
-                ],
+    if not (node.node_type == "source" and skip_sources_in_lineage):
+        # If `skip_sources_in_lineage` is enabled, we want to generate table lineage (for siblings)
+        # but not CLL. That's because CLL will make it look like the warehouse node has downstream
+        # column lineage, but it's really just empty.
+        for column in node.columns or []:
+            field_name = column.name
+            if convert_column_urns_to_lowercase:
+                field_name = field_name.lower()
+
+            cll.append(
+                FineGrainedLineage(
+                    upstreamType=FineGrainedLineageUpstreamType.FIELD_SET,
+                    upstreams=[
+                        mce_builder.make_schema_field_urn(upstream_urn, field_name)
+                    ],
+                    downstreamType=FineGrainedLineageDownstreamType.FIELD,
+                    downstreams=[
+                        mce_builder.make_schema_field_urn(downstream_urn, field_name)
+                    ],
+                )
             )
-        )
 
     return UpstreamLineageClass(
         upstreams=[
@@ -829,8 +857,11 @@ def get_column_type(
     # if still not found, report the warning
     if TypeClass is None:
         if column_type:
-            report.report_warning(
-                dataset_name, f"unable to map type {column_type} to metadata schema"
+            report.info(
+                title="Unable to map column types to DataHub types",
+                message="Got an unexpected column type. The column's parsed field type will not be populated.",
+                context=f"{dataset_name} - {column_type}",
+                log=False,
             )
         TypeClass = NullTypeClass
 
@@ -1130,6 +1161,7 @@ def _infer_schemas_and_update_cll(  # noqa: C901
 
             # Run sql parser to infer the schema + generate column lineage.
             sql_result = None
+            depends_on_ephemeral_models = False
             if node.node_type in {"source", "test", "seed"}:
                 # For sources, we generate CLL as a 1:1 mapping.
                 # We don't support CLL for tests (assertions) or seeds.
@@ -1148,6 +1180,8 @@ def _infer_schemas_and_update_cll(  # noqa: C901
                         upstream_node.name, schema_resolver.platform
                     )
                 }
+                if cte_mapping:
+                    depends_on_ephemeral_models = True
 
                 sql_result = self._parse_cll(node, cte_mapping, schema_resolver)
             else:
@@ -1155,8 +1189,12 @@ def _infer_schemas_and_update_cll(  # noqa: C901
 
             # Save the column lineage.
             if self.config.include_column_lineage and sql_result:
-                # We only save the debug info here. We'll report errors based on it later, after
-                # applying the configured node filters.
+                # We save the raw info here. We use this for supporting `prefer_sql_parser_lineage`.
+                if not depends_on_ephemeral_models:
+                    node.raw_sql_parsing_result = sql_result
+
+                # We use this for error reporting. However, we only want to report errors
+                # after node filters are applied.
                 node.cll_debug_info = sql_result.debug_info
 
                 if sql_result.column_lineage:
@@ -1171,6 +1209,7 @@ def _infer_schemas_and_update_cll(  # noqa: C901
                         for column_lineage_info in sql_result.column_lineage
                         for upstream_column in column_lineage_info.upstreams
                         # Only include the CLL if the table in in the upstream list.
+                        # TODO: Add some telemetry around this - how frequently does it filter stuff out?
                         if target_platform_urn_to_dbt_name.get(upstream_column.table)
                         in node.upstream_nodes
                     ]
@@ -1445,6 +1484,7 @@ def create_target_platform_mces(
                     downstream_urn=node_datahub_urn,
                     node=node,
                     convert_column_urns_to_lowercase=self.config.convert_column_urns_to_lowercase,
+                    skip_sources_in_lineage=self.config.skip_sources_in_lineage,
                 )
                 if self.config.incremental_lineage:
                     # We only generate incremental lineage for non-dbt nodes.
@@ -1790,6 +1830,7 @@ def _create_lineage_aspect_for_dbt_node(
                 downstream_urn=node_urn,
                 node=node,
                 convert_column_urns_to_lowercase=self.config.convert_column_urns_to_lowercase,
+                skip_sources_in_lineage=self.config.skip_sources_in_lineage,
             )
         else:
             upstream_urns = get_upstreams(
@@ -1813,33 +1854,76 @@ def _translate_dbt_name_to_upstream_urn(dbt_name: str) -> str:
 
             if node.cll_debug_info and node.cll_debug_info.error:
                 self.report.report_warning(
-                    node.dbt_name,
-                    f"Error parsing SQL to generate column lineage: {node.cll_debug_info.error}",
+                    "Error parsing SQL to generate column lineage",
+                    context=node.dbt_name,
+                    exc=node.cll_debug_info.error,
                 )
-            cll = [
-                FineGrainedLineage(
-                    upstreamType=FineGrainedLineageUpstreamType.FIELD_SET,
-                    downstreamType=FineGrainedLineageDownstreamType.FIELD_SET,
-                    upstreams=[
-                        mce_builder.make_schema_field_urn(
-                            _translate_dbt_name_to_upstream_urn(
-                                upstream_column.upstream_dbt_name
-                            ),
-                            upstream_column.upstream_col,
+
+            cll = None
+            if self.config.prefer_sql_parser_lineage and node.raw_sql_parsing_result:
+                sql_parsing_result = node.raw_sql_parsing_result
+                if sql_parsing_result and not sql_parsing_result.debug_info.table_error:
+                    # If we have some table lineage from SQL parsing, use that.
+                    upstream_urns = sql_parsing_result.in_tables
+
+                    cll = []
+                    for column_lineage in sql_parsing_result.column_lineage or []:
+                        cll.append(
+                            FineGrainedLineage(
+                                upstreamType=FineGrainedLineageUpstreamType.FIELD_SET,
+                                downstreamType=FineGrainedLineageDownstreamType.FIELD,
+                                upstreams=[
+                                    mce_builder.make_schema_field_urn(
+                                        upstream.table, upstream.column
+                                    )
+                                    for upstream in column_lineage.upstreams
+                                ],
+                                downstreams=[
+                                    mce_builder.make_schema_field_urn(
+                                        node_urn, column_lineage.downstream.column
+                                    )
+                                ],
+                                confidenceScore=sql_parsing_result.debug_info.confidence,
+                            )
                         )
-                        for upstream_column in upstreams
-                    ],
-                    downstreams=[
-                        mce_builder.make_schema_field_urn(node_urn, downstream)
-                    ],
-                    confidenceScore=(
-                        node.cll_debug_info.confidence if node.cll_debug_info else None
-                    ),
-                )
-                for downstream, upstreams in itertools.groupby(
-                    node.upstream_cll, lambda x: x.downstream_col
-                )
-            ]
+
+            else:
+                if self.config.prefer_sql_parser_lineage:
+                    if node.upstream_cll:
+                        self.report.report_warning(
+                            "SQL parser lineage is not available for this node, falling back to dbt-based column lineage.",
+                            context=node.dbt_name,
+                        )
+                    else:
+                        # SQL parsing failed entirely, which is already reported above.
+                        pass
+
+                cll = [
+                    FineGrainedLineage(
+                        upstreamType=FineGrainedLineageUpstreamType.FIELD_SET,
+                        downstreamType=FineGrainedLineageDownstreamType.FIELD,
+                        upstreams=[
+                            mce_builder.make_schema_field_urn(
+                                _translate_dbt_name_to_upstream_urn(
+                                    upstream_column.upstream_dbt_name
+                                ),
+                                upstream_column.upstream_col,
+                            )
+                            for upstream_column in upstreams
+                        ],
+                        downstreams=[
+                            mce_builder.make_schema_field_urn(node_urn, downstream)
+                        ],
+                        confidenceScore=(
+                            node.cll_debug_info.confidence
+                            if node.cll_debug_info
+                            else None
+                        ),
+                    )
+                    for downstream, upstreams in itertools.groupby(
+                        node.upstream_cll, lambda x: x.downstream_col
+                    )
+                ]
 
             if not upstream_urns:
                 return None
diff --git a/metadata-ingestion/src/datahub/ingestion/source/dynamodb/dynamodb.py b/metadata-ingestion/src/datahub/ingestion/source/dynamodb/dynamodb.py
index 6cab0ffc8f25c5..acda656526ef53 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/dynamodb/dynamodb.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/dynamodb/dynamodb.py
@@ -166,11 +166,6 @@ def report_dropped(self, name: str) -> None:
     SourceCapability.PLATFORM_INSTANCE,
     "By default, platform_instance will use the AWS account id",
 )
-@capability(
-    SourceCapability.DELETION_DETECTION,
-    "Optionally enabled via `stateful_ingestion.remove_stale_metadata`",
-    supported=True,
-)
 class DynamoDBSource(StatefulIngestionSourceBase):
     """
     This plugin extracts the following:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/feast.py b/metadata-ingestion/src/datahub/ingestion/source/feast.py
index db0c8e9c39e7bf..e097fd1f221ea5 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/feast.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/feast.py
@@ -96,6 +96,8 @@ class FeastRepositorySourceConfig(ConfigModel):
 @platform_name("Feast")
 @config_class(FeastRepositorySourceConfig)
 @support_status(SupportStatus.CERTIFIED)
+@capability(SourceCapability.DESCRIPTIONS, "Enabled by default")
+@capability(SourceCapability.SCHEMA_METADATA, "Enabled by default")
 @capability(SourceCapability.LINEAGE_COARSE, "Enabled by default")
 @dataclass
 class FeastRepositorySource(Source):
diff --git a/metadata-ingestion/src/datahub/ingestion/source/fivetran/config.py b/metadata-ingestion/src/datahub/ingestion/source/fivetran/config.py
index f8b1c6dd93d6d9..02eb096b240f52 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/fivetran/config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/fivetran/config.py
@@ -161,6 +161,10 @@ class FivetranSourceConfig(StatefulIngestionConfigBase, DatasetSourceConfigMixin
         default=AllowDenyPattern.allow_all(),
         description="Regex patterns for connectors to filter in ingestion.",
     )
+    destination_patterns: AllowDenyPattern = Field(
+        default=AllowDenyPattern.allow_all(),
+        description="Regex patterns for destinations to filter in ingestion.",
+    )
     include_column_lineage: bool = Field(
         default=True,
         description="Populates table->table column lineage.",
diff --git a/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran.py b/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran.py
index c899fe04d2c48e..b459b47deb153a 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran.py
@@ -283,6 +283,7 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
         logger.info("Fivetran plugin execution is started")
         connectors = self.audit_log.get_allowed_connectors_list(
             self.config.connector_patterns,
+            self.config.destination_patterns,
             self.report,
             self.config.history_sync_lookback_period,
         )
diff --git a/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran_log_api.py b/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran_log_api.py
index d8ce68e8345ec7..31c16139066e43 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran_log_api.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran_log_api.py
@@ -251,6 +251,7 @@ def _fill_connectors_jobs(
     def get_allowed_connectors_list(
         self,
         connector_patterns: AllowDenyPattern,
+        destination_patterns: AllowDenyPattern,
         report: FivetranSourceReport,
         syncs_interval: int,
     ) -> List[Connector]:
@@ -261,6 +262,9 @@ def get_allowed_connectors_list(
                 if not connector_patterns.allowed(connector[Constant.CONNECTOR_NAME]):
                     report.report_connectors_dropped(connector[Constant.CONNECTOR_NAME])
                     continue
+                if not destination_patterns.allowed(connector[Constant.DESTINATION_ID]):
+                    report.report_connectors_dropped(connector[Constant.CONNECTOR_NAME])
+                    continue
                 connectors.append(
                     Connector(
                         connector_id=connector[Constant.CONNECTOR_ID],
diff --git a/metadata-ingestion/src/datahub/ingestion/source/glue_profiling_config.py b/metadata-ingestion/src/datahub/ingestion/source/glue_profiling_config.py
index c0001f0d37531d..115d194da59587 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/glue_profiling_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/glue_profiling_config.py
@@ -7,6 +7,14 @@
 
 
 class GlueProfilingConfig(ConfigModel):
+    enabled: bool = Field(
+        default=False,
+        description="Whether profiling should be done.",
+    )
+    profile_table_level_only: bool = Field(
+        default=False,
+        description="Whether to perform profiling at table-level only, or include column-level profiling as well.",
+    )
     row_count: Optional[str] = Field(
         default=None,
         description="The parameter name for row count in glue table.",
diff --git a/metadata-ingestion/src/datahub/ingestion/source/kafka.py b/metadata-ingestion/src/datahub/ingestion/source/kafka.py
index 0d718e509d5c58..a757250a0d6c85 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/kafka.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/kafka.py
@@ -2,7 +2,6 @@
 import json
 import logging
 from dataclasses import dataclass, field
-from enum import Enum
 from typing import Any, Dict, Iterable, List, Optional, Type, cast
 
 import avro.schema
@@ -73,11 +72,12 @@
 )
 from datahub.utilities.mapping import Constants, OperationProcessor
 from datahub.utilities.registries.domain_registry import DomainRegistry
+from datahub.utilities.str_enum import StrEnum
 
 logger = logging.getLogger(__name__)
 
 
-class KafkaTopicConfigKeys(str, Enum):
+class KafkaTopicConfigKeys(StrEnum):
     MIN_INSYNC_REPLICAS_CONFIG = "min.insync.replicas"
     RETENTION_SIZE_CONFIG = "retention.bytes"
     RETENTION_TIME_CONFIG = "retention.ms"
diff --git a/metadata-ingestion/src/datahub/ingestion/source/kafka_connect.py b/metadata-ingestion/src/datahub/ingestion/source/kafka_connect.py
index 17047457e0eba0..266f9f6db57620 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/kafka_connect.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/kafka_connect.py
@@ -1125,6 +1125,7 @@ def transform_connector_config(
 @config_class(KafkaConnectSourceConfig)
 @support_status(SupportStatus.CERTIFIED)
 @capability(SourceCapability.PLATFORM_INSTANCE, "Enabled by default")
+@capability(SourceCapability.SCHEMA_METADATA, "Enabled by default")
 @capability(SourceCapability.LINEAGE_COARSE, "Enabled by default")
 class KafkaConnectSource(StatefulIngestionSourceBase):
     config: KafkaConnectSourceConfig
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py
index bcf6d380a60fd0..bfae3060013d59 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py
@@ -298,6 +298,16 @@ class LookerDashboardSourceConfig(
         description="When enabled, platform instance will be added in dashboard and chart urn.",
     )
 
+    folder_path_pattern: AllowDenyPattern = Field(
+        default=AllowDenyPattern.allow_all(),
+        description="Allow or deny dashboards from specific folders. "
+        "For example: \n"
+        "deny: \n"
+        " - sales/deprecated \n"
+        "This pattern will deny the ingestion of all dashboards and looks within the sales/deprecated folder. \n"
+        "Dashboards will only be ingested if they're allowed by both this config and dashboard_pattern.",
+    )
+
     @validator("external_base_url", pre=True, always=True)
     def external_url_defaults_to_api_config_base_url(
         cls, v: Optional[str], *, values: Dict[str, Any], **kwargs: Dict[str, Any]
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_constant.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_constant.py
index 21160cc97d4a62..920efeaa709e59 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_constant.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_constant.py
@@ -1 +1,13 @@
 IMPORTED_PROJECTS = "imported_projects"
+DIMENSIONS = "dimensions"
+MEASURES = "measures"
+DIMENSION_GROUPS = "dimension_groups"
+SQL_TABLE_NAME = "sql_table_name"
+DATAHUB_TRANSFORMED_SQL_TABLE_NAME = "datahub_transformed_sql_table_name"
+DERIVED_TABLE = "derived_table"
+SQL = "sql"
+DATAHUB_TRANSFORMED_SQL = "datahub_transformed_sql"
+prod = "prod"
+dev = "dev"
+NAME = "name"
+DERIVED_DOT_SQL = "derived.sql"
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_file_loader.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_file_loader.py
index bc069bd1e59ac4..52ebcdde06a279 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_file_loader.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_file_loader.py
@@ -1,17 +1,18 @@
 import logging
 import pathlib
 from dataclasses import replace
-from typing import Any, Dict, Optional
+from typing import Dict, Optional
 
 from datahub.ingestion.source.looker.lkml_patched import load_lkml
 from datahub.ingestion.source.looker.looker_config import LookerConnectionDefinition
 from datahub.ingestion.source.looker.looker_dataclasses import LookerViewFile
 from datahub.ingestion.source.looker.looker_template_language import (
-    resolve_liquid_variable_in_view_dict,
+    process_lookml_template_language,
 )
 from datahub.ingestion.source.looker.lookml_config import (
     _EXPLORE_FILE_EXTENSION,
     _VIEW_FILE_EXTENSION,
+    LookMLSourceConfig,
     LookMLSourceReport,
 )
 
@@ -29,13 +30,13 @@ def __init__(
         root_project_name: Optional[str],
         base_projects_folder: Dict[str, pathlib.Path],
         reporter: LookMLSourceReport,
-        liquid_variable: Dict[Any, Any],
+        source_config: LookMLSourceConfig,
     ) -> None:
         self.viewfile_cache: Dict[str, Optional[LookerViewFile]] = {}
         self._root_project_name = root_project_name
         self._base_projects_folder = base_projects_folder
         self.reporter = reporter
-        self.liquid_variable = liquid_variable
+        self.source_config = source_config
 
     def _load_viewfile(
         self, project_name: str, path: str, reporter: LookMLSourceReport
@@ -60,7 +61,12 @@ def _load_viewfile(
             with open(path) as file:
                 raw_file_content = file.read()
         except Exception as e:
-            self.reporter.failure("Failed to read lkml file", path, exc=e)
+            self.reporter.failure(
+                title="LKML File Loading Error",
+                message="A lookml file is not present on local storage or GitHub",
+                context=f"file path: {path}",
+                exc=e,
+            )
             self.viewfile_cache[path] = None
             return None
         try:
@@ -68,9 +74,9 @@ def _load_viewfile(
 
             parsed = load_lkml(path)
 
-            resolve_liquid_variable_in_view_dict(
-                raw_view=parsed,
-                liquid_variable=self.liquid_variable,
+            process_lookml_template_language(
+                view_lkml_file_dict=parsed,
+                source_config=self.source_config,
             )
 
             looker_viewfile = LookerViewFile.from_looker_dict(
@@ -86,8 +92,19 @@ def _load_viewfile(
             self.viewfile_cache[path] = looker_viewfile
             return looker_viewfile
         except Exception as e:
-            self.reporter.failure("Failed to parse lkml file", path, exc=e)
+            self.reporter.failure(
+                title="LKML File Parsing Error",
+                message="The input file is not lookml file",
+                context=f"file path: {path}",
+                exc=e,
+            )
+
+            logger.debug(f"Raw file content for path {path}")
+
+            logger.debug(raw_file_content)
+
             self.viewfile_cache[path] = None
+
             return None
 
     def load_viewfile(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_liquid_tag.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_liquid_tag.py
index 35231d273fbba4..7d4ebf00cc06ef 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_liquid_tag.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_liquid_tag.py
@@ -1,5 +1,5 @@
 from functools import lru_cache
-from typing import ClassVar, Optional, TextIO, cast
+from typing import ClassVar, Optional, TextIO
 
 from liquid import Environment
 from liquid.ast import Node
@@ -25,18 +25,9 @@ def __init__(self, tok: Token, sql_or_lookml_reference: str, filter_name: str):
         self.filter_name = filter_name
 
     def render_to_output(self, context: Context, buffer: TextIO) -> Optional[bool]:
-        filter_value: Optional[str] = cast(
-            str, context.globals.get(self.filter_name)
-        )  # to silent lint
-
-        if filter_value is None:
-            raise CustomTagException(
-                f'filter {self.filter_name} value is not provided for "condition" tag'
-            )
-
-        filter_value = filter_value.strip()
-
-        buffer.write(f"{self.sql_or_lookml_reference}='{filter_value}'")
+        # This implementation will make sure that sql parse work correctly if looker condition tag
+        # is used in lookml sql field
+        buffer.write(f"{self.sql_or_lookml_reference}='dummy_value'")
 
         return True
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_query_model.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_query_model.py
index b3002828ceefff..7ed46c8f7084cf 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_query_model.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_query_model.py
@@ -1,13 +1,9 @@
 from dataclasses import dataclass, field
-from enum import Enum
 from typing import Dict, List, cast
 
 from looker_sdk.sdk.api40.models import WriteQuery
 
-
-# Enum whose value is string and compatible with dictionary having string value as key
-class StrEnum(str, Enum):
-    pass
+from datahub.utilities.str_enum import StrEnum
 
 
 class LookerModel(StrEnum):
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_source.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_source.py
index 53f2e1fefce7b3..2d5250cfb74fa5 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_source.py
@@ -96,13 +96,11 @@
     ChartTypeClass,
     ContainerClass,
     DashboardInfoClass,
-    DataPlatformInfoClass,
     InputFieldClass,
     InputFieldsClass,
     OwnerClass,
     OwnershipClass,
     OwnershipTypeClass,
-    PlatformTypeClass,
     SubTypesClass,
 )
 from datahub.utilities.backpressure_aware_executor import BackpressureAwareExecutor
@@ -597,19 +595,21 @@ def _get_chart_type(
         }
         type_str = dashboard_element.type
         if not type_str:
-            self.reporter.report_warning(
+            self.reporter.info(
                 title="Unrecognized Chart Type",
-                message=f"Chart type {type_str} is not recognized. Setting to None",
-                context=f"Dashboard Id: {dashboard_element.id}",
+                message="Chart is missing a chart type.",
+                context=f"Chart Id: {dashboard_element.id}",
+                log=False,
             )
             return None
         try:
             chart_type = type_mapping[type_str]
         except KeyError:
-            self.reporter.report_warning(
+            self.reporter.info(
                 title="Unrecognized Chart Type",
                 message=f"Chart type {type_str} is not recognized. Setting to None",
-                context=f"Dashboard Id: {dashboard_element.id}",
+                context=f"Chart Id: {dashboard_element.id}",
+                log=False,
             )
             chart_type = None
 
@@ -1334,6 +1334,17 @@ def process_dashboard(
         looker_dashboard = self._get_looker_dashboard(dashboard_object)
 
         workunits = []
+        if (
+            looker_dashboard.folder_path is not None
+            and not self.source_config.folder_path_pattern.allowed(
+                looker_dashboard.folder_path
+            )
+        ):
+            logger.debug(
+                f"Folder path {looker_dashboard.folder_path} is denied in folder_path_pattern"
+            )
+            return [], None, dashboard_id, start_time, datetime.datetime.now()
+
         if looker_dashboard.folder:
             workunits += list(
                 self._get_folder_and_ancestors_workunits(looker_dashboard.folder)
@@ -1571,25 +1582,6 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
 
         looker_dashboards_for_usage: List[looker_usage.LookerDashboardForUsage] = []
 
-        # Emit platform instance entity
-        if self.source_config.platform_instance:
-            platform_instance_urn = builder.make_dataplatform_instance_urn(
-                platform=self.source_config.platform_name,
-                instance=self.source_config.platform_instance,
-            )
-
-            yield MetadataWorkUnit(
-                id=f"{platform_instance_urn}-aspect-dataplatformInfo",
-                mcp=MetadataChangeProposalWrapper(
-                    entityUrn=platform_instance_urn,
-                    aspect=DataPlatformInfoClass(
-                        name=self.source_config.platform_instance,
-                        type=PlatformTypeClass.OTHERS,
-                        datasetNameDelimiter=".",
-                    ),
-                ),
-            )
-
         with self.reporter.report_stage("dashboard_chart_metadata"):
             for job in BackpressureAwareExecutor.map(
                 self.process_dashboard,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_template_language.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_template_language.py
index 919d9232a18c5c..04f9ec081ee680 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_template_language.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_template_language.py
@@ -1,16 +1,30 @@
 import logging
 import re
-from typing import Any, ClassVar, Dict, Set
+from abc import ABC, abstractmethod
+from typing import Any, ClassVar, Dict, List, Optional, Set
 
+from deepmerge import always_merger
 from liquid import Undefined
 from liquid.exceptions import LiquidSyntaxError
 
+from datahub.ingestion.source.looker.looker_constant import (
+    DATAHUB_TRANSFORMED_SQL,
+    DATAHUB_TRANSFORMED_SQL_TABLE_NAME,
+    DERIVED_DOT_SQL,
+    DERIVED_TABLE,
+    NAME,
+    SQL,
+    SQL_TABLE_NAME,
+    dev,
+    prod,
+)
 from datahub.ingestion.source.looker.looker_liquid_tag import (
     CustomTagException,
     create_template,
 )
-from datahub.ingestion.source.looker.str_functions import (
-    remove_extra_spaces_and_newlines,
+from datahub.ingestion.source.looker.lookml_config import (
+    DERIVED_VIEW_PATTERN,
+    LookMLSourceConfig,
 )
 
 logger = logging.getLogger(__name__)
@@ -94,22 +108,311 @@ def resolve_liquid_variable(text: str, liquid_variable: Dict[Any, Any]) -> str:
     return text
 
 
-def resolve_liquid_variable_in_view_dict(
-    raw_view: dict, liquid_variable: Dict[Any, Any]
-) -> None:
-    if "views" not in raw_view:
-        return
+class LookMLViewTransformer(ABC):
+    """
+    There are many transformations that we need to perform on the LookML view to make it suitable for metadata ingestion.
+
+    These transformations include:
+
+    1. Evaluating Looker templates, such as `-- if prod --` comments. Example `LookMlIfCommentTransformer`.
+
+    2. Resolving Liquid templates. Example `LiquidVariableTransformer`.
+
+    3. Removing ${} from derived view patterns. Example `DropDerivedViewPatternTransformer`.
+       (e.g., changing ${view_name.SQL_TABLE_NAME} to 4. view_name.SQL_TABLE_NAME).
+
+    4. Completing incomplete SQL fragments. Example `IncompleteSqlTransformer`.
+
+    Each transformer works on specific attributes of the LookML view. For example, the #4 transformation is only
+    applicable to the view.derived.sql attribute, while the other transformations apply to both the
+    view.sql_table_name and view.derived.sql attributes.
+
+    This class contains the logic to ensure that the transformer is applied to specific attributes and returns a
+    dictionary containing the transformed data.
+
+    For example:
+    In case of #1 and #2, it returns:
 
-    for view in raw_view["views"]:
-        if "sql_table_name" in view:
-            view["sql_table_name"] = resolve_liquid_variable(
-                text=remove_extra_spaces_and_newlines(view["sql_table_name"]),
-                liquid_variable=liquid_variable,
+        **transformed derived_table:**
+        ```
+        {
+            "derived_table": {
+                "datahub_transformed_sql": "<transformed value of derived_table.sql attribute>"
+            }
+        }
+        ```
+
+        **Whereas original was:**
+        ```
+        {
+            "derived_table": {
+                "sql": "<Sql text with liquid or lookml template language>"
+            }
+        }
+        ```
+
+    In case #3, it returns:
+        **transformed sql_table_name:**
+        ```
+        {
+            "datahub_transformed_sql_table_name": "employee_income_source.SQL_TABLE_NAME"
+        }
+        ```
+
+        **Whereas original was:**
+        ```
+        {
+            "sql_table_name": "${employee_income_source.SQL_TABLE_NAME}"
+        }
+        ```
+
+    In case #4, it returns:
+        **transformed derived_table:**
+        ```
+        {
+            "derived_table": {
+                "datahub_transformed_sql": "SELECT column_a, column_b FROM foo"
+            }
+        }
+        ```
+
+        **Whereas original was:**
+        ```
+        {
+            "derived_table": {
+                "sql": "column_a, column_b"
+            }
+        }
+        ```
+
+    Each transformation generates a section of the transformed dictionary with a new attribute named
+    `datahub_transformed_<original-attribute-name>`.
+    """
+
+    source_config: LookMLSourceConfig
+
+    def __init__(self, source_config: LookMLSourceConfig):
+        self.source_config = source_config
+
+    def transform(self, view: dict) -> dict:
+        value_to_transform: Optional[str] = None
+
+        # is_attribute_supported check is required because not all transformer works on all attributes in current
+        # case mostly all transformer works on sql_table_name and derived.sql attributes,
+        # however IncompleteSqlTransformer only transform the derived.sql attribute
+        if SQL_TABLE_NAME in view and self.is_attribute_supported(SQL_TABLE_NAME):
+            # Give precedence to already processed transformed view.sql_table_name to apply more transformation
+            value_to_transform = view.get(
+                DATAHUB_TRANSFORMED_SQL_TABLE_NAME, view[SQL_TABLE_NAME]
             )
 
-        if "derived_table" in view and "sql" in view["derived_table"]:
-            # In sql we don't need to remove the extra spaces as sql parser takes care of extra spaces and \n
-            # while generating URN from sql
-            view["derived_table"]["sql"] = resolve_liquid_variable(
-                text=view["derived_table"]["sql"], liquid_variable=liquid_variable
+        if (
+            DERIVED_TABLE in view
+            and SQL in view[DERIVED_TABLE]
+            and self.is_attribute_supported(DERIVED_DOT_SQL)
+        ):
+            # Give precedence to already processed transformed view.derived.sql to apply more transformation
+            value_to_transform = view[DERIVED_TABLE].get(
+                DATAHUB_TRANSFORMED_SQL, view[DERIVED_TABLE][SQL]
             )
+
+        if value_to_transform is None:
+            return {}
+
+        logger.debug(f"value to transform = {value_to_transform}")
+
+        transformed_value: str = self._apply_transformation(
+            value=value_to_transform, view=view
+        )
+
+        logger.debug(f"transformed value = {transformed_value}")
+
+        if SQL_TABLE_NAME in view and value_to_transform:
+            return {DATAHUB_TRANSFORMED_SQL_TABLE_NAME: transformed_value}
+
+        if DERIVED_TABLE in view and SQL in view[DERIVED_TABLE] and value_to_transform:
+            return {DERIVED_TABLE: {DATAHUB_TRANSFORMED_SQL: transformed_value}}
+
+        return {}
+
+    @abstractmethod
+    def _apply_transformation(self, value: str, view: dict) -> str:
+        pass
+
+    def is_attribute_supported(self, attribute: str) -> bool:
+        return attribute in [DERIVED_DOT_SQL, SQL_TABLE_NAME]
+
+
+class LiquidVariableTransformer(LookMLViewTransformer):
+    """
+    Replace the liquid variables with their values.
+    """
+
+    def _apply_transformation(self, value: str, view: dict) -> str:
+        return resolve_liquid_variable(
+            text=value,
+            liquid_variable=self.source_config.liquid_variable,
+        )
+
+
+class IncompleteSqlTransformer(LookMLViewTransformer):
+    """
+    lookml view may contain the fragment of sql, however for lineage generation we need a complete sql.
+    IncompleteSqlTransformer will complete the view's derived.sql.
+    """
+
+    def is_attribute_supported(self, attribute: str) -> bool:
+        return attribute in [DERIVED_DOT_SQL]
+
+    def _apply_transformation(self, value: str, view: dict) -> str:
+        if DERIVED_TABLE not in view or SQL not in view[DERIVED_TABLE]:
+            # This transformation is only applicable in-case of view contains view.derived.sql
+            return value
+
+        # Looker supports sql fragments that omit the SELECT and FROM parts of the query
+        # Add those in if we detect that it is missing
+        sql_query: str = value
+
+        if not re.search(r"SELECT\s", sql_query, flags=re.I):
+            # add a SELECT clause at the beginning
+            sql_query = f"SELECT {sql_query}"
+
+        if not re.search(r"FROM\s", sql_query, flags=re.I):
+            # add a FROM clause at the end
+            sql_query = f"{sql_query} FROM {view[NAME]}"
+
+        return sql_query
+
+
+class DropDerivedViewPatternTransformer(LookMLViewTransformer):
+    """
+    drop ${} from datahub_transformed_sql_table_name and  view["derived_table"]["datahub_transformed_sql_table_name"] values.
+
+    Example: transform ${employee_income_source.SQL_TABLE_NAME} to employee_income_source.SQL_TABLE_NAME
+    """
+
+    def _apply_transformation(self, value: str, view: dict) -> str:
+        return re.sub(
+            DERIVED_VIEW_PATTERN,
+            r"\1",
+            value,
+        )
+
+
+class LookMlIfCommentTransformer(LookMLViewTransformer):
+    """
+    Evaluate the looker -- if -- comments.
+    """
+
+    evaluate_to_true_regx: str
+    remove_if_comment_line_regx: str
+
+    def __init__(self, source_config: LookMLSourceConfig):
+        super().__init__(source_config=source_config)
+
+        # This regx will keep whatever after -- if looker_environment --
+        self.evaluate_to_true_regx = r"-- if {} --".format(
+            self.source_config.looker_environment
+        )
+
+        # It will remove all other lines starts with -- if ... --
+        self.remove_if_comment_line_regx = r"-- if {} --.*?(?=\n|-- if|$)".format(
+            dev if self.source_config.looker_environment.lower() == prod else prod
+        )
+
+    def _apply_regx(self, value: str) -> str:
+        result: str = re.sub(
+            self.remove_if_comment_line_regx, "", value, flags=re.IGNORECASE | re.DOTALL
+        )
+
+        # Remove '-- if prod --' but keep the rest of the line
+        result = re.sub(self.evaluate_to_true_regx, "", result, flags=re.IGNORECASE)
+
+        return result
+
+    def _apply_transformation(self, value: str, view: dict) -> str:
+        return self._apply_regx(value)
+
+
+class TransformedLookMlView:
+    """
+    TransformedLookMlView is collecting output of LookMLViewTransformer and creating a new transformed LookML view.
+    TransformedLookMlView creates a copy of the original view dictionary and updates the copy with the transformed output.
+    The deepmerge library is used because Python's dict.update function doesn't merge nested fields.
+
+    The transformed LookML view will contain the following attributes:
+
+    ```
+    {
+        "derived_table": {
+            "sql": "<original sql with looker template language",
+            "datahub_transformed_sql": "<transformed sql>"
+        },
+
+        dimensions .....
+    }
+    ```
+    see documentation of LookMLViewTransformer for output of each transformer.
+    """
+
+    transformers: List[LookMLViewTransformer]
+    view_dict: dict
+    transformed_dict: dict
+
+    def __init__(
+        self,
+        transformers: List[LookMLViewTransformer],
+        view_dict: dict,
+    ):
+        self.transformers = transformers
+        self.view_dict = view_dict
+        self.transformed_dict = {}
+
+    def view(self) -> dict:
+        if self.transformed_dict:
+            return self.transformed_dict
+
+        self.transformed_dict = {**self.view_dict}
+
+        logger.debug(f"Processing view {self.view_dict[NAME]}")
+
+        for transformer in self.transformers:
+            logger.debug(f"Applying transformer {transformer.__class__.__name__}")
+
+            self.transformed_dict = always_merger.merge(
+                self.transformed_dict, transformer.transform(self.transformed_dict)
+            )
+
+        return self.transformed_dict
+
+
+def process_lookml_template_language(
+    source_config: LookMLSourceConfig,
+    view_lkml_file_dict: dict,
+) -> None:
+    if "views" not in view_lkml_file_dict:
+        return
+
+    transformers: List[LookMLViewTransformer] = [
+        LookMlIfCommentTransformer(
+            source_config=source_config
+        ),  # First evaluate the -- if -- comments. Looker does the same
+        LiquidVariableTransformer(
+            source_config=source_config
+        ),  # Now resolve liquid variables
+        DropDerivedViewPatternTransformer(
+            source_config=source_config
+        ),  # Remove any ${} symbol
+        IncompleteSqlTransformer(
+            source_config=source_config
+        ),  # complete any incomplete sql
+    ]
+
+    transformed_views: List[dict] = []
+
+    for view in view_lkml_file_dict["views"]:
+        transformed_views.append(
+            TransformedLookMlView(transformers=transformers, view_dict=view).view()
+        )
+
+    view_lkml_file_dict["views"] = transformed_views
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_concept_context.py b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_concept_context.py
index e528e578dcf9fa..bf24f4b84679b1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_concept_context.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_concept_context.py
@@ -8,19 +8,59 @@
     find_view_from_resolved_includes,
 )
 from datahub.ingestion.source.looker.looker_config import LookerConnectionDefinition
+from datahub.ingestion.source.looker.looker_constant import (
+    DIMENSION_GROUPS,
+    DIMENSIONS,
+    MEASURES,
+)
 from datahub.ingestion.source.looker.looker_dataclasses import LookerViewFile
 from datahub.ingestion.source.looker.looker_file_loader import LookerViewFileLoader
 from datahub.ingestion.source.looker.lookml_config import (
-    DERIVED_VIEW_PATTERN,
     DERIVED_VIEW_SUFFIX,
     NAME,
     LookMLSourceReport,
 )
 from datahub.ingestion.source.looker.lookml_refinement import LookerRefinementResolver
+from datahub.ingestion.source.looker.str_functions import (
+    remove_extra_spaces_and_newlines,
+)
 
 logger = logging.getLogger(__name__)
 
 
+def merge_parent_and_child_fields(
+    child_fields: List[dict], parent_fields: List[dict]
+) -> List[Dict]:
+    # Fetch the fields from the parent view, i.e., the view name mentioned in view.extends, and include those
+    # fields in child_fields. This inclusion will resolve the fields according to the precedence rules mentioned
+    # in the LookML documentation: https://cloud.google.com/looker/docs/reference/param-view-extends.
+
+    # Create a map field-name vs field
+    child_field_map: dict = {}
+    for field in child_fields:
+        assert (
+            NAME in field
+        ), "A lookml view must have a name field"  # name is required field of lookml field array
+
+        child_field_map[field[NAME]] = field
+
+    for field in parent_fields:
+        assert (
+            NAME in field
+        ), "A lookml view must have a name field"  # name is required field of lookml field array
+
+        if field[NAME] in child_field_map:
+            # Fields defined in the child view take higher precedence.
+            # This is an override case where the child has redefined the parent field.
+            # There are some additive attributes; however, we are not consuming them in metadata ingestion
+            # and hence not adding them to the child field.
+            continue
+
+        child_fields.append(field)
+
+    return child_fields
+
+
 class LookerFieldContext:
     raw_field: Dict[Any, Any]
 
@@ -56,7 +96,7 @@ def column_name_in_sql_attribute(self) -> List[str]:
 
 class LookerViewContext:
     """
-    There are six patterns to associate the view's fields with dataset
+    There are seven patterns to associate the view's fields with dataset
 
     Pattern1:
         view: view_name {
@@ -161,6 +201,36 @@ class LookerViewContext:
     For all possible options of "sql" attribute please refer looker doc:
     https://cloud.google.com/looker/docs/reference/param-field-sql
 
+    For pattern 6 i.e. view.derived.sql, The looker creates a temporary table to store the sql result,
+    However if we don't want to have a temporary table and want looker to always execute the sql to fetch the result then
+    in that case pattern 7 is useful (mentioned below).
+
+    Pattern7:
+        view: customer_sales {
+          sql_table_name: (
+            SELECT
+              customer_id,
+              SUM(sales_amount) AS total_sales
+            FROM
+              sales
+            GROUP BY
+              customer_id
+          ) ;;
+
+          dimension: customer_id {
+            sql: ${TABLE}.customer_id ;;
+          }
+
+          measure: total_sales {
+            type: sum
+            sql: ${TABLE}.total_sales ;;
+          }
+        }
+
+
+    In Pattern7 the fields' upstream dataset is the output of sql mentioned in
+    customer_sales.sql_table_name.
+
     """
 
     raw_view: Dict
@@ -216,23 +286,21 @@ def resolve_extends_view_name(
             )
             return None
 
-    def get_including_extends(
+    def _get_parent_attribute(
         self,
-        field: str,
+        attribute_name: str,
     ) -> Optional[Any]:
+        """
+        Search for the attribute_name in the parent views of the current view and return its value.
+        """
         extends = list(
             itertools.chain.from_iterable(
                 self.raw_view.get("extends", self.raw_view.get("extends__all", []))
             )
         )
 
-        # First, check the current view.
-        if field in self.raw_view:
-            return self.raw_view[field]
-
-        # The field might be defined in another view and this view is extending that view,
-        # so we resolve this field while taking that into account.
-        # following Looker's precedence rules.
+        # Following Looker's precedence rules.
+        # reversed the view-names mentioned in `extends` attribute
         for extend in reversed(extends):
             assert extend != self.raw_view[NAME], "a view cannot extend itself"
             extend_view = self.resolve_extends_view_name(
@@ -243,8 +311,33 @@ def get_including_extends(
                     f"failed to resolve extends view {extend} in view {self.raw_view[NAME]} of"
                     f" file {self.view_file.absolute_file_path}"
                 )
-            if field in extend_view:
-                return extend_view[field]
+            if attribute_name in extend_view:
+                return extend_view[attribute_name]
+
+        return None
+
+    def get_including_extends(
+        self,
+        field: str,
+    ) -> Optional[Any]:
+
+        # According to Looker's inheritance rules, we need to merge the fields(i.e. dimensions, measures and
+        # dimension_groups) from both the child and parent.
+        if field in [DIMENSIONS, DIMENSION_GROUPS, MEASURES]:
+            # Get the child fields
+            child_fields = self._get_list_dict(field)
+            # merge parent and child fields
+            return merge_parent_and_child_fields(
+                child_fields=child_fields,
+                parent_fields=self._get_parent_attribute(attribute_name=field) or [],
+            )
+        else:
+            # Return the field from the current view if it exists.
+            if field in self.raw_view:
+                return self.raw_view[field]
+
+            # The field might be defined in another view, and this view is extending that view,
+            return self._get_parent_attribute(field)
 
         return None
 
@@ -252,6 +345,7 @@ def _get_sql_table_name_field(self) -> Optional[str]:
         return self.get_including_extends(field="sql_table_name")
 
     def _is_dot_sql_table_name_present(self) -> bool:
+
         sql_table_name: Optional[str] = self._get_sql_table_name_field()
 
         if sql_table_name is None:
@@ -266,15 +360,25 @@ def sql_table_name(self) -> str:
         sql_table_name: Optional[str] = self._get_sql_table_name_field()
         # if sql_table_name field is not set then the table name is equal to view-name
         if sql_table_name is None:
-            return self.raw_view[NAME].lower()
+            sql_table_name = self.raw_view[NAME].lower()
+
+        return sql_table_name.lower()
+
+    def datahub_transformed_sql_table_name(self) -> str:
+        table_name: Optional[str] = self.raw_view.get(
+            "datahub_transformed_sql_table_name"
+        )
+
+        if not table_name:
+            table_name = self.sql_table_name()
 
-        # sql_table_name is in the format "${view-name}.SQL_TABLE_NAME"
-        # remove extra characters
-        if self._is_dot_sql_table_name_present():
-            sql_table_name = re.sub(DERIVED_VIEW_PATTERN, r"\1", sql_table_name)
+        # remove extra spaces and new lines from sql_table_name if it is not a sql
+        if not self.is_direct_sql_query_case():
+            # Some sql_table_name fields contain quotes like: optimizely."group", just remove the quotes
+            table_name = table_name.replace('"', "").replace("`", "").lower()
+            table_name = remove_extra_spaces_and_newlines(table_name).strip()
 
-        # Some sql_table_name fields contain quotes like: optimizely."group", just remove the quotes
-        return sql_table_name.replace('"', "").replace("`", "").lower()
+        return table_name
 
     def derived_table(self) -> Dict[Any, Any]:
         """
@@ -296,30 +400,21 @@ def explore_source(self) -> Dict[Any, Any]:
 
         return derived_table["explore_source"]
 
-    def sql(self, transformed: bool = True) -> str:
+    def sql(self) -> str:
         """
         This function should only be called if is_sql_based_derived_case return true
         """
         derived_table = self.derived_table()
 
-        # Looker supports sql fragments that omit the SELECT and FROM parts of the query
-        # Add those in if we detect that it is missing
-        sql_query: str = derived_table["sql"]
-
-        if transformed:  # update the original sql attribute only if transformed is true
-            if not re.search(r"SELECT\s", sql_query, flags=re.I):
-                # add a SELECT clause at the beginning
-                sql_query = f"SELECT {sql_query}"
+        return derived_table["sql"]
 
-            if not re.search(r"FROM\s", sql_query, flags=re.I):
-                # add a FROM clause at the end
-                sql_query = f"{sql_query} FROM {self.name()}"
-                # Get the list of tables in the query
-
-            # Drop ${ and }
-            sql_query = re.sub(DERIVED_VIEW_PATTERN, r"\1", sql_query)
+    def datahub_transformed_sql(self) -> str:
+        """
+        This function should only be called if is_sql_based_derived_case return true
+        """
+        derived_table = self.derived_table()
 
-        return sql_query
+        return derived_table["datahub_transformed_sql"]
 
     def name(self) -> str:
         return self.raw_view[NAME]
@@ -349,13 +444,13 @@ def _get_list_dict(self, attribute_name: str) -> List[Dict]:
         return []
 
     def dimensions(self) -> List[Dict]:
-        return self._get_list_dict("dimensions")
+        return self.get_including_extends(field=DIMENSIONS) or []
 
     def measures(self) -> List[Dict]:
-        return self._get_list_dict("measures")
+        return self.get_including_extends(field=MEASURES) or []
 
     def dimension_groups(self) -> List[Dict]:
-        return self._get_list_dict("dimension_groups")
+        return self.get_including_extends(field=DIMENSION_GROUPS) or []
 
     def is_materialized_derived_view(self) -> bool:
         for k in self.derived_table():
@@ -370,6 +465,11 @@ def is_materialized_derived_view(self) -> bool:
     def is_regular_case(self) -> bool:
         # regular-case is pattern1 and 2 where upstream table is either view-name or
         # table name mentioned in sql_table_name attribute
+
+        # It should not be the sql query
+        if self.is_direct_sql_query_case():
+            return False
+
         if (
             self.is_sql_table_name_referring_to_view()
             or self.is_sql_based_derived_case()
@@ -380,6 +480,9 @@ def is_regular_case(self) -> bool:
         return True
 
     def is_sql_table_name_referring_to_view(self) -> bool:
+        if self.is_direct_sql_query_case():
+            return False
+
         # It is pattern3
         return self._is_dot_sql_table_name_present()
 
@@ -391,7 +494,7 @@ def is_sql_based_derived_case(self) -> bool:
         return False
 
     def is_native_derived_case(self) -> bool:
-        # It is pattern 5
+        # It is pattern 5, mentioned in Class documentation
         if (
             "derived_table" in self.raw_view
             and "explore_source" in self.raw_view["derived_table"]
@@ -401,7 +504,7 @@ def is_native_derived_case(self) -> bool:
         return False
 
     def is_sql_based_derived_view_without_fields_case(self) -> bool:
-        # Pattern 6
+        # Pattern 6, mentioned in Class documentation
         fields: List[Dict] = []
 
         fields.extend(self.dimensions())
@@ -412,3 +515,14 @@ def is_sql_based_derived_view_without_fields_case(self) -> bool:
             return True
 
         return False
+
+    def is_direct_sql_query_case(self) -> bool:
+        # pattern 7
+        # sqlglot doesn't have a function to validate whether text is valid SQL or not.
+        # Applying a simple logic to check if sql_table_name contains a sql.
+        # if sql_table_name contains sql then its value starts with "(" and checking if "select" is present in side the
+        # text
+        return (
+            self.sql_table_name().strip().startswith("(")
+            and "select" in self.sql_table_name()
+        )
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py
index aa5719547c03ed..0bcee14ec77a1a 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py
@@ -1,7 +1,7 @@
 import logging
 from dataclasses import dataclass, field as dataclass_field
 from datetime import timedelta
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Literal, Optional, Union
 
 import pydantic
 from pydantic import root_validator, validator
@@ -11,8 +11,10 @@
 from datahub.configuration.git import GitInfo
 from datahub.configuration.source_common import EnvConfigMixin
 from datahub.configuration.validate_field_rename import pydantic_renamed_field
-from datahub.ingestion.source.looker.looker_config import LookerCommonConfig
-from datahub.ingestion.source.looker.looker_connection import LookerConnectionDefinition
+from datahub.ingestion.source.looker.looker_config import (
+    LookerCommonConfig,
+    LookerConnectionDefinition,
+)
 from datahub.ingestion.source.looker.looker_lib_wrapper import (
     LookerAPI,
     LookerAPIConfig,
@@ -172,6 +174,13 @@ class LookMLSourceConfig(
         "view.sql_table_name. Defaults to an empty dictionary.",
     )
 
+    looker_environment: Literal["prod", "dev"] = Field(
+        "prod",
+        description="A looker prod or dev environment. "
+        "It helps to evaluate looker if comments i.e. -- if prod --. "
+        "All if comments are evaluated to true for configured looker_environment value",
+    )
+
     @validator("connection_to_platform_map", pre=True)
     def convert_string_to_connection_def(cls, conn_map):
         # Previous version of config supported strings in connection map. This upconverts strings to ConnectionMap
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py
index 223d168dbe033a..b00291caabbf68 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py
@@ -201,8 +201,7 @@ def from_looker_dict(
         view_logic = view_context.view_file.raw_file_content[:max_file_snippet_length]
 
         if view_context.is_sql_based_derived_case():
-            view_logic = view_context.sql(transformed=False)
-            # Parse SQL to extract dependencies.
+            view_logic = view_context.sql()
             view_details = ViewProperties(
                 materialized=False,
                 viewLogic=view_logic,
@@ -670,7 +669,7 @@ def get_internal_workunits(self) -> Iterable[MetadataWorkUnit]:  # noqa: C901
             self.source_config.project_name,
             self.base_projects_folder,
             self.reporter,
-            self.source_config.liquid_variable,
+            self.source_config,
         )
 
         # Some views can be mentioned by multiple 'include' statements and can be included via different connections.
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/view_upstream.py b/metadata-ingestion/src/datahub/ingestion/source/looker/view_upstream.py
index 390e71ef9d4bd8..0917a9e9faafee 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/view_upstream.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/view_upstream.py
@@ -206,6 +206,7 @@ class AbstractViewUpstream(ABC):
     view_context: LookerViewContext
     looker_view_id_cache: LookerViewIdCache
     config: LookMLSourceConfig
+    reporter: LookMLSourceReport
     ctx: PipelineContext
 
     def __init__(
@@ -213,11 +214,13 @@ def __init__(
         view_context: LookerViewContext,
         looker_view_id_cache: LookerViewIdCache,
         config: LookMLSourceConfig,
+        reporter: LookMLSourceReport,
         ctx: PipelineContext,
     ):
         self.view_context = view_context
         self.looker_view_id_cache = looker_view_id_cache
         self.config = config
+        self.reporter = reporter
         self.ctx = ctx
 
     @abstractmethod
@@ -234,7 +237,7 @@ def create_fields(self) -> List[ViewField]:
         return []  # it is for the special case
 
 
-class SqlBasedDerivedViewUpstream(AbstractViewUpstream):
+class SqlBasedDerivedViewUpstream(AbstractViewUpstream, ABC):
     """
     Handle the case where upstream dataset is defined in derived_table.sql
     """
@@ -244,9 +247,10 @@ def __init__(
         view_context: LookerViewContext,
         looker_view_id_cache: LookerViewIdCache,
         config: LookMLSourceConfig,
+        reporter: LookMLSourceReport,
         ctx: PipelineContext,
     ):
-        super().__init__(view_context, looker_view_id_cache, config, ctx)
+        super().__init__(view_context, looker_view_id_cache, config, reporter, ctx)
         # These are the function where we need to catch the response once calculated
         self._get_spr = lru_cache(maxsize=1)(self.__get_spr)
         self._get_upstream_dataset_urn = lru_cache(maxsize=1)(
@@ -259,7 +263,7 @@ def __get_spr(self) -> Optional[SqlParsingResult]:
             return None
 
         spr = create_lineage_sql_parsed_result(
-            query=self.view_context.sql(),
+            query=self.get_sql_query(),
             default_schema=self.view_context.view_connection.default_schema,
             default_db=self.view_context.view_connection.default_db,
             platform=self.view_context.view_connection.platform,
@@ -267,17 +271,6 @@ def __get_spr(self) -> Optional[SqlParsingResult]:
             env=self.view_context.view_connection.platform_env or self.config.env,
             graph=self.ctx.graph,
         )
-
-        if (
-            spr.debug_info.table_error is not None
-            or spr.debug_info.column_error is not None
-        ):
-            logging.debug(
-                f"Failed to parsed the sql query. table_error={spr.debug_info.table_error} and "
-                f"column_error={spr.debug_info.column_error}"
-            )
-            return None
-
         return spr
 
     def __get_upstream_dataset_urn(self) -> List[Urn]:
@@ -286,6 +279,15 @@ def __get_upstream_dataset_urn(self) -> List[Urn]:
         if sql_parsing_result is None:
             return []
 
+        if sql_parsing_result.debug_info.table_error is not None:
+            self.reporter.report_warning(
+                title="Table Level Lineage Missing",
+                message="Error in parsing derived sql",
+                context=f"View-name: {self.view_context.name()}",
+                exc=sql_parsing_result.debug_info.table_error,
+            )
+            return []
+
         upstream_dataset_urns: List[str] = [
             _drop_hive_dot(urn) for urn in sql_parsing_result.in_tables
         ]
@@ -306,6 +308,15 @@ def create_fields(self) -> List[ViewField]:
         if spr is None:
             return []
 
+        if spr.debug_info.column_error is not None:
+            self.reporter.report_warning(
+                title="Column Level Lineage Missing",
+                message="Error in parsing derived sql for CLL",
+                context=f"View-name: {self.view_context.name()}",
+                exc=spr.debug_info.column_error,
+            )
+            return []
+
         fields: List[ViewField] = []
 
         column_lineages: List[ColumnLineageInfo] = (
@@ -336,6 +347,15 @@ def get_upstream_column_ref(
         if sql_parsing_result is None:
             return []
 
+        if sql_parsing_result.debug_info.column_error is not None:
+            self.reporter.report_warning(
+                title="Column Level Lineage Missing",
+                message="Error in parsing derived sql for CLL",
+                context=f"View-name: {self.view_context.name()}. "
+                f"Error: {sql_parsing_result.debug_info.column_error}",
+            )
+            return []
+
         upstreams_column_refs: List[ColumnRef] = []
         if sql_parsing_result.column_lineage:
             for cll in sql_parsing_result.column_lineage:
@@ -365,11 +385,33 @@ def get_upstream_column_ref(
             config=self.config,
         )
 
-        return upstreams_column_refs
+        return _drop_hive_dot_from_upstream(upstreams_column_refs)
 
     def get_upstream_dataset_urn(self) -> List[Urn]:
         return self._get_upstream_dataset_urn()
 
+    @abstractmethod
+    def get_sql_query(self) -> str:
+        pass
+
+
+class DirectQueryUpstreamSource(SqlBasedDerivedViewUpstream):
+    """
+    Pattern 7 as per view-context documentation
+    """
+
+    def get_sql_query(self) -> str:
+        return self.view_context.datahub_transformed_sql_table_name()
+
+
+class DerivedQueryUpstreamSource(SqlBasedDerivedViewUpstream):
+    """
+    Pattern 4 as per view-context documentation
+    """
+
+    def get_sql_query(self) -> str:
+        return self.view_context.datahub_transformed_sql()
+
 
 class NativeDerivedViewUpstream(AbstractViewUpstream):
     """
@@ -384,9 +426,11 @@ def __init__(
         view_context: LookerViewContext,
         looker_view_id_cache: LookerViewIdCache,
         config: LookMLSourceConfig,
+        reporter: LookMLSourceReport,
         ctx: PipelineContext,
     ):
-        super().__init__(view_context, looker_view_id_cache, config, ctx)
+        super().__init__(view_context, looker_view_id_cache, config, reporter, ctx)
+
         self._get_upstream_dataset_urn = lru_cache(maxsize=1)(
             self.__get_upstream_dataset_urn
         )
@@ -402,7 +446,7 @@ def __get_upstream_dataset_urn(self) -> List[str]:
             base_folder_path=self.view_context.base_folder_path,
         )
 
-        # Current view will always be present in cache. The assert  will silence the lint
+        # Current view will always be present in cache. assert  will silence the lint
         assert current_view_id
 
         # We're creating a "LookerExplore" just to use the urn generator.
@@ -467,9 +511,10 @@ def __init__(
         view_context: LookerViewContext,
         looker_view_id_cache: LookerViewIdCache,
         config: LookMLSourceConfig,
+        reporter: LookMLSourceReport,
         ctx: PipelineContext,
     ):
-        super().__init__(view_context, looker_view_id_cache, config, ctx)
+        super().__init__(view_context, looker_view_id_cache, config, reporter, ctx)
         self.upstream_dataset_urn = None
 
         self._get_upstream_dataset_urn = lru_cache(maxsize=1)(
@@ -478,9 +523,9 @@ def __init__(
 
     def __get_upstream_dataset_urn(self) -> Urn:
         # In regular case view's upstream dataset is either same as view-name or mentioned in "sql_table_name" field
-        # view_context.sql_table_name() handle this condition to return dataset name
+        # view_context.datahub_transformed_sql_table_name() handle this condition to return dataset name
         qualified_table_name: str = _generate_fully_qualified_name(
-            sql_table_name=self.view_context.sql_table_name(),
+            sql_table_name=self.view_context.datahub_transformed_sql_table_name(),
             connection_def=self.view_context.view_connection,
             reporter=self.view_context.reporter,
         )
@@ -522,9 +567,10 @@ def __init__(
         view_context: LookerViewContext,
         looker_view_id_cache: LookerViewIdCache,
         config: LookMLSourceConfig,
+        reporter: LookMLSourceReport,
         ctx: PipelineContext,
     ):
-        super().__init__(view_context, looker_view_id_cache, config, ctx)
+        super().__init__(view_context, looker_view_id_cache, config, reporter, ctx)
         self.upstream_dataset_urn = []
 
         self._get_upstream_dataset_urn = lru_cache(maxsize=1)(
@@ -532,10 +578,10 @@ def __init__(
         )
 
     def __get_upstream_dataset_urn(self) -> List[Urn]:
-        # In this case view_context.sql_table_name() refers to derived view name
+        # In this case view_context.datahub_transformed_sql_table_name() refers to derived view name
         looker_view_id = get_derived_looker_view_id(
             qualified_table_name=_generate_fully_qualified_name(
-                self.view_context.sql_table_name(),
+                self.view_context.datahub_transformed_sql_table_name(),
                 self.view_context.view_connection,
                 self.view_context.reporter,
             ),
@@ -587,10 +633,12 @@ def create_view_upstream(
     ctx: PipelineContext,
     reporter: LookMLSourceReport,
 ) -> AbstractViewUpstream:
+
     if view_context.is_regular_case():
         return RegularViewUpstream(
             view_context=view_context,
             config=config,
+            reporter=reporter,
             ctx=ctx,
             looker_view_id_cache=looker_view_id_cache,
         )
@@ -599,17 +647,31 @@ def create_view_upstream(
         return DotSqlTableNameViewUpstream(
             view_context=view_context,
             config=config,
+            reporter=reporter,
             ctx=ctx,
             looker_view_id_cache=looker_view_id_cache,
         )
 
-    if (
-        view_context.is_sql_based_derived_case()
-        or view_context.is_sql_based_derived_view_without_fields_case()
+    if any(
+        [
+            view_context.is_sql_based_derived_case(),
+            view_context.is_sql_based_derived_view_without_fields_case(),
+        ]
     ):
-        return SqlBasedDerivedViewUpstream(
+
+        return DerivedQueryUpstreamSource(
+            view_context=view_context,
+            config=config,
+            reporter=reporter,
+            ctx=ctx,
+            looker_view_id_cache=looker_view_id_cache,
+        )
+
+    if view_context.is_direct_sql_query_case():
+        return DirectQueryUpstreamSource(
             view_context=view_context,
             config=config,
+            reporter=reporter,
             ctx=ctx,
             looker_view_id_cache=looker_view_id_cache,
         )
@@ -618,19 +680,21 @@ def create_view_upstream(
         return NativeDerivedViewUpstream(
             view_context=view_context,
             config=config,
+            reporter=reporter,
             ctx=ctx,
             looker_view_id_cache=looker_view_id_cache,
         )
 
     reporter.report_warning(
-        title="Implementation Not Found",
+        title="ViewUpstream Implementation Not Found",
         message="No implementation found to resolve upstream of the view",
-        context=view_context.view_file_name(),
+        context=f"view_name={view_context.name()} , view_file_name={view_context.view_file_name()}",
     )
 
     return EmptyImplementation(
         view_context=view_context,
         config=config,
+        reporter=reporter,
         ctx=ctx,
         looker_view_id_cache=looker_view_id_cache,
     )
diff --git a/metadata-ingestion/src/datahub/ingestion/source/mode.py b/metadata-ingestion/src/datahub/ingestion/source/mode.py
index 4b4822bcb98cae..73427d9084dd3c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/mode.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/mode.py
@@ -106,7 +106,7 @@
     infer_output_schema,
 )
 from datahub.utilities import config_clean
-from datahub.utilities.lossy_collections import LossyDict, LossyList
+from datahub.utilities.lossy_collections import LossyList
 
 logger: logging.Logger = logging.getLogger(__name__)
 
@@ -135,9 +135,14 @@ class ModeConfig(StatefulIngestionConfigBase, DatasetLineageProviderConfigBase):
     connect_uri: str = Field(
         default="https://app.mode.com", description="Mode host URL."
     )
-    token: str = Field(description="Mode user token.")
+    token: str = Field(
+        description="When creating workspace API key this is the 'Key ID'."
+    )
     password: pydantic.SecretStr = Field(
-        description="Mode password for authentication."
+        description="When creating workspace API key this is the 'Secret'."
+    )
+    exclude_restricted: bool = Field(
+        default=False, description="Exclude restricted collections"
     )
 
     workspace: str = Field(
@@ -194,10 +199,6 @@ class ModeSourceReport(StaleEntityRemovalSourceReport):
     num_query_template_render_failures: int = 0
     num_query_template_render_success: int = 0
 
-    dropped_imported_datasets: LossyDict[str, LossyList[str]] = dataclasses.field(
-        default_factory=LossyDict
-    )
-
     def report_dropped_space(self, ent_name: str) -> None:
         self.filtered_spaces.append(ent_name)
 
@@ -205,8 +206,12 @@ def report_dropped_space(self, ent_name: str) -> None:
 @platform_name("Mode")
 @config_class(ModeConfig)
 @support_status(SupportStatus.CERTIFIED)
+@capability(SourceCapability.CONTAINERS, "Enabled by default")
+@capability(SourceCapability.DESCRIPTIONS, "Enabled by default")
 @capability(SourceCapability.PLATFORM_INSTANCE, "Enabled by default")
 @capability(SourceCapability.LINEAGE_COARSE, "Supported by default")
+@capability(SourceCapability.LINEAGE_FINE, "Supported by default")
+@capability(SourceCapability.OWNERSHIP, "Enabled by default")
 class ModeSource(StatefulIngestionSourceBase):
     """
 
@@ -420,10 +425,25 @@ def construct_dashboard(
         # Last refreshed ts.
         last_refreshed_ts = self._parse_last_run_at(report_info)
 
+        # Datasets
+        datasets = []
+        for imported_dataset_name in report_info.get("imported_datasets", {}):
+            mode_dataset = self._get_request_json(
+                f"{self.workspace_uri}/reports/{imported_dataset_name.get('token')}"
+            )
+            dataset_urn = builder.make_dataset_urn_with_platform_instance(
+                self.platform,
+                str(mode_dataset.get("id")),
+                platform_instance=None,
+                env=self.config.env,
+            )
+            datasets.append(dataset_urn)
+
         dashboard_info_class = DashboardInfoClass(
             description=description if description else "",
             title=title if title else "",
             charts=self._get_chart_urns(report_token),
+            datasets=datasets if datasets else None,
             lastModified=last_modified,
             lastRefreshed=last_refreshed_ts,
             dashboardUrl=f"{self.config.connect_uri}/{self.config.workspace}/reports/{report_token}",
@@ -522,6 +542,16 @@ def _get_space_name_and_tokens(self) -> dict:
             for s in spaces:
                 logger.debug(f"Space: {s.get('name')}")
                 space_name = s.get("name", "")
+                # Using both restricted and default_access_level because
+                # there is a current bug with restricted returning False everytime
+                # which has been reported to Mode team
+                if self.config.exclude_restricted and (
+                    s.get("restricted") or s.get("default_access_level") == "restricted"
+                ):
+                    logging.debug(
+                        f"Skipping space {space_name} due to exclude restricted"
+                    )
+                    continue
                 if not self.config.space_pattern.allowed(space_name):
                     self.report.report_dropped_space(space_name)
                     logging.debug(f"Skipping space {space_name} due to space pattern")
@@ -706,6 +736,10 @@ def _get_platform_and_dbname(
                     data_source.get("adapter", ""), data_source.get("name", "")
                 )
                 database = data_source.get("database", "")
+                # This is hacky but on bigquery we want to change the database if its default
+                # For lineage we need project_id.db.table
+                if platform == "bigquery" and database == "default":
+                    database = data_source.get("host", "")
                 return platform, database
         else:
             self.report.report_warning(
@@ -741,7 +775,7 @@ def _replace_definitions(self, raw_query: str) -> str:
     def _parse_definition_name(self, definition_variable: str) -> Tuple[str, str]:
         name, alias = "", ""
         # i.e '{{ @join_on_definition as alias}}'
-        name_match = re.findall("@[a-zA-z]+", definition_variable)
+        name_match = re.findall("@[a-zA-Z_]+", definition_variable)
         if len(name_match):
             name = name_match[0][1:]
         alias_match = re.findall(
@@ -881,24 +915,36 @@ def normalize_mode_query(self, query: str) -> str:
 
         return rendered_query
 
-    def construct_query_from_api_data(
+    def construct_query_or_dataset(
         self,
         report_token: str,
         query_data: dict,
         space_token: str,
         report_info: dict,
+        is_mode_dataset: bool,
     ) -> Iterable[MetadataWorkUnit]:
-        query_urn = self.get_dataset_urn_from_query(query_data)
+        query_urn = (
+            self.get_dataset_urn_from_query(query_data)
+            if not is_mode_dataset
+            else self.get_dataset_urn_from_query(report_info)
+        )
+
         query_token = query_data.get("token")
 
+        externalUrl = (
+            f"{self.config.connect_uri}/{self.config.workspace}/datasets/{report_token}"
+            if is_mode_dataset
+            else f"{self.config.connect_uri}/{self.config.workspace}/reports/{report_token}/details/queries/{query_token}"
+        )
+
         dataset_props = DatasetPropertiesClass(
-            name=query_data.get("name"),
+            name=report_info.get("name") if is_mode_dataset else query_data.get("name"),
             description=f"""### Source Code
 ``` sql
 {query_data.get("raw_query")}
 ```
             """,
-            externalUrl=f"{self.config.connect_uri}/{self.config.workspace}/reports/{report_token}/details/queries/{query_token}",
+            externalUrl=externalUrl,
             customProperties=self.get_custom_props_from_dict(
                 query_data,
                 [
@@ -920,7 +966,22 @@ def construct_query_from_api_data(
             ).as_workunit()
         )
 
-        subtypes = SubTypesClass(typeNames=([BIAssetSubTypes.MODE_QUERY]))
+        if is_mode_dataset:
+            space_container_key = self.gen_space_key(space_token)
+            yield from add_dataset_to_container(
+                container_key=space_container_key,
+                dataset_urn=query_urn,
+            )
+
+        subtypes = SubTypesClass(
+            typeNames=(
+                [
+                    BIAssetSubTypes.MODE_DATASET
+                    if is_mode_dataset
+                    else BIAssetSubTypes.MODE_QUERY
+                ]
+            )
+        )
         yield (
             MetadataChangeProposalWrapper(
                 entityUrn=query_urn,
@@ -931,7 +992,9 @@ def construct_query_from_api_data(
         yield MetadataChangeProposalWrapper(
             entityUrn=query_urn,
             aspect=BrowsePathsV2Class(
-                path=self._browse_path_query(space_token, report_info)
+                path=self._browse_path_dashboard(space_token)
+                if is_mode_dataset
+                else self._browse_path_query(space_token, report_info)
             ),
         ).as_workunit()
 
@@ -939,7 +1002,6 @@ def construct_query_from_api_data(
             upstream_warehouse_platform,
             upstream_warehouse_db_name,
         ) = self._get_platform_and_dbname(query_data.get("data_source_id"))
-
         if upstream_warehouse_platform is None:
             # this means we can't infer the platform
             return
@@ -1003,7 +1065,7 @@ def construct_query_from_api_data(
         schema_fields = infer_output_schema(parsed_query_object)
         if schema_fields:
             schema_metadata = SchemaMetadataClass(
-                schemaName="mode_query",
+                schemaName="mode_dataset" if is_mode_dataset else "mode_query",
                 platform=f"urn:li:dataPlatform:{self.platform}",
                 version=0,
                 fields=schema_fields,
@@ -1021,7 +1083,7 @@ def construct_query_from_api_data(
             )
 
         yield from self.get_upstream_lineage_for_parsed_sql(
-            query_data, parsed_query_object
+            query_urn, query_data, parsed_query_object
         )
 
         operation = OperationClass(
@@ -1070,10 +1132,9 @@ def construct_query_from_api_data(
             ).as_workunit()
 
     def get_upstream_lineage_for_parsed_sql(
-        self, query_data: dict, parsed_query_object: SqlParsingResult
+        self, query_urn: str, query_data: dict, parsed_query_object: SqlParsingResult
     ) -> List[MetadataWorkUnit]:
         wu = []
-        query_urn = self.get_dataset_urn_from_query(query_data)
 
         if parsed_query_object is None:
             logger.info(
@@ -1331,6 +1392,24 @@ def _get_reports(self, space_token: str) -> List[dict]:
             )
         return reports
 
+    @lru_cache(maxsize=None)
+    def _get_datasets(self, space_token: str) -> List[dict]:
+        """
+        Retrieves datasets for a given space token.
+        """
+        datasets = []
+        try:
+            url = f"{self.workspace_uri}/spaces/{space_token}/datasets"
+            datasets_json = self._get_request_json(url)
+            datasets = datasets_json.get("_embedded", {}).get("reports", [])
+        except HTTPError as http_error:
+            self.report.report_failure(
+                title="Failed to Retrieve Datasets for Space",
+                message=f"Unable to retrieve datasets for space token {space_token}.",
+                context=f"Error: {str(http_error)}",
+            )
+        return datasets
+
     @lru_cache(maxsize=None)
     def _get_queries(self, report_token: str) -> list:
         queries = []
@@ -1504,24 +1583,14 @@ def emit_chart_mces(self) -> Iterable[MetadataWorkUnit]:
             for report in reports:
                 report_token = report.get("token", "")
 
-                if report.get("imported_datasets"):
-                    # The connector doesn't support imported datasets yet.
-                    # For now, we just keep this in the report to track what we're missing.
-                    imported_datasets = [
-                        imported_dataset.get("name") or str(imported_dataset)
-                        for imported_dataset in report["imported_datasets"]
-                    ]
-                    self.report.dropped_imported_datasets.setdefault(
-                        report_token, LossyList()
-                    ).extend(imported_datasets)
-
                 queries = self._get_queries(report_token)
                 for query in queries:
-                    query_mcps = self.construct_query_from_api_data(
+                    query_mcps = self.construct_query_or_dataset(
                         report_token,
                         query,
                         space_token=space_token,
                         report_info=report,
+                        is_mode_dataset=False,
                     )
                     chart_fields: Dict[str, SchemaFieldClass] = {}
                     for wu in query_mcps:
@@ -1547,6 +1616,27 @@ def emit_chart_mces(self) -> Iterable[MetadataWorkUnit]:
                             query_name=query["name"],
                         )
 
+    def emit_dataset_mces(self):
+        """
+        Emits MetadataChangeEvents (MCEs) for datasets within each space.
+        """
+        for space_token, _ in self.space_tokens.items():
+            datasets = self._get_datasets(space_token)
+
+            for report in datasets:
+                report_token = report.get("token", "")
+                queries = self._get_queries(report_token)
+                for query in queries:
+                    query_mcps = self.construct_query_or_dataset(
+                        report_token,
+                        query,
+                        space_token=space_token,
+                        report_info=report,
+                        is_mode_dataset=True,
+                    )
+                    for wu in query_mcps:
+                        yield wu
+
     @classmethod
     def create(cls, config_dict: dict, ctx: PipelineContext) -> "ModeSource":
         config: ModeConfig = ModeConfig.parse_obj(config_dict)
@@ -1562,6 +1652,7 @@ def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
 
     def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
         yield from self.emit_dashboard_mces()
+        yield from self.emit_dataset_mces()
         yield from self.emit_chart_mces()
 
     def get_report(self) -> SourceReport:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/mongodb.py b/metadata-ingestion/src/datahub/ingestion/source/mongodb.py
index 7ce3b5bc34da2f..e4dadaf602852c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/mongodb.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/mongodb.py
@@ -18,9 +18,13 @@
 from datahub.emitter.mce_builder import (
     make_data_platform_urn,
     make_dataplatform_instance_urn,
-    make_dataset_urn_with_platform_instance,
 )
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.emitter.mcp_builder import (
+    DatabaseKey,
+    add_dataset_to_container,
+    gen_containers,
+)
 from datahub.ingestion.api.common import PipelineContext
 from datahub.ingestion.api.decorators import (
     SourceCapability,
@@ -32,6 +36,7 @@
 )
 from datahub.ingestion.api.source import MetadataWorkUnitProcessor
 from datahub.ingestion.api.workunit import MetadataWorkUnit
+from datahub.ingestion.source.common.subtypes import DatasetContainerSubTypes
 from datahub.ingestion.source.schema_inference.object import (
     SchemaDescription,
     construct_schema,
@@ -64,6 +69,7 @@
     DataPlatformInstanceClass,
     DatasetPropertiesClass,
 )
+from datahub.metadata.urns import DatasetUrn
 
 logger = logging.getLogger(__name__)
 
@@ -263,6 +269,7 @@ class MongoDBSource(StatefulIngestionSourceBase):
     config: MongoDBConfig
     report: MongoDBSourceReport
     mongo_client: MongoClient
+    platform: str = "mongodb"
 
     def __init__(self, ctx: PipelineContext, config: MongoDBConfig):
         super().__init__(config, ctx)
@@ -282,7 +289,9 @@ def __init__(self, ctx: PipelineContext, config: MongoDBConfig):
         }
 
         # See https://pymongo.readthedocs.io/en/stable/examples/datetimes.html#handling-out-of-range-datetimes
-        self.mongo_client = MongoClient(self.config.connect_uri, datetime_conversion="DATETIME_AUTO", **options)  # type: ignore
+        self.mongo_client = MongoClient(
+            self.config.connect_uri, datetime_conversion="DATETIME_AUTO", **options
+        )  # type: ignore
 
         # This cheaply tests the connection. For details, see
         # https://pymongo.readthedocs.io/en/stable/api/pymongo/mongo_client.html#pymongo.mongo_client.MongoClient
@@ -351,8 +360,6 @@ def get_field_type(
         return SchemaFieldDataType(type=TypeClass())
 
     def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
-        platform = "mongodb"
-
         database_names: List[str] = self.mongo_client.list_database_names()
 
         # traverse databases in sorted order so output is consistent
@@ -364,8 +371,19 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                 continue
 
             database = self.mongo_client[database_name]
-            collection_names: List[str] = database.list_collection_names()
+            database_key = DatabaseKey(
+                database=database_name,
+                platform=self.platform,
+                instance=self.config.platform_instance,
+                env=self.config.env,
+            )
+            yield from gen_containers(
+                container_key=database_key,
+                name=database_name,
+                sub_types=[DatasetContainerSubTypes.DATABASE],
+            )
 
+            collection_names: List[str] = database.list_collection_names()
             # traverse collections in sorted order so output is consistent
             for collection_name in sorted(collection_names):
                 dataset_name = f"{database_name}.{collection_name}"
@@ -374,9 +392,9 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                     self.report.report_dropped(dataset_name)
                     continue
 
-                dataset_urn = make_dataset_urn_with_platform_instance(
-                    platform=platform,
-                    name=dataset_name,
+                dataset_urn = DatasetUrn.create_from_ids(
+                    platform_id=self.platform,
+                    table_name=dataset_name,
                     env=self.config.env,
                     platform_instance=self.config.platform_instance,
                 )
@@ -385,9 +403,9 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                 data_platform_instance = None
                 if self.config.platform_instance:
                     data_platform_instance = DataPlatformInstanceClass(
-                        platform=make_data_platform_urn(platform),
+                        platform=make_data_platform_urn(self.platform),
                         instance=make_dataplatform_instance_urn(
-                            platform, self.config.platform_instance
+                            self.platform, self.config.platform_instance
                         ),
                     )
 
@@ -397,83 +415,21 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                 )
 
                 schema_metadata: Optional[SchemaMetadata] = None
-
                 if self.config.enableSchemaInference:
-                    assert self.config.maxDocumentSize is not None
-                    collection_schema = construct_schema_pymongo(
-                        database[collection_name],
-                        delimiter=".",
-                        use_random_sampling=self.config.useRandomSampling,
-                        max_document_size=self.config.maxDocumentSize,
-                        should_add_document_size_filter=self.should_add_document_size_filter(),
-                        sample_size=self.config.schemaSamplingSize,
-                    )
-
-                    # initialize the schema for the collection
-                    canonical_schema: List[SchemaField] = []
-                    max_schema_size = self.config.maxSchemaSize
-                    collection_schema_size = len(collection_schema.values())
-                    collection_fields: Union[
-                        List[SchemaDescription], ValuesView[SchemaDescription]
-                    ] = collection_schema.values()
-                    assert max_schema_size is not None
-                    if collection_schema_size > max_schema_size:
-                        # downsample the schema, using frequency as the sort key
-                        self.report.report_warning(
-                            title="Too many schema fields",
-                            message=f"Downsampling the collection schema because it has too many schema fields. Configured threshold is {max_schema_size}",
-                            context=f"Schema Size: {collection_schema_size}, Collection: {dataset_urn}",
-                        )
-                        # Add this information to the custom properties so user can know they are looking at downsampled schema
-                        dataset_properties.customProperties[
-                            "schema.downsampled"
-                        ] = "True"
-                        dataset_properties.customProperties[
-                            "schema.totalFields"
-                        ] = f"{collection_schema_size}"
-
-                    logger.debug(
-                        f"Size of collection fields = {len(collection_fields)}"
-                    )
-                    # append each schema field (sort so output is consistent)
-                    for schema_field in sorted(
-                        collection_fields,
-                        key=lambda x: (
-                            -x["count"],
-                            x["delimited_name"],
-                        ),  # Negate `count` for descending order, `delimited_name` stays the same for ascending
-                    )[0:max_schema_size]:
-                        field = SchemaField(
-                            fieldPath=schema_field["delimited_name"],
-                            nativeDataType=self.get_pymongo_type_string(
-                                schema_field["type"], dataset_name
-                            ),
-                            type=self.get_field_type(
-                                schema_field["type"], dataset_name
-                            ),
-                            description=None,
-                            nullable=schema_field["nullable"],
-                            recursive=False,
-                        )
-                        canonical_schema.append(field)
-
-                    # create schema metadata object for collection
-                    schema_metadata = SchemaMetadata(
-                        schemaName=collection_name,
-                        platform=f"urn:li:dataPlatform:{platform}",
-                        version=0,
-                        hash="",
-                        platformSchema=SchemalessClass(),
-                        fields=canonical_schema,
+                    schema_metadata = self._infer_schema_metadata(
+                        collection=database[collection_name],
+                        dataset_urn=dataset_urn,
+                        dataset_properties=dataset_properties,
                     )
 
                 # TODO: use list_indexes() or index_information() to get index information
                 # See https://pymongo.readthedocs.io/en/stable/api/pymongo/collection.html#pymongo.collection.Collection.list_indexes.
 
+                yield from add_dataset_to_container(database_key, dataset_urn.urn())
                 yield from [
                     mcp.as_workunit()
                     for mcp in MetadataChangeProposalWrapper.construct_many(
-                        entityUrn=dataset_urn,
+                        entityUrn=dataset_urn.urn(),
                         aspects=[
                             schema_metadata,
                             dataset_properties,
@@ -482,6 +438,74 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                     )
                 ]
 
+    def _infer_schema_metadata(
+        self,
+        collection: pymongo.collection.Collection,
+        dataset_urn: DatasetUrn,
+        dataset_properties: DatasetPropertiesClass,
+    ) -> SchemaMetadata:
+        assert self.config.maxDocumentSize is not None
+        collection_schema = construct_schema_pymongo(
+            collection,
+            delimiter=".",
+            use_random_sampling=self.config.useRandomSampling,
+            max_document_size=self.config.maxDocumentSize,
+            should_add_document_size_filter=self.should_add_document_size_filter(),
+            sample_size=self.config.schemaSamplingSize,
+        )
+
+        # initialize the schema for the collection
+        canonical_schema: List[SchemaField] = []
+        max_schema_size = self.config.maxSchemaSize
+        collection_schema_size = len(collection_schema.values())
+        collection_fields: Union[
+            List[SchemaDescription], ValuesView[SchemaDescription]
+        ] = collection_schema.values()
+        assert max_schema_size is not None
+        if collection_schema_size > max_schema_size:
+            # downsample the schema, using frequency as the sort key
+            self.report.report_warning(
+                title="Too many schema fields",
+                message=f"Downsampling the collection schema because it has too many schema fields. Configured threshold is {max_schema_size}",
+                context=f"Schema Size: {collection_schema_size}, Collection: {dataset_urn}",
+            )
+            # Add this information to the custom properties so user can know they are looking at downsampled schema
+            dataset_properties.customProperties["schema.downsampled"] = "True"
+            dataset_properties.customProperties[
+                "schema.totalFields"
+            ] = f"{collection_schema_size}"
+
+        logger.debug(f"Size of collection fields = {len(collection_fields)}")
+        # append each schema field (sort so output is consistent)
+        for schema_field in sorted(
+            collection_fields,
+            key=lambda x: (
+                -x["count"],
+                x["delimited_name"],
+            ),  # Negate `count` for descending order, `delimited_name` stays the same for ascending
+        )[0:max_schema_size]:
+            field = SchemaField(
+                fieldPath=schema_field["delimited_name"],
+                nativeDataType=self.get_pymongo_type_string(
+                    schema_field["type"], dataset_urn.name
+                ),
+                type=self.get_field_type(schema_field["type"], dataset_urn.name),
+                description=None,
+                nullable=schema_field["nullable"],
+                recursive=False,
+            )
+            canonical_schema.append(field)
+
+        # create schema metadata object for collection
+        return SchemaMetadata(
+            schemaName=collection.name,
+            platform=f"urn:li:dataPlatform:{self.platform}",
+            version=0,
+            hash="",
+            platformSchema=SchemalessClass(),
+            fields=canonical_schema,
+        )
+
     def is_server_version_gte_4_4(self) -> bool:
         try:
             server_version = self.mongo_client.server_info().get("versionArray")
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py
index bd80433bc2e6ca..967dd5d81112d5 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py
@@ -440,6 +440,11 @@ class PowerBiDashboardSourceConfig(
     )
     profiling: PowerBiProfilingConfig = PowerBiProfilingConfig()
 
+    patch_metadata: bool = pydantic.Field(
+        default=True,
+        description="Patch dashboard metadata",
+    )
+
     @root_validator(skip_on_failure=True)
     def validate_extract_column_level_lineage(cls, values: Dict) -> Dict:
         flags = [
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py
index de4eaf6b64434f..a2d841c3f8fdce 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py
@@ -89,6 +89,7 @@
 from datahub.metadata.urns import ChartUrn
 from datahub.sql_parsing.sqlglot_lineage import ColumnLineageInfo
 from datahub.utilities.dedup_list import deduplicate_list
+from datahub.utilities.urns.urn_iter import lowercase_dataset_urn
 
 # Logger instance
 logger = logging.getLogger(__name__)
@@ -127,7 +128,7 @@ def __init__(
     @staticmethod
     def urn_to_lowercase(value: str, flag: bool) -> str:
         if flag is True:
-            return value.lower()
+            return lowercase_dataset_urn(value)
 
         return value
 
@@ -390,11 +391,13 @@ def to_datahub_dataset(
 
         for table in dataset.tables:
             # Create a URN for dataset
-            ds_urn = builder.make_dataset_urn_with_platform_instance(
-                platform=self.__config.platform_name,
-                name=self.assets_urn_to_lowercase(table.full_name),
-                platform_instance=self.__config.platform_instance,
-                env=self.__config.env,
+            ds_urn = self.assets_urn_to_lowercase(
+                builder.make_dataset_urn_with_platform_instance(
+                    platform=self.__config.platform_name,
+                    name=table.full_name,
+                    platform_instance=self.__config.platform_instance,
+                    env=self.__config.env,
+                )
             )
 
             logger.debug(f"dataset_urn={ds_urn}")
@@ -1197,8 +1200,7 @@ def report_to_datahub_work_units(
     ) -> Iterable[MetadataWorkUnit]:
         mcps: List[MetadataChangeProposalWrapper] = []
 
-        logger.debug(f"Converting dashboard={report.name} to datahub dashboard")
-
+        logger.debug(f"Converting report={report.name} to datahub dashboard")
         # Convert user to CorpUser
         user_mcps = self.to_datahub_users(report.users)
         # Convert pages to charts. A report has single dataset and same dataset used in pages to create visualization
@@ -1215,16 +1217,18 @@ def report_to_datahub_work_units(
         mcps.extend(chart_mcps)
         mcps.extend(report_mcps)
 
-        # Convert MCP to work_units
-        work_units = map(self._to_work_unit, mcps)
-        return work_units
+        return map(self._to_work_unit, mcps)
 
 
 @platform_name("PowerBI")
 @config_class(PowerBiDashboardSourceConfig)
 @support_status(SupportStatus.CERTIFIED)
+@capability(SourceCapability.CONTAINERS, "Enabled by default")
 @capability(SourceCapability.DESCRIPTIONS, "Enabled by default")
+@capability(SourceCapability.OWNERSHIP, "Enabled by default")
 @capability(SourceCapability.PLATFORM_INSTANCE, "Enabled by default")
+@capability(SourceCapability.SCHEMA_METADATA, "Enabled by default")
+@capability(SourceCapability.TAGS, "Enabled by default")
 @capability(
     SourceCapability.OWNERSHIP,
     "Disabled by default, configured using `extract_ownership`",
@@ -1385,7 +1389,7 @@ def _get_dashboard_patch_work_unit(
             DashboardInfoClass
         ] = work_unit.get_aspect_of_type(DashboardInfoClass)
 
-        if dashboard_info_aspect:
+        if dashboard_info_aspect and self.source_config.patch_metadata:
             return convert_dashboard_info_to_patch(
                 work_unit.get_urn(),
                 dashboard_info_aspect,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/pulsar.py b/metadata-ingestion/src/datahub/ingestion/source/pulsar.py
index 7671e239284305..790c1f918cdfd2 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/pulsar.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/pulsar.py
@@ -91,6 +91,7 @@ def __init__(self, schema):
 @config_class(PulsarSourceConfig)
 @capability(SourceCapability.PLATFORM_INSTANCE, "Enabled by default")
 @capability(SourceCapability.DOMAINS, "Supported via the `domain` config field")
+@capability(SourceCapability.SCHEMA_METADATA, "Enabled by default")
 @dataclass
 class PulsarSource(StatefulIngestionSourceBase):
     def __init__(self, config: PulsarSourceConfig, ctx: PipelineContext):
diff --git a/metadata-ingestion/src/datahub/ingestion/source/qlik_sense/qlik_sense.py b/metadata-ingestion/src/datahub/ingestion/source/qlik_sense/qlik_sense.py
index b9fd2a9c4fe221..b6c48dd3c488ec 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/qlik_sense/qlik_sense.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/qlik_sense/qlik_sense.py
@@ -93,12 +93,22 @@
 @platform_name("Qlik Sense")
 @config_class(QlikSourceConfig)
 @support_status(SupportStatus.INCUBATING)
+@capability(SourceCapability.CONTAINERS, "Enabled by default")
 @capability(SourceCapability.DESCRIPTIONS, "Enabled by default")
+@capability(
+    SourceCapability.LINEAGE_COARSE,
+    "Enabled by default.",
+)
+@capability(
+    SourceCapability.LINEAGE_FINE,
+    "Disabled by default. ",
+)
 @capability(SourceCapability.PLATFORM_INSTANCE, "Enabled by default")
 @capability(
     SourceCapability.OWNERSHIP,
     "Enabled by default, configured using `ingest_owner`",
 )
+@capability(SourceCapability.SCHEMA_METADATA, "Enabled by default")
 class QlikSenseSource(StatefulIngestionSourceBase, TestableSource):
     """
     This plugin extracts the following:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/redash.py b/metadata-ingestion/src/datahub/ingestion/source/redash.py
index c7a3f25e947dc5..38cf0bebcbc12f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/redash.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/redash.py
@@ -18,12 +18,13 @@
 from datahub.ingestion.api.common import PipelineContext
 from datahub.ingestion.api.decorators import (  # SourceCapability,; capability,
     SupportStatus,
+    capability,
     config_class,
     platform_name,
     support_status,
 )
 from datahub.ingestion.api.registry import import_path
-from datahub.ingestion.api.source import Source, SourceReport
+from datahub.ingestion.api.source import Source, SourceCapability, SourceReport
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.metadata.com.linkedin.pegasus2avro.common import (
     AuditStamp,
@@ -308,6 +309,7 @@ def report_dropped(self, item: str) -> None:
 @platform_name("Redash")
 @config_class(RedashConfig)
 @support_status(SupportStatus.INCUBATING)
+@capability(SourceCapability.LINEAGE_COARSE, "Enabled by default")
 class RedashSource(Source):
     """
     This plugin extracts the following:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/redshift/lineage.py b/metadata-ingestion/src/datahub/ingestion/source/redshift/lineage.py
index dadb06b6a95e26..0e4cb6f1599e52 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/redshift/lineage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/redshift/lineage.py
@@ -130,7 +130,7 @@ def parse_alter_table_rename(default_schema: str, query: str) -> Tuple[str, str,
     """
 
     parsed_query = parse_statement(query, dialect=get_dialect("redshift"))
-    assert isinstance(parsed_query, sqlglot.exp.AlterTable)
+    assert isinstance(parsed_query, sqlglot.exp.Alter)
     prev_name = parsed_query.this.name
     rename_clause = parsed_query.args["actions"][0]
     assert isinstance(rename_clause, sqlglot.exp.RenameTable)
@@ -875,7 +875,7 @@ def _process_table_renames(
                     default_schema=self.config.default_schema,
                     query=query_text,
                 )
-            except ValueError as e:
+            except Exception as e:
                 logger.info(f"Failed to parse alter table rename: {e}")
                 self.report.num_alter_table_parse_errors += 1
                 continue
diff --git a/metadata-ingestion/src/datahub/ingestion/source/redshift/lineage_v2.py b/metadata-ingestion/src/datahub/ingestion/source/redshift/lineage_v2.py
index bd0bbe742a2193..4b7f710beed08f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/redshift/lineage_v2.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/redshift/lineage_v2.py
@@ -31,6 +31,7 @@
 from datahub.metadata.urns import DatasetUrn
 from datahub.sql_parsing.sql_parsing_aggregator import (
     KnownQueryLineageInfo,
+    ObservedQuery,
     SqlParsingAggregator,
 )
 from datahub.utilities.perf_timer import PerfTimer
@@ -118,11 +119,13 @@ def build(
         if self.config.resolve_temp_table_in_lineage:
             for temp_row in self._lineage_v1.get_temp_tables(connection=connection):
                 self.aggregator.add_observed_query(
-                    query=temp_row.query_text,
-                    default_db=self.database,
-                    default_schema=self.config.default_schema,
-                    session_id=temp_row.session_id,
-                    query_timestamp=temp_row.start_time,
+                    ObservedQuery(
+                        query=temp_row.query_text,
+                        default_db=self.database,
+                        default_schema=self.config.default_schema,
+                        session_id=temp_row.session_id,
+                        timestamp=temp_row.start_time,
+                    ),
                     # The "temp table" query actually returns all CREATE TABLE statements, even if they
                     # aren't explicitly a temp table. As such, setting is_known_temp_table=True
                     # would not be correct. We already have mechanisms to autodetect temp tables,
@@ -263,11 +266,13 @@ def _process_sql_parser_lineage(self, lineage_row: LineageRow) -> None:
         # TODO actor
 
         self.aggregator.add_observed_query(
-            query=ddl,
-            default_db=self.database,
-            default_schema=self.config.default_schema,
-            query_timestamp=lineage_row.timestamp,
-            session_id=lineage_row.session_id,
+            ObservedQuery(
+                query=ddl,
+                default_db=self.database,
+                default_schema=self.config.default_schema,
+                timestamp=lineage_row.timestamp,
+                session_id=lineage_row.session_id,
+            )
         )
 
     def _make_filtered_target(self, lineage_row: LineageRow) -> Optional[DatasetUrn]:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py b/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py
index a6ffed65aaa70c..a9fc9ab8f3e993 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py
@@ -120,7 +120,7 @@
 @platform_name("Redshift")
 @config_class(RedshiftConfig)
 @support_status(SupportStatus.CERTIFIED)
-@capability(SourceCapability.PLATFORM_INSTANCE, "Enabled by default")
+@capability(SourceCapability.CONTAINERS, "Enabled by default")
 @capability(SourceCapability.DOMAINS, "Supported via the `domain` config field")
 @capability(SourceCapability.DATA_PROFILING, "Optionally enabled via configuration")
 @capability(SourceCapability.DESCRIPTIONS, "Enabled by default")
@@ -129,6 +129,8 @@
     SourceCapability.LINEAGE_FINE,
     "Optionally enabled via configuration (`mixed` or `sql_based` lineage needs to be enabled)",
 )
+@capability(SourceCapability.PLATFORM_INSTANCE, "Enabled by default")
+@capability(SourceCapability.SCHEMA_METADATA, "Enabled by default")
 @capability(
     SourceCapability.USAGE_STATS,
     "Enabled by default, can be disabled via configuration `include_usage_statistics`",
diff --git a/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift_schema.py b/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift_schema.py
index 6e88a50f898a5d..594f88dd521ad5 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift_schema.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift_schema.py
@@ -313,23 +313,19 @@ def get_table_stats(enriched_tables, field_names, schema, table):
         size_in_bytes: Optional[int] = None
         rows_count: Optional[int] = None
         if schema in enriched_tables and table_name in enriched_tables[schema]:
-            if enriched_tables[schema][table_name].last_accessed is not None:
-                # Mypy seems to be not clever enough to understand the above check
-                last_accessed = enriched_tables[schema][table_name].last_accessed
-                assert last_accessed
+            if (
+                last_accessed := enriched_tables[schema][table_name].last_accessed
+            ) is not None:
                 last_altered = last_accessed.replace(tzinfo=timezone.utc)
             elif creation_time:
                 last_altered = creation_time
 
-            if enriched_tables[schema][table_name].size is not None:
-                # Mypy seems to be not clever enough to understand the above check
-                size = enriched_tables[schema][table_name].size
-                if size:
-                    size_in_bytes = size * 1024 * 1024
+            if (size := enriched_tables[schema][table_name].size) is not None:
+                size_in_bytes = size * 1024 * 1024
 
-            if enriched_tables[schema][table_name].estimated_visible_rows is not None:
-                rows = enriched_tables[schema][table_name].estimated_visible_rows
-                assert rows
+            if (
+                rows := enriched_tables[schema][table_name].estimated_visible_rows
+            ) is not None:
                 rows_count = int(rows)
         else:
             # The object was not found in the enriched data.
@@ -504,7 +500,11 @@ def get_alter_table_commands(
                 yield AlterTableRow(
                     transaction_id=row[field_names.index("transaction_id")],
                     session_id=session_id,
-                    query_text=row[field_names.index("query_text")],
+                    # See https://docs.aws.amazon.com/redshift/latest/dg/r_STL_QUERYTEXT.html
+                    # for why we need to replace the \n with a newline.
+                    query_text=row[field_names.index("query_text")].replace(
+                        r"\n", "\n"
+                    ),
                     start_time=row[field_names.index("start_time")],
                 )
             rows = cursor.fetchmany()
diff --git a/metadata-ingestion/src/datahub/ingestion/source/s3/config.py b/metadata-ingestion/src/datahub/ingestion/source/s3/config.py
index 921ab275642505..3069c62e3a240f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/s3/config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/s3/config.py
@@ -47,6 +47,13 @@ class DataLakeSourceConfig(
         None,
         description="Whether or not to create tags in datahub from the s3 object",
     )
+    use_s3_content_type: bool = Field(
+        default=False,
+        description=(
+            "If enabled, use S3 Object metadata to determine content type over file extension, if set."
+            " Warning: this requires a separate query to S3 for each object, which can be slow for large datasets."
+        ),
+    )
 
     # Whether to update the table schema when schema in files within the partitions are updated
     _update_schema_on_partition_file_updates_deprecation = pydantic_field_deprecated(
@@ -98,6 +105,11 @@ class DataLakeSourceConfig(
         description="Whether to sort schema fields by fieldPath when inferring schemas.",
     )
 
+    generate_partition_aspects: bool = Field(
+        default=True,
+        description="Whether to generate partition aspects for partitioned tables. On older servers for backward compatibility, this should be set to False. This flag will be removed in future versions.",
+    )
+
     def is_profiling_enabled(self) -> bool:
         return self.profiling.enabled and is_profiling_enabled(
             self.profiling.operation_config
@@ -140,13 +152,27 @@ def check_path_specs_and_infer_platform(
         return path_specs
 
     @pydantic.validator("platform", always=True)
-    def platform_not_empty(cls, platform: str, values: dict) -> str:
+    def platform_valid(cls, platform: str, values: dict) -> str:
         inferred_platform = values.get(
             "platform", None
         )  # we may have inferred it above
         platform = platform or inferred_platform
         if not platform:
             raise ValueError("platform must not be empty")
+
+        if platform != "s3" and values.get("use_s3_bucket_tags"):
+            raise ValueError(
+                "Cannot grab s3 bucket tags when platform is not s3. Remove the flag or ingest from s3."
+            )
+        if platform != "s3" and values.get("use_s3_object_tags"):
+            raise ValueError(
+                "Cannot grab s3 object tags when platform is not s3. Remove the flag or ingest from s3."
+            )
+        if platform != "s3" and values.get("use_s3_content_type"):
+            raise ValueError(
+                "Cannot grab s3 object content type when platform is not s3. Remove the flag or ingest from s3."
+            )
+
         return platform
 
     @pydantic.root_validator(skip_on_failure=True)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/s3/source.py b/metadata-ingestion/src/datahub/ingestion/source/s3/source.py
index c35f500df1b8c7..ef5ed3c6304c92 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/s3/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/s3/source.py
@@ -5,8 +5,8 @@
 import pathlib
 import re
 import time
-from collections import OrderedDict
 from datetime import datetime
+from itertools import groupby
 from pathlib import PurePath
 from typing import Any, Dict, Iterable, List, Optional, Tuple
 
@@ -15,25 +15,6 @@
 from pyspark.conf import SparkConf
 from pyspark.sql import SparkSession
 from pyspark.sql.dataframe import DataFrame
-from pyspark.sql.types import (
-    ArrayType,
-    BinaryType,
-    BooleanType,
-    ByteType,
-    DateType,
-    DecimalType,
-    DoubleType,
-    FloatType,
-    IntegerType,
-    LongType,
-    MapType,
-    NullType,
-    ShortType,
-    StringType,
-    StructField,
-    StructType,
-    TimestampType,
-)
 from pyspark.sql.utils import AnalysisException
 from smart_open import open as smart_open
 
@@ -52,7 +33,7 @@
     platform_name,
     support_status,
 )
-from datahub.ingestion.api.source import MetadataWorkUnitProcessor, SourceReport
+from datahub.ingestion.api.source import MetadataWorkUnitProcessor
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.source.aws.s3_boto_utils import get_s3_tags, list_folders
 from datahub.ingestion.source.aws.s3_util import (
@@ -62,35 +43,31 @@
     strip_s3_prefix,
 )
 from datahub.ingestion.source.data_lake_common.data_lake_utils import ContainerWUCreator
+from datahub.ingestion.source.data_lake_common.path_spec import FolderTraversalMethod
 from datahub.ingestion.source.s3.config import DataLakeSourceConfig, PathSpec
 from datahub.ingestion.source.s3.report import DataLakeSourceReport
 from datahub.ingestion.source.schema_inference import avro, csv_tsv, json, parquet
+from datahub.ingestion.source.schema_inference.base import SchemaInferenceBase
 from datahub.ingestion.source.state.stale_entity_removal_handler import (
     StaleEntityRemovalHandler,
 )
 from datahub.ingestion.source.state.stateful_ingestion_base import (
     StatefulIngestionSourceBase,
 )
+from datahub.metadata.com.linkedin.pegasus2avro.common import TimeStamp
 from datahub.metadata.com.linkedin.pegasus2avro.schema import (
-    BooleanTypeClass,
-    BytesTypeClass,
-    DateTypeClass,
-    NullTypeClass,
-    NumberTypeClass,
-    RecordTypeClass,
     SchemaField,
-    SchemaFieldDataType,
     SchemaMetadata,
     StringTypeClass,
-    TimeTypeClass,
 )
 from datahub.metadata.schema_classes import (
     DataPlatformInstanceClass,
     DatasetPropertiesClass,
-    MapTypeClass,
     OperationClass,
     OperationTypeClass,
     OtherSchemaClass,
+    PartitionsSummaryClass,
+    PartitionSummaryClass,
     SchemaFieldDataTypeClass,
     _Aspect,
 )
@@ -101,55 +78,11 @@
 logging.getLogger("py4j").setLevel(logging.ERROR)
 logger: logging.Logger = logging.getLogger(__name__)
 
-# for a list of all types, see https://spark.apache.org/docs/3.0.3/api/python/_modules/pyspark/sql/types.html
-_field_type_mapping = {
-    NullType: NullTypeClass,
-    StringType: StringTypeClass,
-    BinaryType: BytesTypeClass,
-    BooleanType: BooleanTypeClass,
-    DateType: DateTypeClass,
-    TimestampType: TimeTypeClass,
-    DecimalType: NumberTypeClass,
-    DoubleType: NumberTypeClass,
-    FloatType: NumberTypeClass,
-    ByteType: BytesTypeClass,
-    IntegerType: NumberTypeClass,
-    LongType: NumberTypeClass,
-    ShortType: NumberTypeClass,
-    ArrayType: NullTypeClass,
-    MapType: MapTypeClass,
-    StructField: RecordTypeClass,
-    StructType: RecordTypeClass,
-}
 PAGE_SIZE = 1000
 
 # Hack to support the .gzip extension with smart_open.
 so_compression.register_compressor(".gzip", so_compression._COMPRESSOR_REGISTRY[".gz"])
 
-
-def get_column_type(
-    report: SourceReport, dataset_name: str, column_type: str
-) -> SchemaFieldDataType:
-    """
-    Maps known Spark types to datahub types
-    """
-    TypeClass: Any = None
-
-    for field_type, type_class in _field_type_mapping.items():
-        if isinstance(column_type, field_type):
-            TypeClass = type_class
-            break
-
-    # if still not found, report the warning
-    if TypeClass is None:
-        report.report_warning(
-            dataset_name, f"unable to map type {column_type} to metadata schema"
-        )
-        TypeClass = NullTypeClass
-
-    return SchemaFieldDataType(type=TypeClass())
-
-
 # config flags to emit telemetry for
 config_options_to_report = [
     "platform",
@@ -205,28 +138,56 @@ def partitioned_folder_comparator(folder1: str, folder2: str) -> int:
             return 1 if folder1 > folder2 else -1
 
 
+@dataclasses.dataclass
+class Folder:
+    creation_time: datetime
+    modification_time: datetime
+    size: int
+    sample_file: str
+    partition_id: Optional[List[Tuple[str, str]]] = None
+    is_partition: bool = False
+
+    def partition_id_text(self) -> Optional[str]:
+        return (
+            "/".join([f"{k}={v}" for k, v in self.partition_id])
+            if self.partition_id
+            else None
+        )
+
+
+@dataclasses.dataclass
+class BrowsePath:
+    file: str
+    timestamp: datetime
+    size: int
+    partitions: List[Folder]
+    content_type: Optional[str] = None
+
+
 @dataclasses.dataclass
 class TableData:
     display_name: str
     is_s3: bool
     full_path: str
-    partitions: Optional[OrderedDict]
     timestamp: datetime
     table_path: str
     size_in_bytes: int
     number_of_files: int
+    partitions: Optional[List[Folder]] = None
+    max_partition: Optional[Folder] = None
+    min_partition: Optional[Folder] = None
+    content_type: Optional[str] = None
 
 
 @platform_name("S3 / Local Files", id="s3")
 @config_class(DataLakeSourceConfig)
 @support_status(SupportStatus.INCUBATING)
+@capability(SourceCapability.CONTAINERS, "Enabled by default")
 @capability(SourceCapability.DATA_PROFILING, "Optionally enabled via configuration")
-@capability(SourceCapability.TAGS, "Can extract S3 object/bucket tags if enabled")
 @capability(
-    SourceCapability.DELETION_DETECTION,
-    "Optionally enabled via `stateful_ingestion.remove_stale_metadata`",
-    supported=True,
+    SourceCapability.SCHEMA_METADATA, "Can infer schema from supported file types"
 )
+@capability(SourceCapability.TAGS, "Can extract S3 object/bucket tags if enabled")
 class S3Source(StatefulIngestionSourceBase):
     source_config: DataLakeSourceConfig
     report: DataLakeSourceReport
@@ -419,8 +380,6 @@ def get_fields(self, table_data: TableData, path_spec: PathSpec) -> List:
             # capabilities of smart_open.
             file = smart_open(table_data.full_path, "rb")
 
-        fields = []
-
         extension = pathlib.Path(table_data.full_path).suffix
         from datahub.ingestion.source.data_lake_common.path_spec import (
             SUPPORTED_COMPRESSIONS,
@@ -432,48 +391,64 @@ def get_fields(self, table_data: TableData, path_spec: PathSpec) -> List:
         if extension == "" and path_spec.default_extension:
             extension = f".{path_spec.default_extension}"
 
-        try:
-            if extension == ".parquet":
-                fields = parquet.ParquetInferrer().infer_schema(file)
-            elif extension == ".csv":
-                fields = csv_tsv.CsvInferrer(
-                    max_rows=self.source_config.max_rows
-                ).infer_schema(file)
-            elif extension == ".tsv":
-                fields = csv_tsv.TsvInferrer(
-                    max_rows=self.source_config.max_rows
-                ).infer_schema(file)
-            elif extension == ".jsonl":
-                fields = json.JsonInferrer(
-                    max_rows=self.source_config.max_rows, format="jsonl"
-                ).infer_schema(file)
-            elif extension == ".json":
-                fields = json.JsonInferrer().infer_schema(file)
-            elif extension == ".avro":
-                fields = avro.AvroInferrer().infer_schema(file)
-            else:
+        fields = []
+        inferrer = self._get_inferrer(extension, table_data.content_type)
+        if inferrer:
+            try:
+                fields = inferrer.infer_schema(file)
+                logger.debug(f"Extracted fields in schema: {fields}")
+            except Exception as e:
                 self.report.report_warning(
                     table_data.full_path,
-                    f"file {table_data.full_path} has unsupported extension",
+                    f"could not infer schema for file {table_data.full_path}: {e}",
                 )
-            file.close()
-        except Exception as e:
+        else:
             self.report.report_warning(
                 table_data.full_path,
-                f"could not infer schema for file {table_data.full_path}: {e}",
+                f"file {table_data.full_path} has unsupported extension",
             )
-            file.close()
-        logger.debug(f"Extracted fields in schema: {fields}")
+        file.close()
+
         if self.source_config.sort_schema_fields:
             fields = sorted(fields, key=lambda f: f.fieldPath)
 
-        if self.source_config.add_partition_columns_to_schema:
+        if self.source_config.add_partition_columns_to_schema and table_data.partitions:
             self.add_partition_columns_to_schema(
                 fields=fields, path_spec=path_spec, full_path=table_data.full_path
             )
 
         return fields
 
+    def _get_inferrer(
+        self, extension: str, content_type: Optional[str]
+    ) -> Optional[SchemaInferenceBase]:
+        if content_type == "application/vnd.apache.parquet":
+            return parquet.ParquetInferrer()
+        elif content_type == "text/csv":
+            return csv_tsv.CsvInferrer(max_rows=self.source_config.max_rows)
+        elif content_type == "text/tab-separated-values":
+            return csv_tsv.TsvInferrer(max_rows=self.source_config.max_rows)
+        elif content_type == "application/json":
+            return json.JsonInferrer()
+        elif content_type == "application/avro":
+            return avro.AvroInferrer()
+        elif extension == ".parquet":
+            return parquet.ParquetInferrer()
+        elif extension == ".csv":
+            return csv_tsv.CsvInferrer(max_rows=self.source_config.max_rows)
+        elif extension == ".tsv":
+            return csv_tsv.TsvInferrer(max_rows=self.source_config.max_rows)
+        elif extension == ".jsonl":
+            return json.JsonInferrer(
+                max_rows=self.source_config.max_rows, format="jsonl"
+            )
+        elif extension == ".json":
+            return json.JsonInferrer()
+        elif extension == ".avro":
+            return avro.AvroInferrer()
+        else:
+            return None
+
     def add_partition_columns_to_schema(
         self, path_spec: PathSpec, full_path: str, fields: List[SchemaField]
     ) -> None:
@@ -482,23 +457,23 @@ def add_partition_columns_to_schema(
             if field.fieldPath.startswith("[version=2.0]"):
                 is_fieldpath_v2 = True
                 break
-        vars = path_spec.get_named_vars(full_path)
-        if vars is not None and "partition_key" in vars:
-            for partition_key in vars["partition_key"].values():
-                fields.append(
-                    SchemaField(
-                        fieldPath=f"{partition_key}"
-                        if not is_fieldpath_v2
-                        else f"[version=2.0].[type=string].{partition_key}",
-                        nativeDataType="string",
-                        type=SchemaFieldDataType(StringTypeClass())
-                        if not is_fieldpath_v2
-                        else SchemaFieldDataTypeClass(type=StringTypeClass()),
-                        isPartitioningKey=True,
-                        nullable=True,
-                        recursive=False,
-                    )
+        partition_keys = path_spec.get_partition_from_path(full_path)
+        if not partition_keys:
+            return None
+
+        for partition_key in partition_keys:
+            fields.append(
+                SchemaField(
+                    fieldPath=f"{partition_key[0]}"
+                    if not is_fieldpath_v2
+                    else f"[version=2.0].[type=string].{partition_key[0]}",
+                    nativeDataType="string",
+                    type=SchemaFieldDataTypeClass(StringTypeClass()),
+                    isPartitioningKey=True,
+                    nullable=True,
+                    recursive=False,
                 )
+            )
 
     def get_table_profile(
         self, table_data: TableData, dataset_urn: str
@@ -591,6 +566,39 @@ def _create_table_operation_aspect(self, table_data: TableData) -> OperationClas
 
         return operation
 
+    def __create_partition_summary_aspect(
+        self, partitions: List[Folder]
+    ) -> Optional[PartitionsSummaryClass]:
+        min_partition = min(partitions, key=lambda x: x.creation_time)
+        max_partition = max(partitions, key=lambda x: x.creation_time)
+
+        max_partition_summary: Optional[PartitionSummaryClass] = None
+
+        max_partition_id = max_partition.partition_id_text()
+        if max_partition_id is not None:
+            max_partition_summary = PartitionSummaryClass(
+                partition=max_partition_id,
+                createdTime=int(max_partition.creation_time.timestamp() * 1000),
+                lastModifiedTime=int(
+                    max_partition.modification_time.timestamp() * 1000
+                ),
+            )
+
+        min_partition_summary: Optional[PartitionSummaryClass] = None
+        min_partition_id = min_partition.partition_id_text()
+        if min_partition_id is not None:
+            min_partition_summary = PartitionSummaryClass(
+                partition=min_partition_id,
+                createdTime=int(min_partition.creation_time.timestamp() * 1000),
+                lastModifiedTime=int(
+                    min_partition.modification_time.timestamp() * 1000
+                ),
+            )
+
+        return PartitionsSummaryClass(
+            maxPartition=max_partition_summary, minPartition=min_partition_summary
+        )
+
     def ingest_table(
         self, table_data: TableData, path_spec: PathSpec
     ) -> Iterable[MetadataWorkUnit]:
@@ -623,6 +631,12 @@ def ingest_table(
 
         customProperties = {"schema_inferred_from": str(table_data.full_path)}
 
+        min_partition: Optional[Folder] = None
+        max_partition: Optional[Folder] = None
+        if table_data.partitions:
+            min_partition = min(table_data.partitions, key=lambda x: x.creation_time)
+            max_partition = max(table_data.partitions, key=lambda x: x.creation_time)
+
         if not path_spec.sample_files:
             customProperties.update(
                 {
@@ -630,11 +644,30 @@ def ingest_table(
                     "size_in_bytes": str(table_data.size_in_bytes),
                 }
             )
+        else:
+            if table_data.partitions:
+                customProperties.update(
+                    {
+                        "number_of_partitions": str(
+                            len(table_data.partitions) if table_data.partitions else 0
+                        ),
+                    }
+                )
 
         dataset_properties = DatasetPropertiesClass(
             description="",
             name=table_data.display_name,
             customProperties=customProperties,
+            created=(
+                TimeStamp(time=int(min_partition.creation_time.timestamp() * 1000))
+                if min_partition
+                else None
+            ),
+            lastModified=(
+                TimeStamp(time=int(max_partition.modification_time.timestamp() * 1000))
+                if max_partition
+                else None
+            ),
         )
         aspects.append(dataset_properties)
         if table_data.size_in_bytes > 0:
@@ -683,6 +716,12 @@ def ingest_table(
 
         operation = self._create_table_operation_aspect(table_data)
         aspects.append(operation)
+
+        if table_data.partitions and self.source_config.generate_partition_aspects:
+            aspects.append(
+                self.__create_partition_summary_aspect(table_data.partitions)
+            )
+
         for mcp in MetadataChangeProposalWrapper.construct_many(
             entityUrn=dataset_urn,
             aspects=aspects,
@@ -709,22 +748,36 @@ def extract_table_name(self, path_spec: PathSpec, named_vars: dict) -> str:
         return path_spec.table_name.format_map(named_vars)
 
     def extract_table_data(
-        self, path_spec: PathSpec, path: str, timestamp: datetime, size: int
+        self,
+        path_spec: PathSpec,
+        browse_path: BrowsePath,
     ) -> TableData:
+        path = browse_path.file
+        partitions = browse_path.partitions
         logger.debug(f"Getting table data for path: {path}")
         table_name, table_path = path_spec.extract_table_name_and_path(path)
-        table_data = None
-        table_data = TableData(
+        return TableData(
             display_name=table_name,
             is_s3=self.is_s3_platform(),
             full_path=path,
-            partitions=None,
-            timestamp=timestamp,
+            partitions=partitions,
+            max_partition=partitions[-1] if partitions else None,
+            min_partition=partitions[0] if partitions else None,
+            timestamp=browse_path.timestamp,
             table_path=table_path,
             number_of_files=1,
-            size_in_bytes=size,
+            size_in_bytes=(
+                browse_path.size
+                if browse_path.size
+                else sum(
+                    [
+                        partition.size if partition.size else 0
+                        for partition in partitions
+                    ]
+                )
+            ),
+            content_type=browse_path.content_type,
         )
-        return table_data
 
     def resolve_templated_folders(self, bucket_name: str, prefix: str) -> Iterable[str]:
         folder_split: List[str] = prefix.split("*", 1)
@@ -742,8 +795,17 @@ def resolve_templated_folders(self, bucket_name: str, prefix: str) -> Iterable[s
             )
 
     def get_dir_to_process(
-        self, bucket_name: str, folder: str, path_spec: PathSpec, protocol: str
-    ) -> str:
+        self,
+        bucket_name: str,
+        folder: str,
+        path_spec: PathSpec,
+        protocol: str,
+        min: bool = False,
+    ) -> List[str]:
+
+        # if len(path_spec.include.split("/")) == len(f"{protocol}{bucket_name}/{folder}".split("/")):
+        #    return [f"{protocol}{bucket_name}/{folder}"]
+
         iterator = list_folders(
             bucket_name=bucket_name,
             prefix=folder,
@@ -754,23 +816,102 @@ def get_dir_to_process(
             sorted_dirs = sorted(
                 iterator,
                 key=functools.cmp_to_key(partitioned_folder_comparator),
-                reverse=True,
+                reverse=not min,
             )
+            folders = []
             for dir in sorted_dirs:
                 if path_spec.dir_allowed(f"{protocol}{bucket_name}/{dir}/"):
-                    return self.get_dir_to_process(
+                    folders_list = self.get_dir_to_process(
                         bucket_name=bucket_name,
                         folder=dir + "/",
                         path_spec=path_spec,
                         protocol=protocol,
+                        min=min,
                     )
-            return folder
-        else:
-            return folder
+                    folders.extend(folders_list)
+                    if not path_spec.traversal_method == FolderTraversalMethod.ALL:
+                        return folders
+            if folders:
+                return folders
+            else:
+                return [f"{protocol}{bucket_name}/{folder}"]
+        return [f"{protocol}{bucket_name}/{folder}"]
+
+    def get_folder_info(
+        self,
+        path_spec: PathSpec,
+        bucket: Any,  # Todo: proper type
+        prefix: str,
+    ) -> List[Folder]:
+        """
+        Retrieves all the folders in a path by listing all the files in the prefix.
+        If the prefix is a full path then only that folder will be extracted.
+
+        A folder has creation and modification times, size, and a sample file path.
+        - Creation time is the earliest creation time of all files in the folder.
+        - Modification time is the latest modification time of all files in the folder.
+        - Size is the sum of all file sizes in the folder.
+        - Sample file path is used for schema inference later. (sample file is the latest created file in the folder)
+
+        Parameters:
+        path_spec (PathSpec): The path specification used to determine partitioning.
+        bucket (Any): The S3 bucket object.
+        prefix (str): The prefix path in the S3 bucket to list objects from.
+
+        Returns:
+        List[Folder]: A list of Folder objects representing the partitions found.
+        """
+
+        prefix_to_list = prefix
+        files = list(
+            bucket.objects.filter(Prefix=f"{prefix_to_list}").page_size(PAGE_SIZE)
+        )
+        files = sorted(files, key=lambda a: a.last_modified)
+        grouped_files = groupby(files, lambda x: x.key.rsplit("/", 1)[0])
+
+        partitions: List[Folder] = []
+        for key, group in grouped_files:
+            file_size = 0
+            creation_time = None
+            modification_time = None
+
+            for item in group:
+                file_path = self.create_s3_path(item.bucket_name, item.key)
+                if not path_spec.allowed(file_path):
+                    logger.debug(f"File {file_path} not allowed and skipping")
+                    continue
+                file_size += item.size
+                if creation_time is None or item.last_modified < creation_time:
+                    creation_time = item.last_modified
+                if modification_time is None or item.last_modified > modification_time:
+                    modification_time = item.last_modified
+                    max_file = item
+
+            if modification_time is None:
+                logger.warning(
+                    f"Unable to find any files in the folder {key}. Skipping..."
+                )
+                continue
+
+            id = path_spec.get_partition_from_path(
+                self.create_s3_path(max_file.bucket_name, max_file.key)
+            )
 
-    def s3_browser(
-        self, path_spec: PathSpec, sample_size: int
-    ) -> Iterable[Tuple[str, datetime, int]]:
+            # If id is None, it means the folder is not a partition
+            partitions.append(
+                Folder(
+                    partition_id=id,
+                    is_partition=bool(id),
+                    creation_time=creation_time if creation_time else None,
+                    modification_time=modification_time,
+                    sample_file=self.create_s3_path(max_file.bucket_name, max_file.key),
+                    size=file_size,
+                )
+            )
+
+        return partitions
+
+    def s3_browser(self, path_spec: PathSpec, sample_size: int) -> Iterable[BrowsePath]:
         if self.source_config.aws_config is None:
             raise ValueError("aws_config not set. Cannot browse s3")
         s3 = self.source_config.aws_config.get_s3_resource(
@@ -802,6 +943,9 @@ def s3_browser(
                         include = include.replace(max_match, "*")
                     max_start = match.start()
                     max_match = match.group()
+                    # We stop at {table}
+                    if max_match == "{table}":
+                        break
 
             table_index = include.find(max_match)
             for folder in self.resolve_templated_folders(
@@ -811,24 +955,69 @@ def s3_browser(
                     for f in list_folders(
                         bucket_name, f"{folder}", self.source_config.aws_config
                     ):
+                        dirs_to_process = []
                         logger.info(f"Processing folder: {f}")
-                        protocol = ContainerWUCreator.get_protocol(path_spec.include)
-                        dir_to_process = self.get_dir_to_process(
-                            bucket_name=bucket_name,
-                            folder=f + "/",
-                            path_spec=path_spec,
-                            protocol=protocol,
+                        if path_spec.traversal_method == FolderTraversalMethod.ALL:
+                            dirs_to_process.append(f)
+                        else:
+                            if (
+                                path_spec.traversal_method
+                                == FolderTraversalMethod.MIN_MAX
+                                or path_spec.traversal_method
+                                == FolderTraversalMethod.MAX
+                            ):
+                                protocol = ContainerWUCreator.get_protocol(
+                                    path_spec.include
+                                )
+                                dirs_to_process_max = self.get_dir_to_process(
+                                    bucket_name=bucket_name,
+                                    folder=f + "/",
+                                    path_spec=path_spec,
+                                    protocol=protocol,
+                                )
+                                dirs_to_process.append(dirs_to_process_max[0])
+
+                            if (
+                                path_spec.traversal_method
+                                == FolderTraversalMethod.MIN_MAX
+                            ):
+                                dirs_to_process_min = self.get_dir_to_process(
+                                    bucket_name=bucket_name,
+                                    folder=f + "/",
+                                    path_spec=path_spec,
+                                    protocol=protocol,
+                                    min=True,
+                                )
+                                dirs_to_process.append(dirs_to_process_min[0])
+                        folders = []
+                        for dir in dirs_to_process:
+                            logger.info(f"Getting files from folder: {dir}")
+                            prefix_to_process = dir.rstrip("\\").lstrip(
+                                self.create_s3_path(bucket_name, "/")
+                            )
+
+                            folders.extend(
+                                self.get_folder_info(
+                                    path_spec, bucket, prefix_to_process
+                                )
+                            )
+                        max_folder = None
+                        if folders:
+                            max_folder = max(folders, key=lambda x: x.modification_time)
+                        if not max_folder:
+                            logger.warning(
+                                f"Unable to find any files in the folder {dir}. Skipping..."
+                            )
+                            continue
+
+                        partitions = list(filter(lambda x: x.is_partition, folders))
+                        yield BrowsePath(
+                            file=max_folder.sample_file,
+                            timestamp=max_folder.modification_time,
+                            size=max_folder.size,
+                            partitions=partitions,
+                            # TODO: Support content type inference for partitions
                         )
-                        logger.info(f"Getting files from folder: {dir_to_process}")
-                        dir_to_process = dir_to_process.rstrip("\\")
-                        for obj in (
-                            bucket.objects.filter(Prefix=f"{dir_to_process}")
-                            .page_size(PAGE_SIZE)
-                            .limit(sample_size)
-                        ):
-                            s3_path = self.create_s3_path(obj.bucket_name, obj.key)
-                            logger.debug(f"Sampling file: {s3_path}")
-                            yield s3_path, obj.last_modified, obj.size,
                 except Exception as e:
                     # This odd check if being done because boto does not have a proper exception to catch
                     # The exception that appears in stacktrace cannot actually be caught without a lot more work
@@ -848,18 +1037,32 @@ def s3_browser(
             for obj in bucket.objects.filter(Prefix=prefix).page_size(PAGE_SIZE):
                 s3_path = self.create_s3_path(obj.bucket_name, obj.key)
                 logger.debug(f"Path: {s3_path}")
-                yield s3_path, obj.last_modified, obj.size,
+
+                content_type = None
+                if self.source_config.use_s3_content_type:
+                    content_type = s3.Object(obj.bucket_name, obj.key).content_type
+
+                yield BrowsePath(
+                    file=s3_path,
+                    timestamp=obj.last_modified,
+                    size=obj.size,
+                    partitions=[],
+                    content_type=content_type,
+                )
 
     def create_s3_path(self, bucket_name: str, key: str) -> str:
         return f"s3://{bucket_name}/{key}"
 
-    def local_browser(self, path_spec: PathSpec) -> Iterable[Tuple[str, datetime, int]]:
+    def local_browser(self, path_spec: PathSpec) -> Iterable[BrowsePath]:
         prefix = self.get_prefix(path_spec.include)
         if os.path.isfile(prefix):
             logger.debug(f"Scanning single local file: {prefix}")
-            yield prefix, datetime.utcfromtimestamp(
-                os.path.getmtime(prefix)
-            ), os.path.getsize(prefix)
+            yield BrowsePath(
+                file=prefix,
+                timestamp=datetime.utcfromtimestamp(os.path.getmtime(prefix)),
+                size=os.path.getsize(prefix),
+                partitions=[],
+            )
         else:
             logger.debug(f"Scanning files under local folder: {prefix}")
             for root, dirs, files in os.walk(prefix):
@@ -870,9 +1073,14 @@ def local_browser(self, path_spec: PathSpec) -> Iterable[Tuple[str, datetime, in
                     full_path = PurePath(
                         os.path.normpath(os.path.join(root, file))
                     ).as_posix()
-                    yield full_path, datetime.utcfromtimestamp(
-                        os.path.getmtime(full_path)
-                    ), os.path.getsize(full_path)
+                    yield BrowsePath(
+                        file=full_path,
+                        timestamp=datetime.utcfromtimestamp(
+                            os.path.getmtime(full_path)
+                        ),
+                        size=os.path.getsize(full_path),
+                        partitions=[],
+                    )
 
     def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
         self.container_WU_creator = ContainerWUCreator(
@@ -891,12 +1099,14 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                     else self.local_browser(path_spec)
                 )
                 table_dict: Dict[str, TableData] = {}
-                for file, timestamp, size in file_browser:
-                    if not path_spec.allowed(file):
+                for browse_path in file_browser:
+                    if not path_spec.allowed(
+                        browse_path.file,
+                        ignore_ext=self.is_s3_platform()
+                        and self.source_config.use_s3_content_type,
+                    ):
                         continue
-                    table_data = self.extract_table_data(
-                        path_spec, file, timestamp, size
-                    )
+                    table_data = self.extract_table_data(path_spec, browse_path)
                     if table_data.table_path not in table_dict:
                         table_dict[table_data.table_path] = table_data
                     else:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sac/__init__.py b/metadata-ingestion/src/datahub/ingestion/source/sac/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sac/sac.py b/metadata-ingestion/src/datahub/ingestion/source/sac/sac.py
new file mode 100644
index 00000000000000..88cb1f821ff0d6
--- /dev/null
+++ b/metadata-ingestion/src/datahub/ingestion/source/sac/sac.py
@@ -0,0 +1,775 @@
+import json
+import logging
+from dataclasses import dataclass
+from functools import partial
+from typing import Any, Dict, Iterable, List, Optional, Set, Tuple
+
+import pyodata
+import pyodata.v2.model
+import pyodata.v2.service
+from authlib.integrations.requests_client import OAuth2Session
+from pydantic import Field, SecretStr, validator
+from requests.adapters import HTTPAdapter
+from urllib3.util.retry import Retry
+
+from datahub.configuration.common import AllowDenyPattern
+from datahub.configuration.source_common import (
+    DEFAULT_ENV,
+    DatasetSourceConfigMixin,
+    EnvConfigMixin,
+)
+from datahub.emitter.mce_builder import (
+    dataset_urn_to_key,
+    make_dashboard_urn,
+    make_data_platform_urn,
+    make_dataplatform_instance_urn,
+    make_dataset_urn_with_platform_instance,
+    make_user_urn,
+)
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.ingestion.api.common import PipelineContext
+from datahub.ingestion.api.decorators import (
+    SupportStatus,
+    capability,
+    config_class,
+    platform_name,
+    support_status,
+)
+from datahub.ingestion.api.incremental_lineage_helper import (
+    IncrementalLineageConfigMixin,
+    auto_incremental_lineage,
+)
+from datahub.ingestion.api.source import (
+    CapabilityReport,
+    MetadataWorkUnitProcessor,
+    SourceCapability,
+    TestableSource,
+    TestConnectionReport,
+)
+from datahub.ingestion.api.workunit import MetadataWorkUnit
+from datahub.ingestion.source.common.subtypes import BIAssetSubTypes, DatasetSubTypes
+from datahub.ingestion.source.sac.sac_common import (
+    ImportDataModelColumn,
+    Resource,
+    ResourceModel,
+)
+from datahub.ingestion.source.state.stale_entity_removal_handler import (
+    StaleEntityRemovalHandler,
+    StaleEntityRemovalSourceReport,
+    StatefulStaleMetadataRemovalConfig,
+)
+from datahub.ingestion.source.state.stateful_ingestion_base import (
+    StatefulIngestionConfigBase,
+    StatefulIngestionSourceBase,
+)
+from datahub.metadata.schema_classes import (
+    AuditStampClass,
+    BrowsePathEntryClass,
+    BrowsePathsClass,
+    BrowsePathsV2Class,
+    ChangeAuditStampsClass,
+    DashboardInfoClass,
+    DataPlatformInstanceClass,
+    DatasetLineageTypeClass,
+    DatasetPropertiesClass,
+    DateTypeClass,
+    NullTypeClass,
+    NumberTypeClass,
+    SchemaFieldClass,
+    SchemaFieldDataTypeClass,
+    SchemalessClass,
+    SchemaMetadataClass,
+    StatusClass,
+    StringTypeClass,
+    SubTypesClass,
+    UpstreamClass,
+    UpstreamLineageClass,
+)
+from datahub.utilities import config_clean
+
+logger = logging.getLogger(__name__)
+
+
+class ConnectionMappingConfig(EnvConfigMixin):
+    platform: Optional[str] = Field(
+        default=None, description="The platform that this connection mapping belongs to"
+    )
+
+    platform_instance: Optional[str] = Field(
+        default=None,
+        description="The instance of the platform that this connection mapping belongs to",
+    )
+
+    env: str = Field(
+        default=DEFAULT_ENV,
+        description="The environment that this connection mapping belongs to",
+    )
+
+
+class SACSourceConfig(
+    StatefulIngestionConfigBase, DatasetSourceConfigMixin, IncrementalLineageConfigMixin
+):
+    stateful_ingestion: Optional[StatefulStaleMetadataRemovalConfig] = Field(
+        default=None,
+        description="Stateful ingestion related configs",
+    )
+
+    tenant_url: str = Field(description="URL of the SAP Analytics Cloud tenant")
+    token_url: str = Field(
+        description="URL of the OAuth token endpoint of the SAP Analytics Cloud tenant"
+    )
+    client_id: str = Field(description="Client ID for the OAuth authentication")
+    client_secret: SecretStr = Field(
+        description="Client secret for the OAuth authentication"
+    )
+
+    ingest_stories: bool = Field(
+        default=True,
+        description="Controls whether Stories should be ingested",
+    )
+
+    ingest_applications: bool = Field(
+        default=True,
+        description="Controls whether Analytic Applications should be ingested",
+    )
+
+    ingest_import_data_model_schema_metadata: bool = Field(
+        default=True,
+        description="Controls whether schema metadata of Import Data Models should be ingested (ingesting schema metadata of Import Data Models significantly increases overall ingestion time)",
+    )
+
+    resource_id_pattern: AllowDenyPattern = Field(
+        AllowDenyPattern.allow_all(),
+        description="Patterns for selecting resource ids that are to be included",
+    )
+
+    resource_name_pattern: AllowDenyPattern = Field(
+        AllowDenyPattern.allow_all(),
+        description="Patterns for selecting resource names that are to be included",
+    )
+
+    folder_pattern: AllowDenyPattern = Field(
+        AllowDenyPattern.allow_all(),
+        description="Patterns for selecting folders that are to be included",
+    )
+
+    connection_mapping: Dict[str, ConnectionMappingConfig] = Field(
+        default={}, description="Custom mappings for connections"
+    )
+
+    query_name_template: Optional[str] = Field(
+        default="QUERY/{name}",
+        description="Template for generating dataset urns of consumed queries, the placeholder {query} can be used within the template for inserting the name of the query",
+    )
+
+    @validator("tenant_url", "token_url")
+    def remove_trailing_slash(cls, v):
+        return config_clean.remove_trailing_slashes(v)
+
+
+@dataclass
+class SACSourceReport(StaleEntityRemovalSourceReport):
+    pass
+
+
+@platform_name("SAP Analytics Cloud", id="sac")
+@config_class(SACSourceConfig)
+@support_status(SupportStatus.TESTING)
+@capability(SourceCapability.PLATFORM_INSTANCE, "Enabled by default")
+@capability(SourceCapability.DESCRIPTIONS, "Enabled by default")
+@capability(
+    SourceCapability.LINEAGE_COARSE,
+    "Enabled by default (only for Live Data Models)",
+)
+@capability(SourceCapability.DELETION_DETECTION, "Enabled via stateful ingestion")
+@capability(
+    SourceCapability.SCHEMA_METADATA,
+    "Enabled by default (only for Import Data Models)",
+)
+class SACSource(StatefulIngestionSourceBase, TestableSource):
+    config: SACSourceConfig
+    report: SACSourceReport
+    platform = "sac"
+
+    session: OAuth2Session
+    client: pyodata.Client
+
+    ingested_dataset_entities: Set[str] = set()
+    ingested_upstream_dataset_keys: Set[str] = set()
+
+    def __init__(self, config: SACSourceConfig, ctx: PipelineContext):
+        super().__init__(config, ctx)
+        self.config = config
+        self.report = SACSourceReport()
+
+        self.session, self.client = SACSource.get_sac_connection(self.config)
+
+    def close(self) -> None:
+        self.session.close()
+        super().close()
+
+    @classmethod
+    def create(cls, config_dict: dict, ctx: PipelineContext) -> "SACSource":
+        config = SACSourceConfig.parse_obj(config_dict)
+        return cls(config, ctx)
+
+    @staticmethod
+    def test_connection(config_dict: dict) -> TestConnectionReport:
+        test_report = TestConnectionReport()
+
+        try:
+            config = SACSourceConfig.parse_obj(config_dict)
+
+            # when creating the pyodata.Client, the metadata is automatically parsed and validated
+            session, _ = SACSource.get_sac_connection(config)
+
+            # test the Data Import Service separately here, because it requires specific properties when configuring the OAuth client
+            response = session.get(url=f"{config.tenant_url}/api/v1/dataimport/models")
+            response.raise_for_status()
+
+            session.close()
+
+            test_report.basic_connectivity = CapabilityReport(capable=True)
+        except Exception as e:
+            test_report.basic_connectivity = CapabilityReport(
+                capable=False, failure_reason=f"{e}"
+            )
+
+        return test_report
+
+    def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
+        return [
+            *super().get_workunit_processors(),
+            partial(
+                auto_incremental_lineage,
+                self.config.incremental_lineage,
+            ),
+            StaleEntityRemovalHandler.create(
+                self, self.config, self.ctx
+            ).workunit_processor,
+        ]
+
+    def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
+        if self.config.ingest_stories or self.config.ingest_applications:
+            resources = self.get_resources()
+
+            for resource in resources:
+                datasets = []
+
+                for resource_model in resource.resource_models:
+                    dataset_urn = make_dataset_urn_with_platform_instance(
+                        platform=self.platform,
+                        name=f"{resource_model.namespace}:{resource_model.model_id}",
+                        platform_instance=self.config.platform_instance,
+                        env=self.config.env,
+                    )
+
+                    if dataset_urn not in datasets:
+                        datasets.append(dataset_urn)
+
+                    if dataset_urn in self.ingested_dataset_entities:
+                        continue
+
+                    self.ingested_dataset_entities.add(dataset_urn)
+
+                    yield from self.get_model_workunits(dataset_urn, resource_model)
+
+                yield from self.get_resource_workunits(resource, datasets)
+
+    def get_report(self) -> SACSourceReport:
+        return self.report
+
+    def get_resource_workunits(
+        self, resource: Resource, datasets: List[str]
+    ) -> Iterable[MetadataWorkUnit]:
+        dashboard_urn = make_dashboard_urn(
+            platform=self.platform,
+            name=resource.resource_id,
+            platform_instance=self.config.platform_instance,
+        )
+
+        if resource.ancestor_path:
+            mcp = MetadataChangeProposalWrapper(
+                entityUrn=dashboard_urn,
+                aspect=BrowsePathsClass(
+                    paths=[
+                        f"/{self.platform}/{resource.ancestor_path}",
+                    ],
+                ),
+            )
+
+            yield mcp.as_workunit()
+
+            mcp = MetadataChangeProposalWrapper(
+                entityUrn=dashboard_urn,
+                aspect=BrowsePathsV2Class(
+                    path=[
+                        BrowsePathEntryClass(id=folder_name)
+                        for folder_name in resource.ancestor_path.split("/")
+                    ],
+                ),
+            )
+
+            yield mcp.as_workunit()
+
+        if self.config.platform_instance is not None:
+            mcp = MetadataChangeProposalWrapper(
+                entityUrn=dashboard_urn,
+                aspect=DataPlatformInstanceClass(
+                    platform=make_data_platform_urn(self.platform),
+                    instance=make_dataplatform_instance_urn(
+                        self.platform, self.config.platform_instance
+                    ),
+                ),
+            )
+
+            yield mcp.as_workunit()
+
+        mcp = MetadataChangeProposalWrapper(
+            entityUrn=dashboard_urn,
+            aspect=DashboardInfoClass(
+                title=resource.name,
+                description=resource.description,
+                lastModified=ChangeAuditStampsClass(
+                    created=AuditStampClass(
+                        time=round(resource.created_time.timestamp() * 1000),
+                        actor=make_user_urn(resource.created_by)
+                        if resource.created_by
+                        else "urn:li:corpuser:unknown",
+                    ),
+                    lastModified=AuditStampClass(
+                        time=round(resource.modified_time.timestamp() * 1000),
+                        actor=make_user_urn(resource.modified_by)
+                        if resource.modified_by
+                        else "urn:li:corpuser:unknown",
+                    ),
+                ),
+                customProperties={
+                    "resourceType": resource.resource_type,
+                    "resourceSubtype": resource.resource_subtype,
+                    "storyId": resource.story_id,
+                    "isMobile": str(resource.is_mobile),
+                },
+                datasets=sorted(datasets) if datasets else None,
+                externalUrl=f"{self.config.tenant_url}{resource.open_url}",
+            ),
+        )
+
+        yield mcp.as_workunit()
+
+        type_name: Optional[str] = None
+        if resource.resource_subtype == "":
+            type_name = BIAssetSubTypes.SAC_STORY
+        elif resource.resource_subtype == "APPLICATION":
+            type_name = BIAssetSubTypes.SAC_APPLICATION
+
+        if type_name:
+            mcp = MetadataChangeProposalWrapper(
+                entityUrn=dashboard_urn,
+                aspect=SubTypesClass(
+                    typeNames=[type_name],
+                ),
+            )
+
+            yield mcp.as_workunit()
+
+    def get_model_workunits(
+        self, dataset_urn: str, model: ResourceModel
+    ) -> Iterable[MetadataWorkUnit]:
+        mcp = MetadataChangeProposalWrapper(
+            entityUrn=dataset_urn,
+            aspect=DatasetPropertiesClass(
+                name=model.name,
+                description=model.description,
+                customProperties={
+                    "namespace": model.namespace,
+                    "modelId": model.model_id,
+                    "isImport": "true" if model.is_import else "false",
+                },
+                externalUrl=f"{self.config.tenant_url}/sap/fpa/ui/tenants/3c44c#view_id=model;model_id={model.namespace}:{model.model_id}",
+            ),
+        )
+
+        yield mcp.as_workunit()
+
+        if model.is_import and self.config.ingest_import_data_model_schema_metadata:
+            primary_fields: List[str] = []
+            schema_fields: List[SchemaFieldClass] = []
+
+            columns = self.get_import_data_model_columns(model_id=model.model_id)
+            for column in columns:
+
+                schema_field = SchemaFieldClass(
+                    fieldPath=column.name,
+                    type=self.get_schema_field_data_type(column),
+                    nativeDataType=self.get_schema_field_native_data_type(column),
+                    description=column.description,
+                    isPartOfKey=column.is_key,
+                )
+
+                schema_fields.append(schema_field)
+
+                if column.is_key:
+                    primary_fields.append(column.name)
+
+            mcp = MetadataChangeProposalWrapper(
+                entityUrn=dataset_urn,
+                aspect=SchemaMetadataClass(
+                    schemaName=model.model_id,
+                    platform=make_data_platform_urn(self.platform),
+                    version=0,
+                    hash="",
+                    platformSchema=SchemalessClass(),
+                    fields=schema_fields,
+                    primaryKeys=primary_fields,
+                ),
+            )
+
+            yield mcp.as_workunit()
+
+        if model.system_type in ("BW", "HANA") and model.external_id is not None:
+            upstream_dataset_name: Optional[str] = None
+
+            if model.system_type == "BW" and model.external_id.startswith(
+                "query:"
+            ):  # query:[][][query]
+                query = model.external_id[11:-1]
+                upstream_dataset_name = self.get_query_name(query)
+            elif model.system_type == "HANA" and model.external_id.startswith(
+                "view:"
+            ):  # view:[schema][schema.namespace][view]
+                schema, namespace_with_schema, view = model.external_id.split("][", 2)
+                schema = schema[6:]
+                namespace: Optional[str] = None
+                if len(schema) < len(namespace_with_schema):
+                    namespace = namespace_with_schema[len(f"{schema}.") :]
+                view = view[:-1]
+                upstream_dataset_name = self.get_view_name(schema, namespace, view)
+
+            if upstream_dataset_name is not None:
+                if model.connection_id in self.config.connection_mapping:
+                    connection = self.config.connection_mapping[model.connection_id]
+                    platform = (
+                        connection.platform
+                        if connection.platform
+                        else model.system_type.lower()
+                    )
+                    platform_instance = connection.platform_instance
+                    env = connection.env
+                else:
+                    platform = model.system_type.lower()
+                    platform_instance = model.connection_id
+                    env = DEFAULT_ENV
+
+                    logger.info(
+                        f"No connection mapping found for connection with id {model.connection_id}, connection id will be used as platform instance"
+                    )
+
+                upstream_dataset_urn = make_dataset_urn_with_platform_instance(
+                    platform=platform,
+                    name=upstream_dataset_name,
+                    platform_instance=platform_instance,
+                    env=env,
+                )
+
+                if upstream_dataset_urn not in self.ingested_upstream_dataset_keys:
+                    mcp = MetadataChangeProposalWrapper(
+                        entityUrn=upstream_dataset_urn,
+                        aspect=dataset_urn_to_key(upstream_dataset_urn),
+                    )
+
+                    yield mcp.as_workunit(is_primary_source=False)
+
+                    self.ingested_upstream_dataset_keys.add(upstream_dataset_urn)
+
+                mcp = MetadataChangeProposalWrapper(
+                    entityUrn=dataset_urn,
+                    aspect=UpstreamLineageClass(
+                        upstreams=[
+                            UpstreamClass(
+                                dataset=upstream_dataset_urn,
+                                type=DatasetLineageTypeClass.COPY,
+                            ),
+                        ],
+                    ),
+                )
+
+                yield mcp.as_workunit()
+            else:
+                self.report.report_warning(
+                    "unknown-upstream-dataset",
+                    f"Unknown upstream dataset for model with id {model.namespace}:{model.model_id} and external id {model.external_id}",
+                )
+        elif model.system_type is not None:
+            self.report.report_warning(
+                "unknown-system-type",
+                f"Unknown system type {model.system_type} for model with id {model.namespace}:{model.model_id} and external id {model.external_id}",
+            )
+
+        mcp = MetadataChangeProposalWrapper(
+            entityUrn=dataset_urn,
+            aspect=StatusClass(
+                removed=False,
+            ),
+        )
+
+        yield mcp.as_workunit()
+
+        if model.external_id and model.connection_id and model.system_type:
+            type_name = DatasetSubTypes.SAC_LIVE_DATA_MODEL
+        elif model.is_import:
+            type_name = DatasetSubTypes.SAC_IMPORT_DATA_MODEL
+        else:
+            type_name = DatasetSubTypes.SAC_MODEL
+
+        mcp = MetadataChangeProposalWrapper(
+            entityUrn=dataset_urn,
+            aspect=SubTypesClass(
+                typeNames=[type_name],
+            ),
+        )
+
+        yield mcp.as_workunit()
+
+        mcp = MetadataChangeProposalWrapper(
+            entityUrn=dataset_urn,
+            aspect=DataPlatformInstanceClass(
+                platform=make_data_platform_urn(self.platform),
+                instance=self.config.platform_instance,
+            ),
+        )
+
+        yield mcp.as_workunit()
+
+    @staticmethod
+    def get_sac_connection(
+        config: SACSourceConfig,
+    ) -> Tuple[OAuth2Session, pyodata.Client]:
+        session = OAuth2Session(
+            client_id=config.client_id,
+            client_secret=config.client_secret.get_secret_value(),
+            token_endpoint=config.token_url,
+            token_endpoint_auth_method="client_secret_post",
+            grant_type="client_credentials",
+        )
+
+        retries = 3
+        backoff_factor = 10
+        status_forcelist = (500,)
+
+        retry = Retry(
+            total=retries,
+            read=retries,
+            connect=retries,
+            backoff_factor=backoff_factor,
+            status_forcelist=status_forcelist,
+        )
+
+        adapter = HTTPAdapter(max_retries=retry)
+        session.mount("http://", adapter)
+        session.mount("https://", adapter)
+
+        session.register_compliance_hook(
+            "protected_request", _add_sap_sac_custom_auth_header
+        )
+        session.fetch_token()
+
+        client = pyodata.Client(
+            url=f"{config.tenant_url}/api/v1",
+            connection=session,
+            config=pyodata.v2.model.Config(retain_null=True),
+        )
+
+        return session, client
+
+    def get_resources(self) -> Iterable[Resource]:
+        import_data_model_ids = self.get_import_data_model_ids()
+
+        filter = "isTemplate eq 0 and isSample eq 0 and isPublic eq 1"
+        if self.config.ingest_stories and self.config.ingest_applications:
+            filter += " and ((resourceType eq 'STORY' and resourceSubtype eq '') or (resourceType eq 'STORY' and resourceSubtype eq 'APPLICATION'))"
+        elif self.config.ingest_stories and not self.config.ingest_applications:
+            filter += " and resourceType eq 'STORY' and resourceSubtype eq ''"
+        elif not self.config.ingest_stories and self.config.ingest_applications:
+            filter += (
+                " and resourceType eq 'STORY' and resourceSubtype eq 'APPLICATION'"
+            )
+
+        select = "resourceId,resourceType,resourceSubtype,storyId,name,description,createdTime,createdBy,modifiedBy,modifiedTime,openURL,ancestorPath,isMobile"
+
+        entities: pyodata.v2.service.ListWithTotalCount = (
+            self.client.entity_sets.Resources.get_entities()
+            .custom("$format", "json")
+            .filter(filter)
+            .select(select)
+            .execute()
+        )
+        entity: pyodata.v2.service.EntityProxy
+        for entity in entities:
+            resource_id: str = entity.resourceId
+            name: str = entity.name.strip()
+
+            if not self.config.resource_id_pattern.allowed(
+                resource_id
+            ) or not self.config.resource_name_pattern.allowed(name):
+                continue
+
+            ancestor_path: Optional[str] = None
+
+            try:
+                ancestors = json.loads(entity.ancestorPath)
+                ancestor_path = "/".join(
+                    ancestor.replace("/", "%2F") for ancestor in ancestors
+                )
+            except json.JSONDecodeError:
+                pass
+
+            if ancestor_path and not self.config.folder_pattern.allowed(ancestor_path):
+                continue
+
+            resource_models: Set[ResourceModel] = set()
+
+            select = "modelId,name,description,externalId,connectionId,systemType"
+
+            nav_entities: pyodata.v2.service.EntitySetProxy = (
+                entity.nav("resourceModels")
+                .get_entities()
+                .custom("$format", "json")
+                .select(select)
+                .execute()
+            )
+            nav_entity: pyodata.v2.service.EntityProxy
+            for nav_entity in nav_entities:
+                # the model id can have a different structure, commonly all model ids have a namespace (the part before the colon) and the model id itself
+                # t.4.sap.fpa.services.userFriendlyPerfLog:ACTIVITY_LOG is a builtin model without a possiblity to get more metadata about the model
+                # t.4.YV67EM4QBRU035A7TVKERZ786N:YV67EM4QBRU035A7TVKERZ786N is a model id where the model id itself also appears as part of the namespace
+                # t.4:C76tt2j402o1e69wnvrwfcl79c is a model id without the model id itself as part of the namespace
+                model_id: str = nav_entity.modelId
+                namespace, _, model_id = model_id.partition(":")
+
+                resource_models.add(
+                    ResourceModel(
+                        namespace=namespace,
+                        model_id=model_id,
+                        name=nav_entity.name.strip(),
+                        description=nav_entity.description.strip(),
+                        system_type=nav_entity.systemType,  # BW or HANA
+                        connection_id=nav_entity.connectionId,
+                        external_id=nav_entity.externalId,  # query:[][][query] or view:[schema][schema.namespace][view]
+                        is_import=model_id in import_data_model_ids,
+                    )
+                )
+
+            created_by: Optional[str] = entity.createdBy
+            if created_by in ("SYSTEM", "$DELETED_USER$"):
+                created_by = None
+
+            modified_by: Optional[str] = entity.modifiedBy
+            if modified_by in ("SYSTEM", "$DELETED_USER$"):
+                modified_by = None
+
+            yield Resource(
+                resource_id=resource_id,
+                resource_type=entity.resourceType,
+                resource_subtype=entity.resourceSubtype,
+                story_id=entity.storyId,
+                name=name,
+                description=entity.description.strip(),
+                created_time=entity.createdTime,
+                created_by=created_by,
+                modified_time=entity.modifiedTime,
+                modified_by=modified_by,
+                open_url=entity.openURL,
+                ancestor_path=ancestor_path,
+                is_mobile=entity.isMobile,
+                resource_models=frozenset(resource_models),
+            )
+
+    def get_import_data_model_ids(self) -> Set[str]:
+        response = self.session.get(
+            url=f"{self.config.tenant_url}/api/v1/dataimport/models"
+        )
+        response.raise_for_status()
+
+        import_data_model_ids = set(
+            model["modelID"] for model in response.json()["models"]
+        )
+        return import_data_model_ids
+
+    def get_import_data_model_columns(
+        self, model_id: str
+    ) -> List[ImportDataModelColumn]:
+        response = self.session.get(
+            url=f"{self.config.tenant_url}/api/v1/dataimport/models/{model_id}/metadata"
+        )
+        response.raise_for_status()
+
+        model_metadata = response.json()
+
+        columns: List[ImportDataModelColumn] = []
+        for column in model_metadata["factData"]["columns"]:
+            columns.append(
+                ImportDataModelColumn(
+                    name=column["columnName"].strip(),
+                    description=column["descriptionName"].strip(),
+                    property_type=column["propertyType"],
+                    data_type=column["columnDataType"],
+                    max_length=column.get("maxLength"),
+                    precision=column.get("precision"),
+                    scale=column.get("scale"),
+                    is_key=column["isKey"],
+                )
+            )
+
+        return columns
+
+    def get_query_name(self, query: str) -> str:
+        if not self.config.query_name_template:
+            return query
+
+        query_name = self.config.query_name_template
+        query_name = query_name.replace("{name}", query)
+
+        return query_name
+
+    def get_view_name(self, schema: str, namespace: Optional[str], view: str) -> str:
+        if namespace:
+            return f"{schema}.{namespace}::{view}"
+
+        return f"{schema}.{view}"
+
+    def get_schema_field_data_type(
+        self, column: ImportDataModelColumn
+    ) -> SchemaFieldDataTypeClass:
+        if column.property_type == "DATE":
+            return SchemaFieldDataTypeClass(type=DateTypeClass())
+        else:
+            if column.data_type == "string":
+                return SchemaFieldDataTypeClass(type=StringTypeClass())
+            elif column.data_type in ("decimal", "int32"):
+                return SchemaFieldDataTypeClass(type=NumberTypeClass())
+            else:
+                self.report.report_warning(
+                    "unknown-data-type",
+                    f"Unknown data type {column.data_type} found",
+                )
+
+                return SchemaFieldDataTypeClass(type=NullTypeClass())
+
+    def get_schema_field_native_data_type(self, column: ImportDataModelColumn) -> str:
+        native_data_type = column.data_type
+        if column.data_type == "decimal":
+            native_data_type = f"{column.data_type}({column.precision}, {column.scale})"
+        elif column.data_type == "int32":
+            native_data_type = f"{column.data_type}({column.precision})"
+        elif column.max_length is not None:
+            native_data_type = f"{column.data_type}({column.max_length})"
+
+        return native_data_type
+
+
+def _add_sap_sac_custom_auth_header(
+    url: str, headers: Dict[str, str], body: Any
+) -> Tuple[str, Dict[str, str], Any]:
+    headers["x-sap-sac-custom-auth"] = "true"
+    return url, headers, body
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sac/sac_common.py b/metadata-ingestion/src/datahub/ingestion/source/sac/sac_common.py
new file mode 100644
index 00000000000000..457fda1e061814
--- /dev/null
+++ b/metadata-ingestion/src/datahub/ingestion/source/sac/sac_common.py
@@ -0,0 +1,45 @@
+from dataclasses import dataclass
+from datetime import datetime
+from typing import FrozenSet, Optional
+
+
+@dataclass(frozen=True)
+class ResourceModel:
+    namespace: str
+    model_id: str
+    name: str
+    description: str
+    system_type: Optional[str]
+    connection_id: Optional[str]
+    external_id: Optional[str]
+    is_import: bool
+
+
+@dataclass(frozen=True)
+class Resource:
+    resource_id: str
+    resource_type: str
+    resource_subtype: str
+    story_id: str
+    name: str
+    description: str
+    created_time: datetime
+    created_by: Optional[str]
+    modified_time: datetime
+    modified_by: Optional[str]
+    open_url: str
+    ancestor_path: Optional[str]
+    is_mobile: bool
+    resource_models: FrozenSet[ResourceModel]
+
+
+@dataclass(frozen=True)
+class ImportDataModelColumn:
+    name: str
+    description: str
+    property_type: str
+    data_type: str
+    max_length: Optional[int]
+    precision: Optional[int]
+    scale: Optional[int]
+    is_key: bool
diff --git a/metadata-ingestion/src/datahub/ingestion/source/salesforce.py b/metadata-ingestion/src/datahub/ingestion/source/salesforce.py
index 946fdcedc571f8..88679efdf5fc31 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/salesforce.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/salesforce.py
@@ -3,11 +3,12 @@
 import time
 from datetime import datetime
 from enum import Enum
-from typing import Dict, Iterable, List, Optional
+from typing import Any, Dict, Iterable, List, Optional
 
 import requests
 from pydantic import Field, validator
 from simple_salesforce import Salesforce
+from simple_salesforce.exceptions import SalesforceAuthenticationFailed
 
 import datahub.emitter.mce_builder as builder
 from datahub.configuration.common import (
@@ -124,6 +125,9 @@ class SalesforceConfig(DatasetSourceConfigMixin):
         default=dict(),
         description='Regex patterns for tables/schemas to describe domain_key domain key (domain_key can be any string like "sales".) There can be multiple domain keys specified.',
     )
+    api_version: Optional[str] = Field(
+        description="If specified, overrides default version used by the Salesforce package. Example value: '59.0'"
+    )
 
     profiling: SalesforceProfilingConfig = SalesforceProfilingConfig()
 
@@ -199,6 +203,14 @@ def report_dropped(self, ent_name: str) -> None:
     description="Not supported yet",
     supported=False,
 )
+@capability(
+    capability_name=SourceCapability.SCHEMA_METADATA,
+    description="Enabled by default",
+)
+@capability(
+    capability_name=SourceCapability.TAGS,
+    description="Enabled by default",
+)
 class SalesforceSource(Source):
     base_url: str
     config: SalesforceConfig
@@ -214,6 +226,12 @@ def __init__(self, config: SalesforceConfig, ctx: PipelineContext) -> None:
         self.session = requests.Session()
         self.platform: str = "salesforce"
         self.fieldCounts = {}
+        common_args: Dict[str, Any] = {
+            "domain": "test" if self.config.is_sandbox else None,
+            "session": self.session,
+        }
+        if self.config.api_version:
+            common_args["version"] = self.config.api_version
 
         try:
             if self.config.auth is SalesforceAuthType.DIRECT_ACCESS_TOKEN:
@@ -228,8 +246,7 @@ def __init__(self, config: SalesforceConfig, ctx: PipelineContext) -> None:
                 self.sf = Salesforce(
                     instance_url=self.config.instance_url,
                     session_id=self.config.access_token,
-                    session=self.session,
-                    domain="test" if self.config.is_sandbox else None,
+                    **common_args,
                 )
             elif self.config.auth is SalesforceAuthType.USERNAME_PASSWORD:
                 logger.debug("Username/Password Provided in Config")
@@ -247,8 +264,7 @@ def __init__(self, config: SalesforceConfig, ctx: PipelineContext) -> None:
                     username=self.config.username,
                     password=self.config.password,
                     security_token=self.config.security_token,
-                    session=self.session,
-                    domain="test" if self.config.is_sandbox else None,
+                    **common_args,
                 )
 
             elif self.config.auth is SalesforceAuthType.JSON_WEB_TOKEN:
@@ -267,14 +283,24 @@ def __init__(self, config: SalesforceConfig, ctx: PipelineContext) -> None:
                     username=self.config.username,
                     consumer_key=self.config.consumer_key,
                     privatekey=self.config.private_key,
-                    session=self.session,
-                    domain="test" if self.config.is_sandbox else None,
+                    **common_args,
                 )
 
-        except Exception as e:
+        except SalesforceAuthenticationFailed as e:
             logger.error(e)
-            raise ConfigurationError("Salesforce login failed") from e
-        else:
+            if "API_CURRENTLY_DISABLED" in str(e):
+                # https://help.salesforce.com/s/articleView?id=001473830&type=1
+                error = "Salesforce login failed. Please make sure user has API Enabled Access."
+            else:
+                error = "Salesforce login failed. Please verify your credentials."
+                if (
+                    self.config.instance_url
+                    and "sandbox" in self.config.instance_url.lower()
+                ):
+                    error += "Please set `is_sandbox: True` in recipe if this is sandbox account."
+            raise ConfigurationError(error) from e
+
+        if not self.config.api_version:
             # List all REST API versions and use latest one
             versions_url = "https://{instance}/services/data/".format(
                 instance=self.sf.sf_instance,
@@ -282,23 +308,37 @@ def __init__(self, config: SalesforceConfig, ctx: PipelineContext) -> None:
             versions_response = self.sf._call_salesforce("GET", versions_url).json()
             latest_version = versions_response[-1]
             version = latest_version["version"]
+            # we could avoid setting the version like below (after the Salesforce object has been already initiated
+            # above), since, according to the docs:
+            # https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/dome_versions.htm
+            # we don't need to be authenticated to list the versions (so we could perform this call before even
+            # authenticating)
             self.sf.sf_version = version
 
-            self.base_url = "https://{instance}/services/data/v{sf_version}/".format(
-                instance=self.sf.sf_instance, sf_version=version
-            )
+        self.base_url = "https://{instance}/services/data/v{sf_version}/".format(
+            instance=self.sf.sf_instance, sf_version=self.sf.sf_version
+        )
 
-            logger.debug(
-                "Using Salesforce REST API with {label} version: {version}".format(
-                    label=latest_version["label"], version=latest_version["version"]
-                )
+        logger.debug(
+            "Using Salesforce REST API version: {version}".format(
+                version=self.sf.sf_version
             )
+        )
 
     def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
-        sObjects = self.get_salesforce_objects()
-
-        for sObject in sObjects:
-            yield from self.get_salesforce_object_workunits(sObject)
+        try:
+            sObjects = self.get_salesforce_objects()
+        except Exception as e:
+            if "sObject type 'EntityDefinition' is not supported." in str(e):
+                # https://developer.salesforce.com/docs/atlas.en-us.api_tooling.meta/api_tooling/tooling_api_objects_entitydefinition.htm
+                raise ConfigurationError(
+                    "Salesforce EntityDefinition query failed. "
+                    "Please verify if user has 'View Setup and Configuration' permission."
+                ) from e
+            raise e
+        else:
+            for sObject in sObjects:
+                yield from self.get_salesforce_object_workunits(sObject)
 
     def get_salesforce_object_workunits(
         self, sObject: dict
@@ -577,9 +617,9 @@ def _get_schema_field(
 
         TypeClass = FIELD_TYPE_MAPPING.get(fieldType)
         if TypeClass is None:
-            self.report.report_warning(
-                sObjectName,
-                f"Unable to map type {fieldType} to metadata schema",
+            self.report.warning(
+                message="Unable to map field type to metadata schema",
+                context=f"{fieldType} for {fieldName} of {sObjectName}",
             )
             TypeClass = NullTypeClass
 
@@ -677,19 +717,30 @@ def get_schema_metadata_workunit(
             )
         )
 
-        sObject_custom_fields_response = self.sf._call_salesforce(
-            "GET", sObject_custom_fields_query_url
-        ).json()
+        customFields: Dict[str, Dict] = {}
+        try:
+            sObject_custom_fields_response = self.sf._call_salesforce(
+                "GET", sObject_custom_fields_query_url
+            ).json()
 
-        logger.debug(
-            "Received Salesforce {sObject} custom fields response".format(
-                sObject=sObjectName
+            logger.debug(
+                "Received Salesforce {sObject} custom fields response".format(
+                    sObject=sObjectName
+                )
             )
-        )
-        customFields: Dict[str, Dict] = {
-            record["DeveloperName"]: record
-            for record in sObject_custom_fields_response["records"]
-        }
+
+        except Exception as e:
+            error = "Salesforce CustomField query failed. "
+            if "sObject type 'CustomField' is not supported." in str(e):
+                # https://github.com/afawcett/apex-toolingapi/issues/19
+                error += "Please verify if user has 'View All Data' permission."
+
+            self.report.warning(message=error, exc=e)
+        else:
+            customFields = {
+                record["DeveloperName"]: record
+                for record in sObject_custom_fields_response["records"]
+            }
 
         fields: List[SchemaFieldClass] = []
         primaryKeys: List[str] = []
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sigma/sigma.py b/metadata-ingestion/src/datahub/ingestion/source/sigma/sigma.py
index 74d7abb121a3eb..5db5e543510db9 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sigma/sigma.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sigma/sigma.py
@@ -86,8 +86,12 @@
 @platform_name("Sigma")
 @config_class(SigmaSourceConfig)
 @support_status(SupportStatus.INCUBATING)
+@capability(SourceCapability.CONTAINERS, "Enabled by default")
 @capability(SourceCapability.DESCRIPTIONS, "Enabled by default")
+@capability(SourceCapability.LINEAGE_COARSE, "Enabled by default.")
 @capability(SourceCapability.PLATFORM_INSTANCE, "Enabled by default")
+@capability(SourceCapability.SCHEMA_METADATA, "Enabled by default")
+@capability(SourceCapability.TAGS, "Enabled by default")
 @capability(
     SourceCapability.OWNERSHIP,
     "Enabled by default, configured using `ingest_owner`",
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/constants.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/constants.py
index 6f5e22e39d0c84..fc464cc5ea9bb5 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/constants.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/constants.py
@@ -1,7 +1,7 @@
-from enum import Enum
+from datahub.utilities.str_enum import StrEnum
 
 
-class SnowflakeCloudProvider(str, Enum):
+class SnowflakeCloudProvider(StrEnum):
     AWS = "aws"
     GCP = "gcp"
     AZURE = "azure"
@@ -10,7 +10,7 @@ class SnowflakeCloudProvider(str, Enum):
 SNOWFLAKE_DEFAULT_CLOUD = SnowflakeCloudProvider.AWS
 
 
-class SnowflakeEdition(str, Enum):
+class SnowflakeEdition(StrEnum):
     STANDARD = "Standard"
 
     # We use this to represent Enterprise Edition or higher
@@ -44,7 +44,7 @@ class SnowflakeEdition(str, Enum):
 
 # We will always compare with lowercase
 # Complete list for objectDomain - https://docs.snowflake.com/en/sql-reference/account-usage/access_history.html
-class SnowflakeObjectDomain(str, Enum):
+class SnowflakeObjectDomain(StrEnum):
     TABLE = "table"
     EXTERNAL_TABLE = "external table"
     VIEW = "view"
@@ -52,6 +52,7 @@ class SnowflakeObjectDomain(str, Enum):
     DATABASE = "database"
     SCHEMA = "schema"
     COLUMN = "column"
+    ICEBERG_TABLE = "iceberg table"
 
 
 GENERIC_PERMISSION_ERROR_KEY = "permission-error"
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
index ac9164cd0a0008..229c0e292fbafe 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
@@ -1,7 +1,6 @@
 import logging
 from collections import defaultdict
 from dataclasses import dataclass
-from enum import Enum
 from typing import Dict, List, Optional, Set, cast
 
 import pydantic
@@ -29,8 +28,9 @@
     StatefulProfilingConfigMixin,
     StatefulUsageConfigMixin,
 )
-from datahub.ingestion.source_config.usage.snowflake_usage import SnowflakeUsageConfig
+from datahub.ingestion.source.usage.usage_common import BaseUsageConfig
 from datahub.utilities.global_warning_util import add_global_warning
+from datahub.utilities.str_enum import StrEnum
 
 logger = logging.Logger(__name__)
 
@@ -48,7 +48,7 @@
 ]
 
 
-class TagOption(str, Enum):
+class TagOption(StrEnum):
     with_lineage = "with_lineage"
     without_lineage = "without_lineage"
     skip = "skip"
@@ -135,6 +135,17 @@ class SnowflakeIdentifierConfig(
     )
 
 
+class SnowflakeUsageConfig(BaseUsageConfig):
+    email_domain: Optional[str] = pydantic.Field(
+        default=None,
+        description="Email domain of your organization so users can be displayed on UI appropriately.",
+    )
+    apply_view_usage_to_tables: bool = pydantic.Field(
+        default=False,
+        description="Whether to apply view's usage to its base tables. If set to True, usage is applied to base tables only.",
+    )
+
+
 # TODO: SnowflakeConfig is unused except for this inheritance. We should collapse the config inheritance hierarchy.
 class SnowflakeConfig(
     SnowflakeIdentifierConfig,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_lineage_v2.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_lineage_v2.py
index 151e9fb6316207..6f9c9259b27844 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_lineage_v2.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_lineage_v2.py
@@ -353,7 +353,7 @@ def _populate_external_lineage_from_copy_history(
     def _process_external_lineage_result_row(
         cls,
         db_row: dict,
-        discovered_tables: Optional[List[str]],
+        discovered_tables: Optional[Collection[str]],
         identifiers: SnowflakeIdentifierBuilder,
     ) -> Optional[KnownLineageMapping]:
         # key is the down-stream table name
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py
index d5b8f98e400756..1445d02aa49dbd 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py
@@ -12,7 +12,7 @@
 import pydantic
 from typing_extensions import Self
 
-from datahub.configuration.common import ConfigModel
+from datahub.configuration.common import AllowDenyPattern, ConfigModel
 from datahub.configuration.time_window_config import (
     BaseTimeWindowConfig,
     BucketDuration,
@@ -67,8 +67,16 @@ class SnowflakeQueriesExtractorConfig(ConfigModel):
     # TODO: Support stateful ingestion for the time windows.
     window: BaseTimeWindowConfig = BaseTimeWindowConfig()
 
-    # TODO: make this a proper allow/deny pattern
-    deny_usernames: List[str] = []
+    pushdown_deny_usernames: List[str] = pydantic.Field(
+        default=[],
+        description="List of snowflake usernames which will not be considered for lineage/usage/queries extraction. "
+        "This is primarily useful for improving performance by filtering out users with extremely high query volumes.",
+    )
+
+    user_email_pattern: AllowDenyPattern = pydantic.Field(
+        default=AllowDenyPattern.allow_all(),
+        description="Regex patterns for user emails to filter in usage.",
+    )
 
     temporary_tables_pattern: List[str] = pydantic.Field(
         default=DEFAULT_TEMP_TABLES_PATTERNS,
@@ -88,7 +96,7 @@ class SnowflakeQueriesExtractorConfig(ConfigModel):
     include_lineage: bool = True
     include_queries: bool = True
     include_usage_statistics: bool = True
-    include_query_usage_statistics: bool = False
+    include_query_usage_statistics: bool = True
     include_operations: bool = True
 
 
@@ -131,7 +139,7 @@ def __init__(
         self.report = SnowflakeQueriesExtractorReport()
         self.filters = filters
         self.identifiers = identifiers
-        self.discovered_tables = discovered_tables
+        self.discovered_tables = set(discovered_tables) if discovered_tables else None
 
         self._structured_report = structured_report
 
@@ -150,6 +158,7 @@ def __init__(
                 bucket_duration=self.config.window.bucket_duration,
                 start_time=self.config.window.start_time,
                 end_time=self.config.window.end_time,
+                user_email_pattern=self.config.user_email_pattern,
                 # TODO make the rest of the fields configurable
             ),
             generate_operations=self.config.include_operations,
@@ -175,10 +184,24 @@ def local_temp_path(self) -> pathlib.Path:
         return path
 
     def is_temp_table(self, name: str) -> bool:
-        return any(
+        if any(
             re.match(pattern, name, flags=re.IGNORECASE)
             for pattern in self.config.temporary_tables_pattern
-        )
+        ):
+            return True
+
+        # This is also a temp table if
+        #   1. this name would be allowed by the dataset patterns, and
+        #   2. we have a list of discovered tables, and
+        #   3. it's not in the discovered tables list
+        if (
+            self.filters.is_dataset_pattern_allowed(name, SnowflakeObjectDomain.TABLE)
+            and self.discovered_tables
+            and name not in self.discovered_tables
+        ):
+            return True
+
+        return False
 
     def is_allowed_table(self, name: str) -> bool:
         if self.discovered_tables and name not in self.discovered_tables:
@@ -219,7 +242,9 @@ def get_workunits_internal(
                     queries.append(entry)
 
         with self.report.audit_log_load_timer:
-            for query in queries:
+            for i, query in enumerate(queries):
+                if i % 1000 == 0:
+                    logger.info(f"Added {i} query log entries to SQL aggregator")
                 self.aggregator.add(query)
 
         yield from auto_workunit(self.aggregator.gen_metadata())
@@ -265,7 +290,7 @@ def fetch_query_log(
             start_time=self.config.window.start_time,
             end_time=self.config.window.end_time,
             bucket_duration=self.config.window.bucket_duration,
-            deny_usernames=self.config.deny_usernames,
+            deny_usernames=self.config.pushdown_deny_usernames,
         )
 
         with self.structured_reporter.report_exc(
@@ -275,8 +300,8 @@ def fetch_query_log(
             resp = self.connection.query(query_log_query)
 
             for i, row in enumerate(resp):
-                if i % 1000 == 0:
-                    logger.info(f"Processed {i} query log rows")
+                if i > 0 and i % 1000 == 0:
+                    logger.info(f"Processed {i} query log rows so far")
 
                 assert isinstance(row, dict)
                 try:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_query.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_query.py
index a2e18a64d9a809..662e1cc2509eae 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_query.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_query.py
@@ -35,6 +35,7 @@ class SnowflakeQuery:
         SnowflakeObjectDomain.EXTERNAL_TABLE.capitalize(),
         SnowflakeObjectDomain.VIEW.capitalize(),
         SnowflakeObjectDomain.MATERIALIZED_VIEW.capitalize(),
+        SnowflakeObjectDomain.ICEBERG_TABLE.capitalize(),
     }
 
     ACCESS_HISTORY_TABLE_VIEW_DOMAINS_FILTER = "({})".format(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
index 1d4a5b377da147..d4442749a06224 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
@@ -440,7 +440,7 @@ def _process_schema(
                 yield from self._process_tag(tag)
 
         if not snowflake_schema.views and not snowflake_schema.tables:
-            self.structured_reporter.warning(
+            self.structured_reporter.info(
                 title="No tables/views found in schema",
                 message="If tables exist, please grant REFERENCES or SELECT permissions on them.",
                 context=f"{db_name}.{schema_name}",
@@ -746,6 +746,11 @@ def get_dataset_properties(
         schema_name: str,
         db_name: str,
     ) -> DatasetProperties:
+        custom_properties = {}
+
+        if isinstance(table, SnowflakeTable) and table.clustering_key:
+            custom_properties["CLUSTERING_KEY"] = table.clustering_key
+
         return DatasetProperties(
             name=table.name,
             created=(
@@ -760,7 +765,7 @@ def get_dataset_properties(
             ),
             description=table.comment,
             qualifiedName=f"{db_name}.{schema_name}.{table.name}",
-            customProperties={},
+            customProperties=custom_properties,
             externalUrl=(
                 self.snowsight_url_builder.get_external_url_for_table(
                     table.name,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py
index 9307eb607be261..be449e963d270b 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py
@@ -169,5 +169,6 @@ def _filter_tags(
             self.report.report_entity_scanned(tag_identifier, "tag")
             if not self.config.tag_pattern.allowed(tag_identifier):
                 self.report.report_dropped(tag_identifier)
-            allowed_tags.append(tag)
+            else:
+                allowed_tags.append(tag)
         return allowed_tags
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_utils.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_utils.py
index a1878963d3798e..0177d59ef6b21a 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_utils.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_utils.py
@@ -127,6 +127,8 @@ def is_dataset_pattern_allowed(
             SnowflakeObjectDomain.MATERIALIZED_VIEW,
         ):
             return False
+        if _is_sys_table(dataset_name):
+            return False
 
         if len(dataset_params) != 3:
             self.structured_reporter.info(
@@ -176,6 +178,11 @@ def _combine_identifier_parts(
     return f"{db_name}.{schema_name}.{table_name}"
 
 
+def _is_sys_table(table_name: str) -> bool:
+    # Often will look like `SYS$_UNPIVOT_VIEW1737` or `sys$_pivot_view19`.
+    return table_name.lower().startswith("sys$")
+
+
 # Qualified Object names from snowflake audit logs have quotes for for snowflake quoted identifiers,
 # For example "test-database"."test-schema".test_table
 # whereas we generate urns without quotes even for quoted identifiers for backward compatibility
@@ -186,12 +193,13 @@ def _cleanup_qualified_name(
 ) -> str:
     name_parts = qualified_name.split(".")
     if len(name_parts) != 3:
-        structured_reporter.info(
-            title="Unexpected dataset pattern",
-            message="We failed to parse a Snowflake qualified name into its constituent parts. "
-            "DB/schema/table filtering may not work as expected on these entities.",
-            context=f"{qualified_name} has {len(name_parts)} parts",
-        )
+        if not _is_sys_table(qualified_name):
+            structured_reporter.info(
+                title="Unexpected dataset pattern",
+                message="We failed to parse a Snowflake qualified name into its constituent parts. "
+                "DB/schema/table filtering may not work as expected on these entities.",
+                context=f"{qualified_name} has {len(name_parts)} parts",
+            )
         return qualified_name.replace('"', "")
     return _combine_identifier_parts(
         db_name=name_parts[0].strip('"'),
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
index 1881e1da5be686..0d7881f36554d1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
@@ -166,7 +166,7 @@ def __init__(self, ctx: PipelineContext, config: SnowflakeV2Config):
                     # If we're ingestion schema metadata for tables/views, then we will populate
                     # schemas into the resolver as we go. We only need to do a bulk fetch
                     # if we're not ingesting schema metadata as part of ingestion.
-                    (
+                    not (
                         self.config.include_technical_schema
                         and self.config.include_tables
                         and self.config.include_views
@@ -521,11 +521,13 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                     include_lineage=self.config.include_table_lineage,
                     include_usage_statistics=self.config.include_usage_stats,
                     include_operations=self.config.include_operational_stats,
+                    user_email_pattern=self.config.user_email_pattern,
                 ),
                 structured_report=self.report,
                 filters=self.filters,
                 identifiers=self.identifiers,
                 schema_resolver=schema_resolver,
+                discovered_tables=discovered_datasets,
             )
 
             # TODO: This is slightly suboptimal because we create two SqlParsingAggregator instances with different configs
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py b/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py
index 398adc3708ef2b..71cfd0268ee6b5 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py
@@ -266,6 +266,11 @@ class AthenaConfig(SQLCommonConfig):
         "queries executed by DataHub."
     )
 
+    extract_partitions: bool = pydantic.Field(
+        default=True,
+        description="Extract partitions for tables. Partition extraction needs to run a query (`select * from table$partitions`) on the table. Disable this if you don't want to grant select permission.",
+    )
+
     _s3_staging_dir_population = pydantic_renamed_field(
         old_name="s3_staging_dir",
         new_name="query_result_location",
@@ -460,6 +465,11 @@ def get_partitions(
     ) -> List[str]:
         partitions = []
 
+        athena_config = typing.cast(AthenaConfig, self.config)
+
+        if not athena_config.extract_partitions:
+            return []
+
         if not self.cursor:
             return []
 
@@ -499,6 +509,7 @@ def get_schema_fields_for_column(
         self,
         dataset_name: str,
         column: Dict,
+        inspector: Inspector,
         pk_constraints: Optional[dict] = None,
         partition_keys: Optional[List[str]] = None,
         tags: Optional[List[str]] = None,
@@ -506,6 +517,7 @@ def get_schema_fields_for_column(
         fields = get_schema_fields_for_sqlalchemy_column(
             column_name=column["name"],
             column_type=column["type"],
+            inspector=inspector,
             description=column.get("comment", None),
             nullable=column.get("nullable", True),
             is_part_of_key=(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/hive.py b/metadata-ingestion/src/datahub/ingestion/source/sql/hive.py
index 65f8516fd340a3..59f301baf40165 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/hive.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/hive.py
@@ -169,12 +169,16 @@ def get_schema_fields_for_column(
         self,
         dataset_name: str,
         column: Dict[Any, Any],
+        inspector: Inspector,
         pk_constraints: Optional[Dict[Any, Any]] = None,
         partition_keys: Optional[List[str]] = None,
         tags: Optional[List[str]] = None,
     ) -> List[SchemaField]:
         fields = super().get_schema_fields_for_column(
-            dataset_name, column, pk_constraints
+            dataset_name,
+            column,
+            inspector,
+            pk_constraints,
         )
 
         if self._COMPLEX_TYPE.match(fields[0].nativeDataType) and isinstance(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/hive_metastore.py b/metadata-ingestion/src/datahub/ingestion/source/sql/hive_metastore.py
index 655d1ba68ed79e..adb171d4ad54b6 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/hive_metastore.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/hive_metastore.py
@@ -2,7 +2,6 @@
 import json
 import logging
 from collections import namedtuple
-from enum import Enum
 from itertools import groupby
 from typing import Any, Dict, Iterable, List, Optional, Tuple, Union
 
@@ -10,7 +9,6 @@
 from pydantic.fields import Field
 
 # This import verifies that the dependencies are available.
-from pyhive import hive  # noqa: F401
 from sqlalchemy import create_engine, text
 from sqlalchemy.engine.reflection import Inspector
 
@@ -61,13 +59,14 @@
     ViewPropertiesClass,
 )
 from datahub.utilities.hive_schema_to_avro import get_schema_fields_for_hive_column
+from datahub.utilities.str_enum import StrEnum
 
 logger: logging.Logger = logging.getLogger(__name__)
 
 TableKey = namedtuple("TableKey", ["schema", "table"])
 
 
-class HiveMetastoreConfigMode(str, Enum):
+class HiveMetastoreConfigMode(StrEnum):
     hive: str = "hive"  # noqa: F811
     presto: str = "presto"
     presto_on_hive: str = "presto-on-hive"
@@ -521,7 +520,7 @@ def loop_tables(
             )
 
             # add table schema fields
-            schema_fields = self.get_schema_fields(dataset_name, columns)
+            schema_fields = self.get_schema_fields(dataset_name, columns, inspector)
 
             self._set_partition_key(columns, schema_fields)
 
@@ -754,7 +753,9 @@ def loop_views(
 
             # add view schema fields
             schema_fields = self.get_schema_fields(
-                dataset.dataset_name, dataset.columns
+                dataset.dataset_name,
+                dataset.columns,
+                inspector,
             )
 
             schema_metadata = get_schema_metadata(
@@ -877,6 +878,7 @@ def get_schema_fields_for_column(
         self,
         dataset_name: str,
         column: Dict[Any, Any],
+        inspector: Inspector,
         pk_constraints: Optional[Dict[Any, Any]] = None,
         partition_keys: Optional[List[str]] = None,
         tags: Optional[List[str]] = None,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_common.py b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_common.py
index 1624203c4096b9..9ce50e21608843 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_common.py
@@ -120,6 +120,9 @@
 from datahub.utilities.lossy_collections import LossyList
 from datahub.utilities.registries.domain_registry import DomainRegistry
 from datahub.utilities.sqlalchemy_query_combiner import SQLAlchemyQueryCombinerReport
+from datahub.utilities.sqlalchemy_type_converter import (
+    get_native_data_type_for_sqlalchemy_type,
+)
 
 if TYPE_CHECKING:
     from datahub.ingestion.source.ge_data_profiler import (
@@ -260,8 +263,11 @@ def get_column_type(
                 break
 
     if TypeClass is None:
-        sql_report.report_warning(
-            dataset_name, f"unable to map type {column_type!r} to metadata schema"
+        sql_report.info(
+            title="Unable to map column types to DataHub types",
+            message="Got an unexpected column type. The column's parsed field type will not be populated.",
+            context=f"{dataset_name} - {column_type!r}",
+            log=False,
         )
         TypeClass = NullTypeClass
 
@@ -320,6 +326,26 @@ class ProfileMetadata:
     "Optionally enabled via `classification.enabled`",
     supported=True,
 )
+@capability(
+    SourceCapability.SCHEMA_METADATA,
+    "Enabled by default",
+    supported=True,
+)
+@capability(
+    SourceCapability.CONTAINERS,
+    "Enabled by default",
+    supported=True,
+)
+@capability(
+    SourceCapability.DESCRIPTIONS,
+    "Enabled by default",
+    supported=True,
+)
+@capability(
+    SourceCapability.DOMAINS,
+    "Enabled by default",
+    supported=True,
+)
 class SQLAlchemySource(StatefulIngestionSourceBase, TestableSource):
     """A Base class for all SQL Sources that use SQLAlchemy to extend"""
 
@@ -408,7 +434,7 @@ def get_db_name(self, inspector: Inspector) -> str:
         if engine and hasattr(engine, "url") and hasattr(engine.url, "database"):
             if engine.url.database is None:
                 return ""
-            return str(engine.url.database).strip('"').lower()
+            return str(engine.url.database).strip('"')
         else:
             raise Exception("Unable to get database name from Sqlalchemy inspector")
 
@@ -713,18 +739,17 @@ def loop_tables(  # noqa: C901
                             data_reader,
                         )
                     except Exception as e:
-                        self.warn(
-                            logger,
-                            f"{schema}.{table}",
-                            f"Ingestion error: {e}",
-                        )
-                        logger.debug(
-                            f"Error processing table {schema}.{table}: Error was: {e} Traceback:",
-                            exc_info=e,
+                        self.report.warning(
+                            "Error processing table",
+                            context=f"{schema}.{table}",
+                            exc=e,
                         )
-
             except Exception as e:
-                self.error(logger, f"{schema}", f"Tables error: {e}")
+                self.report.failure(
+                    "Error processing tables",
+                    context=schema,
+                    exc=e,
+                )
 
     def add_information_for_schema(self, inspector: Inspector, schema: str) -> None:
         pass
@@ -788,6 +813,7 @@ def _process_table(
         schema_fields = self.get_schema_fields(
             dataset_name,
             columns,
+            inspector,
             pk_constraints,
             tags=extra_tags,
             partition_keys=partitions,
@@ -968,6 +994,7 @@ def get_schema_fields(
         self,
         dataset_name: str,
         columns: List[dict],
+        inspector: Inspector,
         pk_constraints: Optional[dict] = None,
         partition_keys: Optional[List[str]] = None,
         tags: Optional[Dict[str, List[str]]] = None,
@@ -980,6 +1007,7 @@ def get_schema_fields(
             fields = self.get_schema_fields_for_column(
                 dataset_name,
                 column,
+                inspector,
                 pk_constraints,
                 tags=column_tags,
                 partition_keys=partition_keys,
@@ -991,6 +1019,7 @@ def get_schema_fields_for_column(
         self,
         dataset_name: str,
         column: dict,
+        inspector: Inspector,
         pk_constraints: Optional[dict] = None,
         partition_keys: Optional[List[str]] = None,
         tags: Optional[List[str]] = None,
@@ -1000,10 +1029,16 @@ def get_schema_fields_for_column(
             tags_str = [make_tag_urn(t) for t in tags]
             tags_tac = [TagAssociationClass(t) for t in tags_str]
             gtc = GlobalTagsClass(tags_tac)
+        full_type = column.get("full_type")
         field = SchemaField(
             fieldPath=column["name"],
             type=get_column_type(self.report, dataset_name, column["type"]),
-            nativeDataType=column.get("full_type", repr(column["type"])),
+            nativeDataType=full_type
+            if full_type is not None
+            else get_native_data_type_for_sqlalchemy_type(
+                column["type"],
+                inspector=inspector,
+            ),
             description=column.get("comment", None),
             nullable=column["nullable"],
             recursive=False,
@@ -1047,13 +1082,17 @@ def loop_views(
                         sql_config=sql_config,
                     )
                 except Exception as e:
-                    self.warn(
-                        logger,
-                        f"{schema}.{view}",
-                        f"Ingestion error: {e} {traceback.format_exc()}",
+                    self.report.warning(
+                        "Error processing view",
+                        context=f"{schema}.{view}",
+                        exc=e,
                     )
         except Exception as e:
-            self.error(logger, f"{schema}", f"Views error: {e}")
+            self.report.failure(
+                "Error processing views",
+                context=schema,
+                exc=e,
+            )
 
     def _process_view(
         self,
@@ -1076,7 +1115,7 @@ def _process_view(
             self.warn(logger, dataset_name, "unable to get schema for this view")
             schema_metadata = None
         else:
-            schema_fields = self.get_schema_fields(dataset_name, columns)
+            schema_fields = self.get_schema_fields(dataset_name, columns, inspector)
             schema_metadata = get_schema_metadata(
                 self.report,
                 dataset_name,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/trino.py b/metadata-ingestion/src/datahub/ingestion/source/sql/trino.py
index cc0a43bc5e8749..b6fa51dd70e18d 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/trino.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/trino.py
@@ -387,12 +387,16 @@ def get_schema_fields_for_column(
         self,
         dataset_name: str,
         column: dict,
+        inspector: Inspector,
         pk_constraints: Optional[dict] = None,
         partition_keys: Optional[List[str]] = None,
         tags: Optional[List[str]] = None,
     ) -> List[SchemaField]:
         fields = super().get_schema_fields_for_column(
-            dataset_name, column, pk_constraints
+            dataset_name,
+            column,
+            inspector,
+            pk_constraints,
         )
 
         if isinstance(column["type"], (datatype.ROW, sqltypes.ARRAY, datatype.MAP)):
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/vertica.py b/metadata-ingestion/src/datahub/ingestion/source/sql/vertica.py
index ae56fb87ee5281..a340f049731c46 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/vertica.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/vertica.py
@@ -469,7 +469,12 @@ def _process_projections(
         foreign_keys = self._get_foreign_keys(
             dataset_urn, inspector, schema, projection
         )
-        schema_fields = self.get_schema_fields(dataset_name, columns, pk_constraints)
+        schema_fields = self.get_schema_fields(
+            dataset_name,
+            columns,
+            inspector,
+            pk_constraints,
+        )
         schema_metadata = get_schema_metadata(
             self.report,
             dataset_name,
@@ -673,7 +678,7 @@ def _process_models(
         )
         dataset_snapshot.aspects.append(dataset_properties)
 
-        schema_fields = self.get_schema_fields(dataset_name, columns)
+        schema_fields = self.get_schema_fields(dataset_name, columns, inspector)
 
         schema_metadata = get_schema_metadata(
             self.report,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql_queries.py b/metadata-ingestion/src/datahub/ingestion/source/sql_queries.py
index 138430a68fcb9d..f3e8e774e4388f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql_queries.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql_queries.py
@@ -66,6 +66,10 @@ class SqlQueriesSourceConfig(PlatformInstanceConfigMixin, EnvConfigMixin):
         description="The default schema to use for unqualified table names",
         default=None,
     )
+    default_dialect: Optional[str] = Field(
+        description="The SQL dialect to use when parsing queries. Overrides automatic dialect detection.",
+        default=None,
+    )
 
 
 class SqlQueriesSourceReport(SourceReport):
@@ -177,6 +181,7 @@ def _process_query(self, entry: "QueryEntry") -> Iterable[MetadataWorkUnit]:
             schema_resolver=self.schema_resolver,
             default_db=self.config.default_db,
             default_schema=self.config.default_schema,
+            default_dialect=self.config.default_dialect,
         )
         if result.debug_info.table_error:
             logger.info(f"Error parsing table lineage, {result.debug_info.table_error}")
diff --git a/metadata-ingestion/src/datahub/ingestion/source/state/entity_removal_state.py b/metadata-ingestion/src/datahub/ingestion/source/state/entity_removal_state.py
index 0f031177c403a3..f011aa7bdd19e4 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/state/entity_removal_state.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/state/entity_removal_state.py
@@ -131,6 +131,9 @@ def get_percent_entities_changed(
             new_entities=self.urns, old_entities=old_checkpoint_state.urns
         )
 
+    def urn_count(self) -> int:
+        return len(self.urns)
+
 
 def compute_percent_entities_changed(
     new_entities: List[str], old_entities: List[str]
diff --git a/metadata-ingestion/src/datahub/ingestion/source/state/stale_entity_removal_handler.py b/metadata-ingestion/src/datahub/ingestion/source/state/stale_entity_removal_handler.py
index ee1ccdff781dc1..c73472f1b8041e 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/state/stale_entity_removal_handler.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/state/stale_entity_removal_handler.py
@@ -42,7 +42,7 @@ class StatefulStaleMetadataRemovalConfig(StatefulIngestionConfig):
         description="Soft-deletes the entities present in the last successful run but missing in the current run with stateful_ingestion enabled.",
     )
     fail_safe_threshold: float = pydantic.Field(
-        default=40.0,
+        default=75.0,
         description="Prevents large amount of soft deletes & the state from committing from accidental changes to the source configuration if the relative change percent in entities compared to the previous state is above the 'fail_safe_threshold'.",
         le=100.0,
         ge=0.0,
@@ -257,13 +257,33 @@ def gen_removed_entity_workunits(self) -> Iterable[MetadataWorkUnit]:
 
         assert self.stateful_ingestion_config
 
-        copy_previous_state_and_fail = False
+        copy_previous_state_and_exit = False
+
+        # If the source already had a failure, skip soft-deletion.
+        # TODO: Eventually, switch this to check if anything in the pipeline had a failure so far, not just the source.
+        if self.source.get_report().failures:
+            self.source.get_report().report_warning(
+                title="Skipping stateful ingestion / stale entity removal",
+                message="The soft-deletion of stale entities will be skipped because the source reported a failure.",
+            )
+            copy_previous_state_and_exit = True
+
+        if (
+            not copy_previous_state_and_exit
+            and self.source.get_report().events_produced == 0
+        ):
+            self.source.get_report().report_failure(
+                title="Skipping stateful ingestion / stale entity removal",
+                message="The source did not produce any metadata. Despite stateful ingestion being enabled, we will not delete any metadata. "
+                "This is a fail-safe mechanism to prevent the accidental deletion of all entities.",
+            )
+            copy_previous_state_and_exit = True
 
         # Check if the entity delta is below the fail-safe threshold.
         entity_difference_percent = cur_checkpoint_state.get_percent_entities_changed(
             last_checkpoint_state
         )
-        if (
+        if not copy_previous_state_and_exit and (
             entity_difference_percent
             > self.stateful_ingestion_config.fail_safe_threshold
             # Adding this check to protect against cases where get_percent_entities_changed returns over 100%.
@@ -273,32 +293,23 @@ def gen_removed_entity_workunits(self) -> Iterable[MetadataWorkUnit]:
         ):
             # Log the failure. This would prevent the current state from getting committed.
             self.source.get_report().report_failure(
-                "stale-entity-removal",
-                f"Will not soft-delete entities, since we'd be deleting {entity_difference_percent:.1f}% of the existing entities. "
-                f"To force a deletion, increase the value of 'stateful_ingestion.fail_safe_threshold' (currently {self.stateful_ingestion_config.fail_safe_threshold})",
-            )
-            copy_previous_state_and_fail = True
-
-        if self.source.get_report().events_produced == 0:
-            self.source.get_report().report_failure(
-                "stale-entity-removal",
-                "Skipping stale entity soft-deletion because the source produced no events. "
-                "This is a fail-safe mechanism to prevent accidental deletion of all entities.",
-            )
-            copy_previous_state_and_fail = True
-
-        # If the source already had a failure, skip soft-deletion.
-        # TODO: Eventually, switch this to check if anything in the pipeline had a failure so far, not just the source.
-        if self.source.get_report().failures:
-            self.source.get_report().report_warning(
-                "stale-entity-removal",
-                "Skipping stale entity soft-deletion and copying urns from last state since source already had failures.",
+                title="Skipping stateful ingestion / stale entity removal",
+                message=f"\
+The previous run produced {last_checkpoint_state.urn_count()} entities, whereas this run produced {cur_checkpoint_state.urn_count()} entities. \
+Comparing the entities produced this run vs the previous run, we would be deleting {entity_difference_percent:.1f}% of the entities produced by the previous run. \
+This percentage is above the threshold (currently {self.stateful_ingestion_config.fail_safe_threshold}), so we will skip soft-deleting stale entities.\
+\
+To update this threshold, add this to your recipe: \
+\
+stateful_ingestion:\
+  fail_safe_threshold: <new value>\
+",
             )
-            copy_previous_state_and_fail = True
+            copy_previous_state_and_exit = True
 
-        if copy_previous_state_and_fail:
+        if copy_previous_state_and_exit:
             logger.info(
-                f"Copying urns from last state (size {last_checkpoint_state.urns}) to current state (size {cur_checkpoint_state.urns}) "
+                f"Copying urns from last state (size {len(last_checkpoint_state.urns)}) to current state (size {len(cur_checkpoint_state.urns)}) "
                 "to ensure stale entities from previous runs are deleted on the next successful run."
             )
             for urn in last_checkpoint_state.urns:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/superset.py b/metadata-ingestion/src/datahub/ingestion/source/superset.py
index dd2dc3301d80ea..e563a806446c43 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/superset.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/superset.py
@@ -158,6 +158,7 @@ def get_filter_name(filter_obj):
 @capability(
     SourceCapability.DELETION_DETECTION, "Optionally enabled via stateful_ingestion"
 )
+@capability(SourceCapability.DOMAINS, "Enabled by `domain` config to assign domain_key")
 @capability(SourceCapability.LINEAGE_COARSE, "Supported by default")
 class SupersetSource(StatefulIngestionSourceBase):
     """
@@ -232,6 +233,8 @@ def get_platform_from_database_id(self, database_id):
             platform_name = get_platform_from_sqlalchemy_uri(sqlalchemy_uri)
         if platform_name == "awsathena":
             return "athena"
+        if platform_name == "clickhousedb":
+            return "clickhouse"
         return platform_name
 
     @lru_cache(maxsize=None)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/__init__.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
similarity index 90%
rename from metadata-ingestion/src/datahub/ingestion/source/tableau.py
rename to metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
index 1655724f2d402d..4a1ec14ca1d4e4 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
@@ -1,5 +1,6 @@
 import logging
 import re
+import time
 from collections import OrderedDict
 from dataclasses import dataclass
 from datetime import datetime
@@ -13,6 +14,7 @@
     Optional,
     Set,
     Tuple,
+    Type,
     Union,
     cast,
 )
@@ -67,7 +69,6 @@
     TestConnectionReport,
 )
 from datahub.ingestion.api.workunit import MetadataWorkUnit
-from datahub.ingestion.source import tableau_constant as c
 from datahub.ingestion.source.common.subtypes import (
     BIContainerSubTypes,
     DatasetSubTypes,
@@ -81,7 +82,8 @@
     StatefulIngestionConfigBase,
     StatefulIngestionSourceBase,
 )
-from datahub.ingestion.source.tableau_common import (
+from datahub.ingestion.source.tableau import tableau_constant as c
+from datahub.ingestion.source.tableau.tableau_common import (
     FIELD_TYPE_MAPPING,
     MetadataQueryException,
     TableauLineageOverrides,
@@ -91,6 +93,7 @@
     dashboard_graphql_query,
     database_servers_graphql_query,
     database_tables_graphql_query,
+    datasource_upstream_fields_graphql_query,
     embedded_datasource_graphql_query,
     get_filter_pages,
     get_overridden_info,
@@ -99,7 +102,7 @@
     make_fine_grained_lineage_class,
     make_upstream_class,
     published_datasource_graphql_query,
-    query_metadata,
+    query_metadata_cursor_based_pagination,
     sheet_graphql_query,
     tableau_field_to_schema_field,
     workbook_graphql_query,
@@ -158,6 +161,21 @@
 from datahub.utilities import config_clean
 from datahub.utilities.urns.dataset_urn import DatasetUrn
 
+try:
+    # On earlier versions of the tableauserverclient, the NonXMLResponseError
+    # was thrown when reauthentication was needed. We'll keep both exceptions
+    # around for now, but can remove this in the future.
+    from tableauserverclient.server.endpoint.exceptions import (  # type: ignore
+        NotSignedInError,
+    )
+
+    REAUTHENTICATE_ERRORS: Tuple[Type[Exception], ...] = (
+        NotSignedInError,
+        NonXMLResponseError,
+    )
+except ImportError:
+    REAUTHENTICATE_ERRORS = (NonXMLResponseError,)
+
 logger: logging.Logger = logging.getLogger(__name__)
 
 # Replace / with |
@@ -328,6 +346,12 @@ class TableauConfig(
         default=10,
         description="[advanced] Number of metadata objects (e.g. CustomSQLTable, PublishedDatasource, etc) to query at a time using the Tableau API.",
     )
+
+    fetch_size: int = Field(
+        default=250,
+        description="Specifies the number of records to retrieve in each batch during a query execution.",
+    )
+
     # We've found that even with a small workbook page size (e.g. 10), the Tableau API often
     # returns warnings like this:
     # {
@@ -466,9 +490,9 @@ class UsageStat:
 class TableauProject:
     id: str
     name: str
-    description: str
+    description: Optional[str]
     parent_id: Optional[str]
-    parent_name: Optional[str]  # Name of parent project
+    parent_name: Optional[str]  # Name of a parent project
     path: List[str]
 
 
@@ -740,6 +764,12 @@ def _re_authenticate(self):
         ] = self.config.get_tableau_auth(self.site.content_url)
         self.server.auth.sign_in(tableau_auth)
 
+    @property
+    def site_content_url(self) -> Optional[str]:
+        if self.site and self.site.content_url:
+            return self.site.content_url
+        return None
+
     def _populate_usage_stat_registry(self) -> None:
         if self.server is None:
             return
@@ -913,6 +943,7 @@ def _init_workbook_registry(self) -> None:
 
     def _populate_projects_registry(self) -> None:
         if self.server is None:
+            logger.warning("server is None. Can not initialize the project registry")
             return
 
         logger.info("Initializing site project registry")
@@ -949,38 +980,55 @@ def get_connection_object_page(
         query: str,
         connection_type: str,
         query_filter: str,
-        count: int = 0,
-        offset: int = 0,
+        current_cursor: Optional[str],
+        fetch_size: int = 250,
         retry_on_auth_error: bool = True,
         retries_remaining: Optional[int] = None,
-    ) -> Tuple[dict, int, int]:
+    ) -> Tuple[dict, Optional[str], int]:
+        """
+        `current_cursor:` Tableau Server executes the query and returns
+            a set of records based on the specified fetch_size. It also provides a cursor that
+            indicates the current position within the result set. In the next API call,
+            you pass this cursor to retrieve the next batch of records,
+            with each batch containing up to fetch_size records.
+            Initial value is None.
+
+        `fetch_size:` The number of records to retrieve from Tableau
+            Server in a single API call, starting from the current cursor position on Tableau Server.
+        """
         retries_remaining = retries_remaining or self.config.max_retries
 
         logger.debug(
-            f"Query {connection_type} to get {count} objects with offset {offset}"
+            f"Query {connection_type} to get {fetch_size} objects with cursor {current_cursor}"
             f" and filter {query_filter}"
         )
         try:
             assert self.server is not None
-            query_data = query_metadata(
-                self.server, query, connection_type, count, offset, query_filter
+            query_data = query_metadata_cursor_based_pagination(
+                server=self.server,
+                main_query=query,
+                connection_name=connection_type,
+                first=fetch_size,
+                after=current_cursor,
+                qry_filter=query_filter,
             )
-        except NonXMLResponseError:
+
+        except REAUTHENTICATE_ERRORS:
             if not retry_on_auth_error:
                 raise
 
             # If ingestion has been running for over 2 hours, the Tableau
             # temporary credentials will expire. If this happens, this exception
-            # will be thrown and we need to re-authenticate and retry.
+            # will be thrown, and we need to re-authenticate and retry.
             self._re_authenticate()
             return self.get_connection_object_page(
-                query,
-                connection_type,
-                query_filter,
-                count,
-                offset,
+                query=query,
+                connection_type=connection_type,
+                query_filter=query_filter,
+                fetch_size=fetch_size,
+                current_cursor=current_cursor,
                 retry_on_auth_error=False,
-                retries_remaining=retries_remaining,
+                retries_remaining=retries_remaining - 1,
             )
         except OSError:
             # In tableauseverclient 0.26 (which was yanked and released in 0.28 on 2023-10-04),
@@ -992,11 +1040,11 @@ def get_connection_object_page(
             if retries_remaining <= 0:
                 raise
             return self.get_connection_object_page(
-                query,
-                connection_type,
-                query_filter,
-                count,
-                offset,
+                query=query,
+                connection_type=connection_type,
+                query_filter=query_filter,
+                fetch_size=fetch_size,
+                current_cursor=current_cursor,
                 retry_on_auth_error=False,
                 retries_remaining=retries_remaining - 1,
             )
@@ -1012,6 +1060,7 @@ def get_connection_object_page(
                 # filter out PERMISSIONS_MODE_SWITCHED to report error in human-readable format
                 other_errors = []
                 permission_mode_errors = []
+                node_limit_errors = []
                 for error in errors:
                     if (
                         error.get("extensions")
@@ -1019,6 +1068,11 @@ def get_connection_object_page(
                         == "PERMISSIONS_MODE_SWITCHED"
                     ):
                         permission_mode_errors.append(error)
+                    elif (
+                        error.get("extensions")
+                        and error["extensions"].get("code") == "NODE_LIMIT_EXCEEDED"
+                    ):
+                        node_limit_errors.append(error)
                     else:
                         other_errors.append(error)
 
@@ -1037,16 +1091,66 @@ def get_connection_object_page(
                         context=f"{permission_mode_errors}",
                     )
 
+                if node_limit_errors:
+                    logger.debug(f"Node Limit Error. query_data {query_data}")
+                    self.report.warning(
+                        title="Tableau Data Exceed Predefined Limit",
+                        message="The numbers of record in result set exceeds a predefined limit. Increase the tableau "
+                        "configuration metadata query node limit to higher value. Refer "
+                        "https://help.tableau.com/current/server/en-us/"
+                        "cli_configuration-set_tsm.htm#metadata_nodelimit",
+                        context=f"""{{
+                                "errors": {node_limit_errors},
+                                "connection_type": {connection_type},
+                                "query_filter": {query_filter},
+                                "query": {query},
+                        }}""",
+                    )
             else:
+                # As of Tableau Server 2024.2, the metadata API sporadically returns a 30-second
+                # timeout error.
+                # It doesn't reliably happen, so retrying a couple of times makes sense.
+                if all(
+                    error.get("message")
+                    == "Execution canceled because timeout of 30000 millis was reached"
+                    for error in errors
+                ):
+                    # If it was only a timeout error, we can retry.
+                    if retries_remaining <= 0:
+                        raise
+
+                    # This is a pretty dumb backoff mechanism, but it's good enough for now.
+                    backoff_time = min(
+                        (self.config.max_retries - retries_remaining + 1) ** 2, 60
+                    )
+                    logger.info(
+                        f"Query {connection_type} received a 30 second timeout error - will retry in {backoff_time} seconds. "
+                        f"Retries remaining: {retries_remaining}"
+                    )
+                    time.sleep(backoff_time)
+                    return self.get_connection_object_page(
+                        query=query,
+                        connection_type=connection_type,
+                        query_filter=query_filter,
+                        fetch_size=fetch_size,
+                        current_cursor=current_cursor,
+                        retry_on_auth_error=False,
+                        retries_remaining=retries_remaining,
+                    )
                 raise RuntimeError(f"Query {connection_type} error: {errors}")
 
         connection_object = query_data.get(c.DATA, {}).get(connection_type, {})
 
-        total_count = connection_object.get(c.TOTAL_COUNT, 0)
         has_next_page = connection_object.get(c.PAGE_INFO, {}).get(
             c.HAS_NEXT_PAGE, False
         )
-        return connection_object, total_count, has_next_page
+
+        next_cursor = connection_object.get(c.PAGE_INFO, {}).get(
+            "endCursor",
+            None,
+        )
+
+        return connection_object, next_cursor, has_next_page
 
     def get_connection_objects(
         self,
@@ -1062,29 +1166,23 @@ def get_connection_objects(
         filter_pages = get_filter_pages(query_filter, page_size)
 
         for filter_page in filter_pages:
-            total_count = page_size
             has_next_page = 1
-            offset = 0
+            current_cursor: Optional[str] = None
             while has_next_page:
-                count = (
-                    page_size
-                    if offset + page_size < total_count
-                    else total_count - offset
-                )
+                filter_: str = make_filter(filter_page)
+
                 (
                     connection_objects,
-                    total_count,
+                    current_cursor,
                     has_next_page,
                 ) = self.get_connection_object_page(
-                    query,
-                    connection_type,
-                    make_filter(filter_page),
-                    count,
-                    offset,
+                    query=query,
+                    connection_type=connection_type,
+                    query_filter=filter_,
+                    current_cursor=current_cursor,
+                    fetch_size=self.config.fetch_size,
                 )
 
-                offset += count
-
                 yield from connection_objects.get(c.NODES) or []
 
     def emit_workbooks(self) -> Iterable[MetadataWorkUnit]:
@@ -2239,6 +2337,41 @@ def _get_datasource_container_key(
 
         return container_key
 
+    def update_datasource_for_field_upstream(
+        self,
+        datasource: dict,
+        field_upstream_query: str,
+    ) -> dict:
+        # Collect field ids to fetch field upstreams
+        field_ids: List[str] = []
+        for field in datasource.get(c.FIELDS, []):
+            if field.get(c.ID):
+                field_ids.append(field.get(c.ID))
+
+        # Fetch field upstreams and arrange them in map
+        field_vs_upstream: Dict[str, dict] = {}
+        for field_upstream in self.get_connection_objects(
+            field_upstream_query,
+            c.FIELDS_CONNECTION,
+            {c.ID_WITH_IN: field_ids},
+        ):
+            if field_upstream.get(c.ID):
+                field_id = field_upstream[c.ID]
+                # delete the field id, we don't need it for further processing
+                del field_upstream[c.ID]
+                field_vs_upstream[field_id] = field_upstream
+
+        # update datasource's field for its upstream
+        for field_dict in datasource.get(c.FIELDS, []):
+            field_upstream_dict: Optional[dict] = field_vs_upstream.get(
+                field_dict.get(c.ID)
+            )
+            if field_upstream_dict:
+                # Add upstream fields to field
+                field_dict.update(field_upstream_dict)
+
+        return datasource
+
     def emit_published_datasources(self) -> Iterable[MetadataWorkUnit]:
         datasource_filter = {c.ID_WITH_IN: self.datasource_ids_being_used}
 
@@ -2247,6 +2380,11 @@ def emit_published_datasources(self) -> Iterable[MetadataWorkUnit]:
             c.PUBLISHED_DATA_SOURCES_CONNECTION,
             datasource_filter,
         ):
+            datasource = self.update_datasource_for_field_upstream(
+                datasource=datasource,
+                field_upstream_query=datasource_upstream_fields_graphql_query,
+            )
+
             yield from self.emit_datasource(datasource)
 
     def emit_upstream_tables(self) -> Iterable[MetadataWorkUnit]:
@@ -2478,7 +2616,9 @@ def emit_sheets_as_charts(
         last_modified = self.get_last_modified(creator, created_at, updated_at)
 
         if sheet.get(c.PATH):
-            site_part = f"/site/{self.site.content_url}" if self.site else ""
+            site_part = (
+                f"/site/{self.site_content_url}" if self.site_content_url else ""
+            )
             sheet_external_url = (
                 f"{self.config.connect_uri}/#{site_part}/views/{sheet.get(c.PATH)}"
             )
@@ -2489,7 +2629,7 @@ def emit_sheets_as_charts(
             and sheet[c.CONTAINED_IN_DASHBOARDS][0].get(c.PATH)
         ):
             # sheet contained in dashboard
-            site_part = f"/t/{self.site.content_url}" if self.site else ""
+            site_part = f"/t/{self.site_content_url}" if self.site_content_url else ""
             dashboard_path = sheet[c.CONTAINED_IN_DASHBOARDS][0][c.PATH]
             sheet_external_url = f"{self.config.connect_uri}{site_part}/authoring/{dashboard_path}/{quote(sheet.get(c.NAME, ''), safe='')}"
         else:
@@ -2621,7 +2761,7 @@ def emit_workbook_as_container(self, workbook: Dict) -> Iterable[MetadataWorkUni
             else None
         )
 
-        site_part = f"/site/{self.site.content_url}" if self.site else ""
+        site_part = f"/site/{self.site_content_url}" if self.site_content_url else ""
         workbook_uri = workbook.get("uri")
         workbook_part = (
             workbook_uri[workbook_uri.index("/workbooks/") :] if workbook_uri else None
@@ -2780,7 +2920,7 @@ def emit_dashboard(
         updated_at = dashboard.get(c.UPDATED_AT, datetime.now())
         last_modified = self.get_last_modified(creator, created_at, updated_at)
 
-        site_part = f"/site/{self.site.content_url}" if self.site else ""
+        site_part = f"/site/{self.site_content_url}" if self.site_content_url else ""
         dashboard_external_url = (
             f"{self.config.connect_uri}/#{site_part}/views/{dashboard.get(c.PATH, '')}"
         )
@@ -2886,6 +3026,10 @@ def emit_embedded_datasources(self) -> Iterable[MetadataWorkUnit]:
             c.EMBEDDED_DATA_SOURCES_CONNECTION,
             datasource_filter,
         ):
+            datasource = self.update_datasource_for_field_upstream(
+                datasource=datasource,
+                field_upstream_query=datasource_upstream_fields_graphql_query,
+            )
             yield from self.emit_datasource(
                 datasource,
                 datasource.get(c.WORKBOOK),
@@ -2924,32 +3068,76 @@ def _get_ownership(self, user: str) -> Optional[OwnershipClass]:
         return None
 
     def emit_project_containers(self) -> Iterable[MetadataWorkUnit]:
-        for _id, project in self.tableau_project_registry.items():
-            parent_container_key: Optional[ContainerKey] = None
-            if project.parent_id:
-                parent_container_key = self.gen_project_key(project.parent_id)
-            elif self.config.add_site_container and self.site and self.site.id:
-                parent_container_key = self.gen_site_key(self.site.id)
+        generated_project_keys: Set[str] = set()
+
+        def emit_project_in_topological_order(
+            project_: TableauProject,
+        ) -> Iterable[MetadataWorkUnit]:
+            """
+            The source_helpers.py file includes a function called auto_browse_path_v2 that automatically generates
+            BrowsePathsV2. This auto-generation relies on the correct sequencing of MetadataWorkUnit containers.
+            The emit_project_in_topological_order function ensures that parent containers are emitted before their child
+            containers.
+            This is a recursive function.
+            """
+            project_key: ProjectKey = self.gen_project_key(project_.id)
+
+            if project_key.guid() in generated_project_keys:
+                return
+
+            generated_project_keys.add(project_key.guid())
+
+            parent_project_key: Optional[
+                Union[ProjectKey, SiteKey]
+            ] = None  # It is going
+            # to be used as a parent container key for the current tableau project
+
+            if project_.parent_id is not None:
+                # Go to the parent project as we need to generate container first for parent
+                parent_project_key = self.gen_project_key(project_.parent_id)
+
+                parent_tableau_project: Optional[
+                    TableauProject
+                ] = self.tableau_project_registry.get(project_.parent_id)
+
+                if (
+                    parent_tableau_project is None
+                ):  # It is not in project registry because of project_pattern
+                    assert (
+                        project_.parent_name
+                    ), f"project {project_.name} should not be null"
+                    parent_tableau_project = TableauProject(
+                        id=project_.parent_id,
+                        name=project_.parent_name,
+                        description=None,
+                        parent_id=None,
+                        parent_name=None,
+                        path=[],
+                    )
+
+                yield from emit_project_in_topological_order(parent_tableau_project)
+
+            else:
+                # This is a root Tableau project since the parent_project_id is None.
+                # For a root project, either the site is the parent, or the platform is the default parent.
+                if self.config.add_site_container and self.site and self.site.id:
+                    # The site containers have already been generated by emit_site_container, so we
+                    # don't need to emit them again here.
+                    parent_project_key = self.gen_site_key(self.site.id)
 
             yield from gen_containers(
-                container_key=self.gen_project_key(_id),
-                name=project.name,
-                description=project.description,
+                container_key=project_key,
+                name=project_.name,
+                description=project_.description,
                 sub_types=[c.PROJECT],
-                parent_container_key=parent_container_key,
+                parent_container_key=parent_project_key,
             )
-            if (
-                project.parent_id is not None
-                and project.parent_id not in self.tableau_project_registry
-            ):
-                # Parent project got skipped because of project_pattern.
-                # Let's ingest its container name property to show parent container name on DataHub Portal, otherwise
-                # DataHub Portal will show parent container URN
-                yield from gen_containers(
-                    container_key=self.gen_project_key(project.parent_id),
-                    name=cast(str, project.parent_name),
-                    sub_types=[c.PROJECT],
-                )
+
+        for id_, project in self.tableau_project_registry.items():
+            logger.debug(
+                f"project {project.name} and it's parent {project.parent_name} and parent id {project.parent_id}"
+            )
+            yield from emit_project_in_topological_order(project)
 
     def emit_site_container(self):
         if not self.site or not self.site.id:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau_common.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_common.py
similarity index 92%
rename from metadata-ingestion/src/datahub/ingestion/source/tableau_common.py
rename to metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_common.py
index 93f2a0ef2f6a86..1fbf31a48890d8 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_common.py
@@ -10,7 +10,7 @@
 
 import datahub.emitter.mce_builder as builder
 from datahub.configuration.common import ConfigModel
-from datahub.ingestion.source import tableau_constant as c
+from datahub.ingestion.source.tableau import tableau_constant as c
 from datahub.metadata.com.linkedin.pegasus2avro.dataset import (
     DatasetLineageType,
     FineGrainedLineage,
@@ -223,19 +223,19 @@ class MetadataQueryException(Exception):
         description
         isHidden
         folderName
-        upstreamFields {
-            name
-            datasource {
-                id
-            }
-        }
-        upstreamColumns {
-            name
-            table {
-                __typename
-                id
-            }
-        }
+        # upstreamFields {
+        #     name
+        #     datasource {
+        #         id
+        #     }
+        # }
+        # upstreamColumns {
+        #     name
+        #     table {
+        #         __typename
+        #         id
+        #     }
+        # }
         ... on ColumnField {
             dataCategory
             role
@@ -336,6 +336,26 @@ class MetadataQueryException(Exception):
 }
 """
 
+
+datasource_upstream_fields_graphql_query = """
+{
+    id
+    upstreamFields {
+        name
+        datasource {
+            id
+        }
+    }
+    upstreamColumns {
+        name
+        table {
+            __typename
+            id
+        }
+    }
+}
+"""
+
 published_datasource_graphql_query = """
 {
     __typename
@@ -368,19 +388,19 @@ class MetadataQueryException(Exception):
         description
         isHidden
         folderName
-        upstreamFields {
-            name
-            datasource {
-                id
-            }
-        }
-        upstreamColumns {
-            name
-            table {
-                __typename
-                id
-            }
-        }
+        # upstreamFields {
+        #     name
+        #     datasource {
+        #         id
+        #     }
+        # }
+        # upstreamColumns {
+        #     name
+        #     table {
+        #         __typename
+        #         id
+        #     }
+        # }
         ... on ColumnField {
             dataCategory
             role
@@ -502,7 +522,12 @@ def get_tags_from_params(params: List[str] = []) -> GlobalTagsClass:
 
 
 def tableau_field_to_schema_field(field, ingest_tags):
-    nativeDataType = field.get("dataType", "UNKNOWN")
+    # The check here makes sure that even if 'dataType' key exists in the 'field' dictionary but has value None,
+    # it will be set as "UNKNOWN" (nativeDataType field can not be None in the SchemaField).
+    # Hence, field.get("dataType", "UNKNOWN") is not enough
+    nativeDataType = field.get("dataType")
+    if nativeDataType is None:
+        nativeDataType = "UNKNOWN"
     TypeClass = FIELD_TYPE_MAPPING.get(nativeDataType, NullTypeClass)
 
     schema_field = SchemaField(
@@ -905,40 +930,46 @@ def make_filter(filter_dict: dict) -> str:
     return filter
 
 
-def query_metadata(
+def query_metadata_cursor_based_pagination(
     server: Server,
     main_query: str,
     connection_name: str,
     first: int,
-    offset: int,
+    after: Optional[str],
     qry_filter: str = "",
 ) -> dict:
-    query = """{{
-        {connection_name} (first:{first}, offset:{offset}, filter:{{{filter}}})
-        {{
-            nodes {main_query}
-            pageInfo {{
-                hasNextPage
-                endCursor
+    query = f"""
+        query GetItems(
+          $first: Int,
+          $after: String
+        ) {{
+            {connection_name} (  first: $first, after: $after, filter:{{ {qry_filter} }})
+            {{
+                nodes {main_query}
+                pageInfo {{
+                    hasNextPage
+                    endCursor
+                }}
             }}
-            totalCount
-        }}
-    }}""".format(
-        connection_name=connection_name,
-        first=first,
-        offset=offset,
-        filter=qry_filter,
-        main_query=main_query,
+    }}"""  # {{ is to escape { character of f-string
+
+    result = server.metadata.query(
+        query=query,
+        variables={
+            "first": first,
+            "after": after,
+        },
     )
-    return server.metadata.query(query)
+
+    return result
 
 
 def get_filter_pages(query_filter: dict, page_size: int) -> List[dict]:
     filter_pages = [query_filter]
-    # If this is primary id filter so we can use divide this query list into
+    # If this is primary id filter, so we can use divide this query list into
     # multiple requests each with smaller filter list (of order page_size).
-    # It is observed in the past that if list of primary ids grow beyond
-    # a few ten thousands then tableau server responds with empty response
+    # It is observed in the past that if a list of primary ids grows beyond
+    # a few ten thousand, then tableau server responds with empty response
     # causing below error:
     # tableauserverclient.server.endpoint.exceptions.NonXMLResponseError: b''
     if (
diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau_constant.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_constant.py
similarity index 98%
rename from metadata-ingestion/src/datahub/ingestion/source/tableau_constant.py
rename to metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_constant.py
index 5acadf8ca19e58..d1dd0d92819991 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau_constant.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_constant.py
@@ -66,6 +66,7 @@
 EXTRACT_LAST_INCREMENTAL_UPDATE_TIME = "extractLastIncrementalUpdateTime"
 EXTRACT_LAST_UPDATE_TIME = "extractLastUpdateTime"
 PUBLISHED_DATA_SOURCES_CONNECTION = "publishedDatasourcesConnection"
+FIELDS_CONNECTION = "fieldsConnection"
 DATA_SOURCE_FIELDS = "datasourceFields"
 SHEETS_CONNECTION = "sheetsConnection"
 CREATED_AT = "createdAt"
diff --git a/metadata-ingestion/src/datahub/ingestion/source/unity/hive_metastore_proxy.py b/metadata-ingestion/src/datahub/ingestion/source/unity/hive_metastore_proxy.py
index c99fe3b09c5bb5..eea10d940bd1c8 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/unity/hive_metastore_proxy.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/unity/hive_metastore_proxy.py
@@ -135,8 +135,8 @@ def get_table_names(self, schema_name: str) -> List[str]:
     def get_view_names(self, schema_name: str) -> List[str]:
         try:
             rows = self._execute_sql(f"SHOW VIEWS FROM `{schema_name}`")
-            # 3 columns - database, tableName, isTemporary
-            return [row.tableName for row in rows]
+            # 4 columns - namespace, viewName, isTemporary, isMaterialized
+            return [row.viewName for row in rows]
         except Exception as e:
             self.report.report_warning("Failed to get views for schema", schema_name)
             logger.warning(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/unity/proxy.py b/metadata-ingestion/src/datahub/ingestion/source/unity/proxy.py
index 112acd8101297f..bd987c2da7c764 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/unity/proxy.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/unity/proxy.py
@@ -109,7 +109,7 @@ def __init__(
         self.hive_metastore_proxy = hive_metastore_proxy
 
     def check_basic_connectivity(self) -> bool:
-        return bool(self._workspace_client.catalogs.list())
+        return bool(self._workspace_client.catalogs.list(include_browse=True))
 
     def assigned_metastore(self) -> Optional[Metastore]:
         response = self._workspace_client.metastores.summary()
@@ -119,7 +119,7 @@ def catalogs(self, metastore: Optional[Metastore]) -> Iterable[Catalog]:
         if self.hive_metastore_proxy:
             yield self.hive_metastore_proxy.hive_metastore_catalog(metastore)
 
-        response = self._workspace_client.catalogs.list()
+        response = self._workspace_client.catalogs.list(include_browse=True)
         if not response:
             logger.info("Catalogs not found")
             return
@@ -131,7 +131,9 @@ def catalogs(self, metastore: Optional[Metastore]) -> Iterable[Catalog]:
     def catalog(
         self, catalog_name: str, metastore: Optional[Metastore]
     ) -> Optional[Catalog]:
-        response = self._workspace_client.catalogs.get(catalog_name)
+        response = self._workspace_client.catalogs.get(
+            catalog_name, include_browse=True
+        )
         if not response:
             logger.info(f"Catalog {catalog_name} not found")
             return None
@@ -148,7 +150,9 @@ def schemas(self, catalog: Catalog) -> Iterable[Schema]:
         ):
             yield from self.hive_metastore_proxy.hive_metastore_schemas(catalog)
             return
-        response = self._workspace_client.schemas.list(catalog_name=catalog.name)
+        response = self._workspace_client.schemas.list(
+            catalog_name=catalog.name, include_browse=True
+        )
         if not response:
             logger.info(f"Schemas not found for catalog {catalog.id}")
             return
@@ -166,7 +170,9 @@ def tables(self, schema: Schema) -> Iterable[Table]:
             return
         with patch("databricks.sdk.service.catalog.TableInfo", TableInfoWithGeneration):
             response = self._workspace_client.tables.list(
-                catalog_name=schema.catalog.name, schema_name=schema.name
+                catalog_name=schema.catalog.name,
+                schema_name=schema.name,
+                include_browse=True,
             )
             if not response:
                 logger.info(f"Tables not found for schema {schema.id}")
diff --git a/metadata-ingestion/src/datahub/ingestion/source/unity/proxy_profiling.py b/metadata-ingestion/src/datahub/ingestion/source/unity/proxy_profiling.py
index 5d6d2bec6d2fcb..51546a79e05c32 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/unity/proxy_profiling.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/unity/proxy_profiling.py
@@ -1,15 +1,14 @@
 import logging
 import time
-from typing import Optional, Union
+from typing import Optional
 
 from databricks.sdk import WorkspaceClient
 from databricks.sdk.core import DatabricksError
 from databricks.sdk.service._internal import Wait
 from databricks.sdk.service.catalog import TableInfo
 from databricks.sdk.service.sql import (
-    ExecuteStatementResponse,
-    GetStatementResponse,
     GetWarehouseResponse,
+    StatementResponse,
     StatementState,
     StatementStatus,
 )
@@ -125,7 +124,7 @@ def _should_retry_unsupported_column(
 
     def _analyze_table(
         self, ref: TableReference, include_columns: bool
-    ) -> ExecuteStatementResponse:
+    ) -> StatementResponse:
         statement = f"ANALYZE TABLE {ref.schema}.{ref.table} COMPUTE STATISTICS"
         if include_columns:
             statement += " FOR ALL COLUMNS"
@@ -139,7 +138,7 @@ def _analyze_table(
         return response
 
     def _check_analyze_table_statement_status(
-        self, execute_response: ExecuteStatementResponse, max_wait_secs: int
+        self, execute_response: StatementResponse, max_wait_secs: int
     ) -> bool:
         if not execute_response.statement_id or not execute_response.status:
             return False
@@ -230,9 +229,7 @@ def _get_int(self, table_info: TableInfo, field: str) -> Optional[int]:
         return None
 
     @staticmethod
-    def _raise_if_error(
-        response: Union[ExecuteStatementResponse, GetStatementResponse], key: str
-    ) -> None:
+    def _raise_if_error(response: StatementResponse, key: str) -> None:
         if response.status and response.status.state in [
             StatementState.FAILED,
             StatementState.CANCELED,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/unity/source.py b/metadata-ingestion/src/datahub/ingestion/source/unity/source.py
index b29170cb2d705d..9a6cde78cf10d3 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/unity/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/unity/source.py
@@ -140,6 +140,9 @@
 @capability(SourceCapability.DOMAINS, "Supported via the `domain` config field")
 @capability(SourceCapability.CONTAINERS, "Enabled by default")
 @capability(SourceCapability.OWNERSHIP, "Supported via the `include_ownership` config")
+@capability(
+    SourceCapability.DATA_PROFILING, "Supported via the `profiling.enabled` config"
+)
 @capability(
     SourceCapability.DELETION_DETECTION,
     "Optionally enabled via `stateful_ingestion.remove_stale_metadata`",
diff --git a/metadata-ingestion/src/datahub/ingestion/source/usage/usage_common.py b/metadata-ingestion/src/datahub/ingestion/source/usage/usage_common.py
index a2dbef538f73cb..2b7aae8330905e 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/usage/usage_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/usage/usage_common.py
@@ -83,9 +83,11 @@ def make_usage_workunit(
         budget_per_query: int = int(queries_character_limit / top_n_queries)
         top_sql_queries = [
             trim_query(
-                format_sql_query(query, keyword_case="upper", reindent_aligned=True)
-                if format_sql_queries
-                else query,
+                (
+                    format_sql_query(query, keyword_case="upper", reindent_aligned=True)
+                    if format_sql_queries
+                    else query
+                ),
                 budget_per_query=budget_per_query,
                 query_trimmer_string=query_trimmer_string,
             )
@@ -149,7 +151,7 @@ def add_read_entry(
             self.userFreq[user_email] += count
 
         if query:
-            self.queryCount += 1
+            self.queryCount += count
             self.queryFreq[query] += count
         for column in fields:
             self.columnFreq[column] += count
@@ -295,21 +297,25 @@ def convert_usage_aggregation_class(
             uniqueUserCount=obj.metrics.uniqueUserCount,
             totalSqlQueries=obj.metrics.totalSqlQueries,
             topSqlQueries=obj.metrics.topSqlQueries,
-            userCounts=[
-                DatasetUserUsageCountsClass(
-                    user=u.user, count=u.count, userEmail=u.userEmail
-                )
-                for u in obj.metrics.users
-                if u.user is not None
-            ]
-            if obj.metrics.users
-            else None,
-            fieldCounts=[
-                DatasetFieldUsageCountsClass(fieldPath=f.fieldName, count=f.count)
-                for f in obj.metrics.fields
-            ]
-            if obj.metrics.fields
-            else None,
+            userCounts=(
+                [
+                    DatasetUserUsageCountsClass(
+                        user=u.user, count=u.count, userEmail=u.userEmail
+                    )
+                    for u in obj.metrics.users
+                    if u.user is not None
+                ]
+                if obj.metrics.users
+                else None
+            ),
+            fieldCounts=(
+                [
+                    DatasetFieldUsageCountsClass(fieldPath=f.fieldName, count=f.count)
+                    for f in obj.metrics.fields
+                ]
+                if obj.metrics.fields
+                else None
+            ),
         )
         return MetadataChangeProposalWrapper(entityUrn=obj.resource, aspect=aspect)
     else:
diff --git a/metadata-ingestion/src/datahub/ingestion/source_config/bigquery.py b/metadata-ingestion/src/datahub/ingestion/source_config/bigquery.py
deleted file mode 100644
index 1b96da4fecbc9c..00000000000000
--- a/metadata-ingestion/src/datahub/ingestion/source_config/bigquery.py
+++ /dev/null
@@ -1,44 +0,0 @@
-import re
-
-import pydantic
-
-from datahub.configuration.common import ConfigModel
-
-# Regexp for sharded tables.
-# A sharded table is a table that has a suffix of the form _yyyymmdd or yyyymmdd, where yyyymmdd is a date.
-# The regexp checks for valid dates in the suffix (e.g. 20200101, 20200229, 20201231) and if the date is not valid
-# then it is not a sharded table.
-_BIGQUERY_DEFAULT_SHARDED_TABLE_REGEX: str = (
-    "((.+\\D)[_$]?)?(\\d\\d\\d\\d(?:0[1-9]|1[0-2])(?:0[1-9]|[12][0-9]|3[01]))$"
-)
-
-
-class BigQueryBaseConfig(ConfigModel):
-    rate_limit: bool = pydantic.Field(
-        default=False, description="Should we rate limit requests made to API."
-    )
-    requests_per_min: int = pydantic.Field(
-        default=60,
-        description="Used to control number of API calls made per min. Only used when `rate_limit` is set to `True`.",
-    )
-
-    temp_table_dataset_prefix: str = pydantic.Field(
-        default="_",
-        description="If you are creating temp tables in a dataset with a particular prefix you can use this config to set the prefix for the dataset. This is to support workflows from before bigquery's introduction of temp tables. By default we use `_` because of datasets that begin with an underscore are hidden by default https://cloud.google.com/bigquery/docs/datasets#dataset-naming.",
-    )
-
-    sharded_table_pattern: str = pydantic.Field(
-        deprecated=True,
-        default=_BIGQUERY_DEFAULT_SHARDED_TABLE_REGEX,
-        description="The regex pattern to match sharded tables and group as one table. This is a very low level config parameter, only change if you know what you are doing, ",
-    )
-
-    @pydantic.validator("sharded_table_pattern")
-    def sharded_table_pattern_is_a_valid_regexp(cls, v):
-        try:
-            re.compile(v)
-        except Exception as e:
-            raise ValueError(
-                f"sharded_table_pattern configuration pattern is invalid. The exception was: {e}"
-            )
-        return v
diff --git a/metadata-ingestion/src/datahub/ingestion/source_config/usage/bigquery_usage.py b/metadata-ingestion/src/datahub/ingestion/source_config/usage/bigquery_usage.py
deleted file mode 100644
index cc87c791120a87..00000000000000
--- a/metadata-ingestion/src/datahub/ingestion/source_config/usage/bigquery_usage.py
+++ /dev/null
@@ -1,163 +0,0 @@
-import json
-import logging
-import os
-import tempfile
-from datetime import timedelta
-from typing import Any, Dict, List, Optional
-
-import pydantic
-
-from datahub.configuration import ConfigModel
-from datahub.configuration.common import AllowDenyPattern
-from datahub.configuration.source_common import EnvConfigMixin
-from datahub.configuration.validate_field_removal import pydantic_removed_field
-from datahub.configuration.validate_multiline_string import pydantic_multiline_string
-from datahub.ingestion.source.usage.usage_common import BaseUsageConfig
-from datahub.ingestion.source_config.bigquery import BigQueryBaseConfig
-
-logger = logging.getLogger(__name__)
-
-
-class BigQueryCredential(ConfigModel):
-    project_id: str = pydantic.Field(description="Project id to set the credentials")
-    private_key_id: str = pydantic.Field(description="Private key id")
-    private_key: str = pydantic.Field(
-        description="Private key in a form of '-----BEGIN PRIVATE KEY-----\\nprivate-key\\n-----END PRIVATE KEY-----\\n'"
-    )
-    client_email: str = pydantic.Field(description="Client email")
-    client_id: str = pydantic.Field(description="Client Id")
-    auth_uri: str = pydantic.Field(
-        default="https://accounts.google.com/o/oauth2/auth",
-        description="Authentication uri",
-    )
-    token_uri: str = pydantic.Field(
-        default="https://oauth2.googleapis.com/token", description="Token uri"
-    )
-    auth_provider_x509_cert_url: str = pydantic.Field(
-        default="https://www.googleapis.com/oauth2/v1/certs",
-        description="Auth provider x509 certificate url",
-    )
-    type: str = pydantic.Field(
-        default="service_account", description="Authentication type"
-    )
-    client_x509_cert_url: Optional[str] = pydantic.Field(
-        default=None,
-        description="If not set it will be default to https://www.googleapis.com/robot/v1/metadata/x509/client_email",
-    )
-
-    _fix_private_key_newlines = pydantic_multiline_string("private_key")
-
-    @pydantic.root_validator(skip_on_failure=True)
-    def validate_config(cls, values: Dict[str, Any]) -> Dict[str, Any]:
-        if values.get("client_x509_cert_url") is None:
-            values[
-                "client_x509_cert_url"
-            ] = f'https://www.googleapis.com/robot/v1/metadata/x509/{values["client_email"]}'
-        return values
-
-    def create_credential_temp_file(self) -> str:
-        with tempfile.NamedTemporaryFile(delete=False) as fp:
-            cred_json = json.dumps(self.dict(), indent=4, separators=(",", ": "))
-            fp.write(cred_json.encode())
-            return fp.name
-
-
-class BigQueryUsageConfig(BigQueryBaseConfig, EnvConfigMixin, BaseUsageConfig):
-    projects: Optional[List[str]] = pydantic.Field(
-        default=None,
-        description="List of project ids to ingest usage from. If not specified, will infer from environment.",
-    )
-    project_id: Optional[str] = pydantic.Field(
-        default=None,
-        description="Project ID to ingest usage from. If not specified, will infer from environment. Deprecated in favour of projects ",
-    )
-    extra_client_options: dict = pydantic.Field(
-        default_factory=dict,
-        description="Additional options to pass to google.cloud.logging_v2.client.Client.",
-    )
-    use_v2_audit_metadata: Optional[bool] = pydantic.Field(
-        default=False,
-        description="Whether to ingest logs using the v2 format. Required if use_exported_bigquery_audit_metadata is set to True.",
-    )
-
-    bigquery_audit_metadata_datasets: Optional[List[str]] = pydantic.Field(
-        description="A list of datasets that contain a table named cloudaudit_googleapis_com_data_access which contain BigQuery audit logs, specifically, those containing BigQueryAuditMetadata. It is recommended that the project of the dataset is also specified, for example, projectA.datasetB.",
-    )
-    use_exported_bigquery_audit_metadata: bool = pydantic.Field(
-        default=False,
-        description="When configured, use BigQueryAuditMetadata in bigquery_audit_metadata_datasets to compute usage information.",
-    )
-
-    use_date_sharded_audit_log_tables: bool = pydantic.Field(
-        default=False,
-        description="Whether to read date sharded tables or time partitioned tables when extracting usage from exported audit logs.",
-    )
-
-    table_pattern: AllowDenyPattern = pydantic.Field(
-        default=AllowDenyPattern.allow_all(),
-        description="List of regex patterns for tables to include/exclude from ingestion.",
-    )
-    dataset_pattern: AllowDenyPattern = pydantic.Field(
-        default=AllowDenyPattern.allow_all(),
-        description="List of regex patterns for datasets to include/exclude from ingestion.",
-    )
-    log_page_size: pydantic.PositiveInt = pydantic.Field(
-        default=1000,
-        description="",
-    )
-
-    query_log_delay: Optional[pydantic.PositiveInt] = pydantic.Field(
-        default=None,
-        description="To account for the possibility that the query event arrives after the read event in the audit logs, we wait for at least query_log_delay additional events to be processed before attempting to resolve BigQuery job information from the logs. If query_log_delay is None, it gets treated as an unlimited delay, which prioritizes correctness at the expense of memory usage.",
-    )
-
-    max_query_duration: timedelta = pydantic.Field(
-        default=timedelta(minutes=15),
-        description="Correction to pad start_time and end_time with. For handling the case where the read happens within our time range but the query completion event is delayed and happens after the configured end time.",
-    )
-
-    credential: Optional[BigQueryCredential] = pydantic.Field(
-        default=None,
-        description="Bigquery credential. Required if GOOGLE_APPLICATION_CREDENTIALS environment variable is not set. See this example recipe for details",
-    )
-    _credentials_path: Optional[str] = pydantic.PrivateAttr(None)
-    temp_table_dataset_prefix: str = pydantic.Field(
-        default="_",
-        description="If you are creating temp tables in a dataset with a particular prefix you can use this config to set the prefix for the dataset. This is to support workflows from before bigquery's introduction of temp tables. By default we use `_` because of datasets that begin with an underscore are hidden by default https://cloud.google.com/bigquery/docs/datasets#dataset-naming.",
-    )
-
-    def __init__(self, **data: Any):
-        super().__init__(**data)
-        if self.credential:
-            self._credentials_path = self.credential.create_credential_temp_file()
-            logger.debug(
-                f"Creating temporary credential file at {self._credentials_path}"
-            )
-            os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = self._credentials_path
-
-    @pydantic.validator("project_id")
-    def note_project_id_deprecation(cls, v, values, **kwargs):
-        logger.warning(
-            "bigquery-usage project_id option is deprecated; use projects instead"
-        )
-        values["projects"] = [v]
-        return None
-
-    # BigQuery project-ids are globally unique.
-    platform_instance_not_supported_for_bigquery = pydantic_removed_field(
-        "platform_instance"
-    )
-
-    @pydantic.validator("use_exported_bigquery_audit_metadata")
-    def use_exported_bigquery_audit_metadata_uses_v2(cls, v, values):
-        if v is True and not values["use_v2_audit_metadata"]:
-            raise ValueError(
-                "To use exported BigQuery audit metadata, you must also use v2 audit metadata"
-            )
-        return v
-
-    def get_allow_pattern_string(self) -> str:
-        return "|".join(self.table_pattern.allow) if self.table_pattern else ""
-
-    def get_deny_pattern_string(self) -> str:
-        return "|".join(self.table_pattern.deny) if self.table_pattern else ""
diff --git a/metadata-ingestion/src/datahub/ingestion/source_config/usage/snowflake_usage.py b/metadata-ingestion/src/datahub/ingestion/source_config/usage/snowflake_usage.py
deleted file mode 100644
index a0e79f62240ee3..00000000000000
--- a/metadata-ingestion/src/datahub/ingestion/source_config/usage/snowflake_usage.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import logging
-from typing import Optional
-
-import pydantic
-
-from datahub.ingestion.source.usage.usage_common import BaseUsageConfig
-
-logger = logging.getLogger(__name__)
-
-
-class SnowflakeUsageConfig(BaseUsageConfig):
-    email_domain: Optional[str] = pydantic.Field(
-        default=None,
-        description="Email domain of your organization so users can be displayed on UI appropriately.",
-    )
-    apply_view_usage_to_tables: bool = pydantic.Field(
-        default=False,
-        description="Whether to apply view's usage to its base tables. If set to True, usage is applied to base tables only.",
-    )
diff --git a/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_dataproduct.py b/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_dataproduct.py
index 45e92628430258..c474e423030e05 100644
--- a/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_dataproduct.py
+++ b/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_dataproduct.py
@@ -11,7 +11,7 @@
 from datahub.ingestion.transformer.dataset_transformer import (
     DatasetDataproductTransformer,
 )
-from datahub.metadata.schema_classes import MetadataChangeProposalClass
+from datahub.metadata.schema_classes import ContainerClass, MetadataChangeProposalClass
 from datahub.specific.dataproduct import DataProductPatchBuilder
 
 logger = logging.getLogger(__name__)
@@ -23,6 +23,8 @@ class AddDatasetDataProductConfig(ConfigModel):
 
     _resolve_data_product_fn = pydantic_resolve_key("get_data_product_to_add")
 
+    is_container: bool = False
+
 
 class AddDatasetDataProduct(DatasetDataproductTransformer):
     """Transformer that adds dataproduct entity for provided dataset as its asset according to a callback function."""
@@ -49,10 +51,11 @@ def handle_end_of_stream(
         self,
     ) -> List[Union[MetadataChangeProposalWrapper, MetadataChangeProposalClass]]:
         data_products: Dict[str, DataProductPatchBuilder] = {}
-
+        data_products_container: Dict[str, DataProductPatchBuilder] = {}
         logger.debug("Generating dataproducts")
         for entity_urn in self.entity_map.keys():
             data_product_urn = self.config.get_data_product_to_add(entity_urn)
+            is_container = self.config.is_container
             if data_product_urn:
                 if data_product_urn not in data_products:
                     data_products[data_product_urn] = DataProductPatchBuilder(
@@ -63,11 +66,34 @@ def handle_end_of_stream(
                         data_product_urn
                     ].add_asset(entity_urn)
 
+                if is_container:
+                    assert self.ctx.graph
+                    container_aspect = self.ctx.graph.get_aspect(
+                        entity_urn, aspect_type=ContainerClass
+                    )
+                    if not container_aspect:
+                        continue
+                    container_urn = container_aspect.container
+                    if data_product_urn not in data_products_container:
+                        container_product = DataProductPatchBuilder(
+                            data_product_urn
+                        ).add_asset(container_urn)
+                        data_products_container[data_product_urn] = container_product
+                    else:
+                        data_products_container[
+                            data_product_urn
+                        ] = data_products_container[data_product_urn].add_asset(
+                            container_urn
+                        )
+
         mcps: List[
             Union[MetadataChangeProposalWrapper, MetadataChangeProposalClass]
         ] = []
         for data_product in data_products.values():
             mcps.extend(list(data_product.build()))
+        if is_container:
+            for data_product in data_products_container.values():
+                mcps.extend(list(data_product.build()))
         return mcps
 
 
@@ -97,6 +123,7 @@ def create(
 
 class PatternDatasetDataProductConfig(ConfigModel):
     dataset_to_data_product_urns_pattern: KeyValuePattern = KeyValuePattern.all()
+    is_container: bool = False
 
     @pydantic.root_validator(pre=True)
     def validate_pattern_value(cls, values: Dict) -> Dict:
@@ -122,6 +149,7 @@ def __init__(self, config: PatternDatasetDataProductConfig, ctx: PipelineContext
             )[0]
             if dataset_to_data_product.value(dataset_urn)
             else None,
+            is_container=config.is_container,
         )
         super().__init__(generic_config, ctx)
 
diff --git a/metadata-ingestion/src/datahub/ingestion/transformer/dataset_transformer.py b/metadata-ingestion/src/datahub/ingestion/transformer/dataset_transformer.py
index 3e313ddd356be7..42dd54f4a584a0 100644
--- a/metadata-ingestion/src/datahub/ingestion/transformer/dataset_transformer.py
+++ b/metadata-ingestion/src/datahub/ingestion/transformer/dataset_transformer.py
@@ -37,6 +37,16 @@ def entity_types(self) -> List[str]:
         return ["dataset", "container"]
 
 
+class ContainerTransformer(BaseTransformer, SingleAspectTransformer, metaclass=ABCMeta):
+    """Transformer that does transform sequentially on each dataset."""
+
+    def __init__(self):
+        super().__init__()
+
+    def entity_types(self) -> List[str]:
+        return ["container"]
+
+
 class DatasetOwnershipTransformer(DatasetTransformer, metaclass=ABCMeta):
     def aspect_name(self) -> str:
         return "ownership"
@@ -143,3 +153,8 @@ def aspect_name(self) -> str:
 class TagsToTermTransformer(TagTransformer, metaclass=ABCMeta):
     def aspect_name(self) -> str:
         return "glossaryTerms"
+
+
+class ContainerPropertiesTransformer(ContainerTransformer, metaclass=ABCMeta):
+    def aspect_name(self) -> str:
+        return "containerProperties"
diff --git a/metadata-ingestion/src/datahub/ingestion/transformer/replace_external_url.py b/metadata-ingestion/src/datahub/ingestion/transformer/replace_external_url.py
index c222450f87e63a..57af10d1040c8a 100644
--- a/metadata-ingestion/src/datahub/ingestion/transformer/replace_external_url.py
+++ b/metadata-ingestion/src/datahub/ingestion/transformer/replace_external_url.py
@@ -6,9 +6,13 @@
 from datahub.emitter.mce_builder import Aspect
 from datahub.ingestion.api.common import PipelineContext
 from datahub.ingestion.transformer.dataset_transformer import (
+    ContainerPropertiesTransformer,
     DatasetPropertiesTransformer,
 )
-from datahub.metadata.schema_classes import DatasetPropertiesClass
+from datahub.metadata.schema_classes import (
+    ContainerPropertiesClass,
+    DatasetPropertiesClass,
+)
 
 
 class ReplaceExternalUrlConfig(ConfigModel):
@@ -16,8 +20,14 @@ class ReplaceExternalUrlConfig(ConfigModel):
     replacement: str
 
 
-class ReplaceExternalUrl(DatasetPropertiesTransformer):
-    """Transformer that clean the ownership URN."""
+class ReplaceUrl:
+    def replace_url(self, pattern: str, replacement: str, external_url: str) -> str:
+        pattern_obj = re.compile(pattern)
+        return re.sub(pattern_obj, replacement, external_url)
+
+
+class ReplaceExternalUrlDataset(DatasetPropertiesTransformer, ReplaceUrl):
+    """Transformer that replace the external URL for dataset properties."""
 
     ctx: PipelineContext
     config: ReplaceExternalUrlConfig
@@ -34,7 +44,9 @@ def __init__(
         self.resolver_args = resolver_args
 
     @classmethod
-    def create(cls, config_dict: dict, ctx: PipelineContext) -> "ReplaceExternalUrl":
+    def create(
+        cls, config_dict: dict, ctx: PipelineContext
+    ) -> "ReplaceExternalUrlDataset":
         config = ReplaceExternalUrlConfig.parse_obj(config_dict)
         return cls(config, ctx)
 
@@ -55,11 +67,60 @@ def transform_aspect(
                 in_dataset_properties_aspect
             )
 
-            pattern = re.compile(self.config.input_pattern)
-            replacement = self.config.replacement
-
-            out_dataset_properties_aspect.externalUrl = re.sub(
-                pattern, replacement, in_dataset_properties_aspect.externalUrl
+            out_dataset_properties_aspect.externalUrl = self.replace_url(
+                self.config.input_pattern,
+                self.config.replacement,
+                in_dataset_properties_aspect.externalUrl,
             )
 
             return cast(Aspect, out_dataset_properties_aspect)
+
+
+class ReplaceExternalUrlContainer(ContainerPropertiesTransformer, ReplaceUrl):
+    """Transformer that replace the external URL for container properties."""
+
+    ctx: PipelineContext
+    config: ReplaceExternalUrlConfig
+
+    def __init__(
+        self,
+        config: ReplaceExternalUrlConfig,
+        ctx: PipelineContext,
+        **resolver_args: Dict[str, Any],
+    ):
+        super().__init__()
+        self.ctx = ctx
+        self.config = config
+        self.resolver_args = resolver_args
+
+    @classmethod
+    def create(
+        cls, config_dict: dict, ctx: PipelineContext
+    ) -> "ReplaceExternalUrlContainer":
+        config = ReplaceExternalUrlConfig.parse_obj(config_dict)
+        return cls(config, ctx)
+
+    def transform_aspect(
+        self, entity_urn: str, aspect_name: str, aspect: Optional[Aspect]
+    ) -> Optional[Aspect]:
+
+        in_container_properties_aspect: ContainerPropertiesClass = cast(
+            ContainerPropertiesClass, aspect
+        )
+        if (
+            not hasattr(in_container_properties_aspect, "externalUrl")
+            or not in_container_properties_aspect.externalUrl
+        ):
+            return cast(Aspect, in_container_properties_aspect)
+        else:
+            out_container_properties_aspect: ContainerPropertiesClass = copy.deepcopy(
+                in_container_properties_aspect
+            )
+
+            out_container_properties_aspect.externalUrl = self.replace_url(
+                self.config.input_pattern,
+                self.config.replacement,
+                in_container_properties_aspect.externalUrl,
+            )
+
+            return cast(Aspect, out_container_properties_aspect)
diff --git a/metadata-ingestion/src/datahub/integrations/great_expectations/action.py b/metadata-ingestion/src/datahub/integrations/great_expectations/action.py
index 94501b0d499b75..cdc8c8268b4883 100644
--- a/metadata-ingestion/src/datahub/integrations/great_expectations/action.py
+++ b/metadata-ingestion/src/datahub/integrations/great_expectations/action.py
@@ -1,867 +1,3 @@
-from datahub.utilities._markupsafe_compat import MARKUPSAFE_PATCHED
+from datahub_gx_plugin.action import DataHubValidationAction
 
-import json
-import logging
-import sys
-import time
-from dataclasses import dataclass
-from datetime import timezone
-from decimal import Decimal
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
-
-from great_expectations.checkpoint.actions import ValidationAction
-from great_expectations.core.batch import Batch
-from great_expectations.core.batch_spec import (
-    RuntimeDataBatchSpec,
-    RuntimeQueryBatchSpec,
-    SqlAlchemyDatasourceBatchSpec,
-)
-from great_expectations.core.expectation_validation_result import (
-    ExpectationSuiteValidationResult,
-)
-from great_expectations.data_asset.data_asset import DataAsset
-from great_expectations.data_context.data_context import DataContext
-from great_expectations.data_context.types.resource_identifiers import (
-    ExpectationSuiteIdentifier,
-    ValidationResultIdentifier,
-)
-from great_expectations.execution_engine import PandasExecutionEngine
-from great_expectations.execution_engine.sqlalchemy_execution_engine import (
-    SqlAlchemyExecutionEngine,
-)
-from great_expectations.validator.validator import Validator
-from sqlalchemy.engine.base import Connection, Engine
-from sqlalchemy.engine.url import make_url
-
-import datahub.emitter.mce_builder as builder
-from datahub.cli.env_utils import get_boolean_env_variable
-from datahub.emitter.mcp import MetadataChangeProposalWrapper
-from datahub.emitter.rest_emitter import DatahubRestEmitter
-from datahub.emitter.serialization_helper import pre_json_transform
-from datahub.ingestion.source.sql.sqlalchemy_uri_mapper import (
-    get_platform_from_sqlalchemy_uri,
-)
-from datahub.metadata.com.linkedin.pegasus2avro.assertion import (
-    AssertionInfo,
-    AssertionResult,
-    AssertionResultType,
-    AssertionRunEvent,
-    AssertionRunStatus,
-    AssertionStdAggregation,
-    AssertionStdOperator,
-    AssertionStdParameter,
-    AssertionStdParameters,
-    AssertionStdParameterType,
-    AssertionType,
-    BatchSpec,
-    DatasetAssertionInfo,
-    DatasetAssertionScope,
-)
-from datahub.metadata.com.linkedin.pegasus2avro.common import DataPlatformInstance
-from datahub.metadata.schema_classes import PartitionSpecClass, PartitionTypeClass
-from datahub.utilities.sql_parser import DefaultSQLParser
-
-if TYPE_CHECKING:
-    from great_expectations.data_context.types.resource_identifiers import (
-        GXCloudIdentifier,
-    )
-
-assert MARKUPSAFE_PATCHED
-logger = logging.getLogger(__name__)
-if get_boolean_env_variable("DATAHUB_DEBUG", False):
-    handler = logging.StreamHandler(stream=sys.stdout)
-    logger.addHandler(handler)
-    logger.setLevel(logging.DEBUG)
-
-GE_PLATFORM_NAME = "great-expectations"
-
-
-class DataHubValidationAction(ValidationAction):
-    def __init__(
-        self,
-        data_context: DataContext,
-        server_url: str,
-        env: str = builder.DEFAULT_ENV,
-        platform_alias: Optional[str] = None,
-        platform_instance_map: Optional[Dict[str, str]] = None,
-        graceful_exceptions: bool = True,
-        token: Optional[str] = None,
-        timeout_sec: Optional[float] = None,
-        retry_status_codes: Optional[List[int]] = None,
-        retry_max_times: Optional[int] = None,
-        extra_headers: Optional[Dict[str, str]] = None,
-        exclude_dbname: Optional[bool] = None,
-        parse_table_names_from_sql: bool = False,
-        convert_urns_to_lowercase: bool = False,
-    ):
-        super().__init__(data_context)
-        self.server_url = server_url
-        self.env = env
-        self.platform_alias = platform_alias
-        self.platform_instance_map = platform_instance_map
-        self.graceful_exceptions = graceful_exceptions
-        self.token = token
-        self.timeout_sec = timeout_sec
-        self.retry_status_codes = retry_status_codes
-        self.retry_max_times = retry_max_times
-        self.extra_headers = extra_headers
-        self.exclude_dbname = exclude_dbname
-        self.parse_table_names_from_sql = parse_table_names_from_sql
-        self.convert_urns_to_lowercase = convert_urns_to_lowercase
-
-    def _run(
-        self,
-        validation_result_suite: ExpectationSuiteValidationResult,
-        validation_result_suite_identifier: Union[
-            ValidationResultIdentifier, "GXCloudIdentifier"
-        ],
-        data_asset: Union[Validator, DataAsset, Batch],
-        payload: Optional[Any] = None,
-        expectation_suite_identifier: Optional[ExpectationSuiteIdentifier] = None,
-        checkpoint_identifier: Optional[Any] = None,
-    ) -> Dict:
-        datasets = []
-        try:
-            emitter = DatahubRestEmitter(
-                gms_server=self.server_url,
-                token=self.token,
-                read_timeout_sec=self.timeout_sec,
-                connect_timeout_sec=self.timeout_sec,
-                retry_status_codes=self.retry_status_codes,
-                retry_max_times=self.retry_max_times,
-                extra_headers=self.extra_headers,
-            )
-
-            expectation_suite_name = validation_result_suite.meta.get(
-                "expectation_suite_name"
-            )
-            run_id = validation_result_suite.meta.get("run_id")
-            if hasattr(data_asset, "active_batch_id"):
-                batch_identifier = data_asset.active_batch_id
-            else:
-                batch_identifier = data_asset.batch_id
-
-            if isinstance(
-                validation_result_suite_identifier, ValidationResultIdentifier
-            ):
-                expectation_suite_name = (
-                    validation_result_suite_identifier.expectation_suite_identifier.expectation_suite_name
-                )
-                run_id = validation_result_suite_identifier.run_id
-                batch_identifier = validation_result_suite_identifier.batch_identifier
-
-            # Returns datasets and corresponding batch requests
-            datasets = self.get_dataset_partitions(batch_identifier, data_asset)
-
-            if len(datasets) == 0 or datasets[0]["dataset_urn"] is None:
-                warn("Metadata not sent to datahub. No datasets found.")
-                return {"datahub_notification_result": "none required"}
-
-            # Returns assertion info and assertion results
-            assertions = self.get_assertions_with_results(
-                validation_result_suite,
-                expectation_suite_name,
-                run_id,
-                payload,
-                datasets,
-            )
-
-            logger.info("Sending metadata to datahub ...")
-            logger.info("Dataset URN - {urn}".format(urn=datasets[0]["dataset_urn"]))
-
-            for assertion in assertions:
-                logger.info(
-                    "Assertion URN - {urn}".format(urn=assertion["assertionUrn"])
-                )
-
-                # Construct a MetadataChangeProposalWrapper object.
-                assertion_info_mcp = MetadataChangeProposalWrapper(
-                    entityUrn=assertion["assertionUrn"],
-                    aspect=assertion["assertionInfo"],
-                )
-                emitter.emit_mcp(assertion_info_mcp)
-
-                # Construct a MetadataChangeProposalWrapper object.
-                assertion_platform_mcp = MetadataChangeProposalWrapper(
-                    entityUrn=assertion["assertionUrn"],
-                    aspect=assertion["assertionPlatform"],
-                )
-                emitter.emit_mcp(assertion_platform_mcp)
-
-                for assertionResult in assertion["assertionResults"]:
-                    dataset_assertionResult_mcp = MetadataChangeProposalWrapper(
-                        entityUrn=assertionResult.assertionUrn,
-                        aspect=assertionResult,
-                    )
-
-                    # Emit Result! (timeseries aspect)
-                    emitter.emit_mcp(dataset_assertionResult_mcp)
-            logger.info("Metadata sent to datahub.")
-            result = "DataHub notification succeeded"
-        except Exception as e:
-            result = "DataHub notification failed"
-            if self.graceful_exceptions:
-                logger.error(e)
-                logger.info("Suppressing error because graceful_exceptions is set")
-            else:
-                raise
-
-        return {"datahub_notification_result": result}
-
-    def get_assertions_with_results(
-        self,
-        validation_result_suite,
-        expectation_suite_name,
-        run_id,
-        payload,
-        datasets,
-    ):
-        dataPlatformInstance = DataPlatformInstance(
-            platform=builder.make_data_platform_urn(GE_PLATFORM_NAME)
-        )
-        docs_link = None
-        if payload:
-            # process the payload
-            for action_names in payload.keys():
-                if payload[action_names]["class"] == "UpdateDataDocsAction":
-                    data_docs_pages = payload[action_names]
-                    for docs_link_key, docs_link_val in data_docs_pages.items():
-                        if "file://" not in docs_link_val and docs_link_key != "class":
-                            docs_link = docs_link_val
-
-        assertions_with_results = []
-        for result in validation_result_suite.results:
-            expectation_config = result["expectation_config"]
-            expectation_type = expectation_config["expectation_type"]
-            success = bool(result["success"])
-            kwargs = {
-                k: v for k, v in expectation_config["kwargs"].items() if k != "batch_id"
-            }
-
-            result = result["result"]
-            assertion_datasets = [d["dataset_urn"] for d in datasets]
-            if len(datasets) == 1 and "column" in kwargs:
-                assertion_fields = [
-                    builder.make_schema_field_urn(
-                        datasets[0]["dataset_urn"], kwargs["column"]
-                    )
-                ]
-            else:
-                assertion_fields = None  # type:ignore
-
-            # Be careful what fields to consider for creating assertion urn.
-            # Any change in fields below would lead to a new assertion
-            # FIXME - Currently, when using evaluation parameters, new assertion is
-            # created when runtime resolved kwargs are different,
-            # possibly for each validation run
-            assertionUrn = builder.make_assertion_urn(
-                builder.datahub_guid(
-                    pre_json_transform(
-                        {
-                            "platform": GE_PLATFORM_NAME,
-                            "nativeType": expectation_type,
-                            "nativeParameters": kwargs,
-                            "dataset": assertion_datasets[0],
-                            "fields": assertion_fields,
-                        }
-                    )
-                )
-            )
-            logger.debug(
-                "GE expectation_suite_name - {name}, expectation_type - {type}, Assertion URN - {urn}".format(
-                    name=expectation_suite_name, type=expectation_type, urn=assertionUrn
-                )
-            )
-            assertionInfo: AssertionInfo = self.get_assertion_info(
-                expectation_type,
-                kwargs,
-                assertion_datasets[0],
-                assertion_fields,
-                expectation_suite_name,
-            )
-
-            # TODO: Understand why their run time is incorrect.
-            run_time = run_id.run_time.astimezone(timezone.utc)
-            evaluation_parameters = (
-                {
-                    k: convert_to_string(v)
-                    for k, v in validation_result_suite.evaluation_parameters.items()
-                    if k and v
-                }
-                if validation_result_suite.evaluation_parameters
-                else None
-            )
-
-            nativeResults = {
-                k: convert_to_string(v)
-                for k, v in result.items()
-                if (
-                    k
-                    in [
-                        "observed_value",
-                        "partial_unexpected_list",
-                        "partial_unexpected_counts",
-                        "details",
-                    ]
-                    and v
-                )
-            }
-
-            actualAggValue = (
-                result.get("observed_value")
-                if isinstance(result.get("observed_value"), (int, float))
-                else None
-            )
-
-            ds = datasets[0]
-            # https://docs.greatexpectations.io/docs/reference/expectations/result_format/
-            assertionResult = AssertionRunEvent(
-                timestampMillis=int(round(time.time() * 1000)),
-                assertionUrn=assertionUrn,
-                asserteeUrn=ds["dataset_urn"],
-                runId=run_time.strftime("%Y-%m-%dT%H:%M:%SZ"),
-                result=AssertionResult(
-                    type=AssertionResultType.SUCCESS
-                    if success
-                    else AssertionResultType.FAILURE,
-                    rowCount=parse_int_or_default(result.get("element_count")),
-                    missingCount=parse_int_or_default(result.get("missing_count")),
-                    unexpectedCount=parse_int_or_default(
-                        result.get("unexpected_count")
-                    ),
-                    actualAggValue=actualAggValue,
-                    externalUrl=docs_link,
-                    nativeResults=nativeResults,
-                ),
-                batchSpec=ds["batchSpec"],
-                status=AssertionRunStatus.COMPLETE,
-                runtimeContext=evaluation_parameters,
-            )
-            if ds.get("partitionSpec") is not None:
-                assertionResult.partitionSpec = ds.get("partitionSpec")
-            assertionResults = [assertionResult]
-            assertions_with_results.append(
-                {
-                    "assertionUrn": assertionUrn,
-                    "assertionInfo": assertionInfo,
-                    "assertionPlatform": dataPlatformInstance,
-                    "assertionResults": assertionResults,
-                }
-            )
-        return assertions_with_results
-
-    def get_assertion_info(
-        self, expectation_type, kwargs, dataset, fields, expectation_suite_name
-    ):
-        # TODO - can we find exact type of min and max value
-        def get_min_max(kwargs, type=AssertionStdParameterType.UNKNOWN):
-            return AssertionStdParameters(
-                minValue=AssertionStdParameter(
-                    value=convert_to_string(kwargs.get("min_value")),
-                    type=type,
-                ),
-                maxValue=AssertionStdParameter(
-                    value=convert_to_string(kwargs.get("max_value")),
-                    type=type,
-                ),
-            )
-
-        known_expectations: Dict[str, DataHubStdAssertion] = {
-            # column aggregate expectations
-            "expect_column_min_to_be_between": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_COLUMN,
-                operator=AssertionStdOperator.BETWEEN,
-                aggregation=AssertionStdAggregation.MIN,
-                parameters=get_min_max(kwargs),
-            ),
-            "expect_column_max_to_be_between": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_COLUMN,
-                operator=AssertionStdOperator.BETWEEN,
-                aggregation=AssertionStdAggregation.MAX,
-                parameters=get_min_max(kwargs),
-            ),
-            "expect_column_median_to_be_between": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_COLUMN,
-                operator=AssertionStdOperator.BETWEEN,
-                aggregation=AssertionStdAggregation.MEDIAN,
-                parameters=get_min_max(kwargs),
-            ),
-            "expect_column_stdev_to_be_between": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_COLUMN,
-                operator=AssertionStdOperator.BETWEEN,
-                aggregation=AssertionStdAggregation.STDDEV,
-                parameters=get_min_max(kwargs, AssertionStdParameterType.NUMBER),
-            ),
-            "expect_column_mean_to_be_between": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_COLUMN,
-                operator=AssertionStdOperator.BETWEEN,
-                aggregation=AssertionStdAggregation.MEAN,
-                parameters=get_min_max(kwargs, AssertionStdParameterType.NUMBER),
-            ),
-            "expect_column_unique_value_count_to_be_between": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_COLUMN,
-                operator=AssertionStdOperator.BETWEEN,
-                aggregation=AssertionStdAggregation.UNIQUE_COUNT,
-                parameters=get_min_max(kwargs, AssertionStdParameterType.NUMBER),
-            ),
-            "expect_column_proportion_of_unique_values_to_be_between": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_COLUMN,
-                operator=AssertionStdOperator.BETWEEN,
-                aggregation=AssertionStdAggregation.UNIQUE_PROPOTION,
-                parameters=get_min_max(kwargs, AssertionStdParameterType.NUMBER),
-            ),
-            "expect_column_sum_to_be_between": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_COLUMN,
-                operator=AssertionStdOperator.BETWEEN,
-                aggregation=AssertionStdAggregation.SUM,
-                parameters=get_min_max(kwargs, AssertionStdParameterType.NUMBER),
-            ),
-            "expect_column_quantile_values_to_be_between": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_COLUMN,
-                operator=AssertionStdOperator.BETWEEN,
-                aggregation=AssertionStdAggregation._NATIVE_,
-            ),
-            # column map expectations
-            "expect_column_values_to_not_be_null": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_COLUMN,
-                operator=AssertionStdOperator.NOT_NULL,
-                aggregation=AssertionStdAggregation.IDENTITY,
-            ),
-            "expect_column_values_to_be_in_set": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_COLUMN,
-                operator=AssertionStdOperator.IN,
-                aggregation=AssertionStdAggregation.IDENTITY,
-                parameters=AssertionStdParameters(
-                    value=AssertionStdParameter(
-                        value=convert_to_string(kwargs.get("value_set")),
-                        type=AssertionStdParameterType.SET,
-                    )
-                ),
-            ),
-            "expect_column_values_to_be_between": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_COLUMN,
-                operator=AssertionStdOperator.BETWEEN,
-                aggregation=AssertionStdAggregation.IDENTITY,
-                parameters=get_min_max(kwargs),
-            ),
-            "expect_column_values_to_match_regex": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_COLUMN,
-                operator=AssertionStdOperator.REGEX_MATCH,
-                aggregation=AssertionStdAggregation.IDENTITY,
-                parameters=AssertionStdParameters(
-                    value=AssertionStdParameter(
-                        value=kwargs.get("regex"),
-                        type=AssertionStdParameterType.STRING,
-                    )
-                ),
-            ),
-            "expect_column_values_to_match_regex_list": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_COLUMN,
-                operator=AssertionStdOperator.REGEX_MATCH,
-                aggregation=AssertionStdAggregation.IDENTITY,
-                parameters=AssertionStdParameters(
-                    value=AssertionStdParameter(
-                        value=convert_to_string(kwargs.get("regex_list")),
-                        type=AssertionStdParameterType.LIST,
-                    )
-                ),
-            ),
-            "expect_table_columns_to_match_ordered_list": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_SCHEMA,
-                operator=AssertionStdOperator.EQUAL_TO,
-                aggregation=AssertionStdAggregation.COLUMNS,
-                parameters=AssertionStdParameters(
-                    value=AssertionStdParameter(
-                        value=convert_to_string(kwargs.get("column_list")),
-                        type=AssertionStdParameterType.LIST,
-                    )
-                ),
-            ),
-            "expect_table_columns_to_match_set": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_SCHEMA,
-                operator=AssertionStdOperator.EQUAL_TO,
-                aggregation=AssertionStdAggregation.COLUMNS,
-                parameters=AssertionStdParameters(
-                    value=AssertionStdParameter(
-                        value=convert_to_string(kwargs.get("column_set")),
-                        type=AssertionStdParameterType.SET,
-                    )
-                ),
-            ),
-            "expect_table_column_count_to_be_between": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_SCHEMA,
-                operator=AssertionStdOperator.BETWEEN,
-                aggregation=AssertionStdAggregation.COLUMN_COUNT,
-                parameters=get_min_max(kwargs, AssertionStdParameterType.NUMBER),
-            ),
-            "expect_table_column_count_to_equal": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_SCHEMA,
-                operator=AssertionStdOperator.EQUAL_TO,
-                aggregation=AssertionStdAggregation.COLUMN_COUNT,
-                parameters=AssertionStdParameters(
-                    value=AssertionStdParameter(
-                        value=convert_to_string(kwargs.get("value")),
-                        type=AssertionStdParameterType.NUMBER,
-                    )
-                ),
-            ),
-            "expect_column_to_exist": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_SCHEMA,
-                operator=AssertionStdOperator._NATIVE_,
-                aggregation=AssertionStdAggregation._NATIVE_,
-            ),
-            "expect_table_row_count_to_equal": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_ROWS,
-                operator=AssertionStdOperator.EQUAL_TO,
-                aggregation=AssertionStdAggregation.ROW_COUNT,
-                parameters=AssertionStdParameters(
-                    value=AssertionStdParameter(
-                        value=convert_to_string(kwargs.get("value")),
-                        type=AssertionStdParameterType.NUMBER,
-                    )
-                ),
-            ),
-            "expect_table_row_count_to_be_between": DataHubStdAssertion(
-                scope=DatasetAssertionScope.DATASET_ROWS,
-                operator=AssertionStdOperator.BETWEEN,
-                aggregation=AssertionStdAggregation.ROW_COUNT,
-                parameters=get_min_max(kwargs, AssertionStdParameterType.NUMBER),
-            ),
-        }
-
-        datasetAssertionInfo = DatasetAssertionInfo(
-            dataset=dataset,
-            fields=fields,
-            operator=AssertionStdOperator._NATIVE_,
-            aggregation=AssertionStdAggregation._NATIVE_,
-            nativeType=expectation_type,
-            nativeParameters={k: convert_to_string(v) for k, v in kwargs.items()},
-            scope=DatasetAssertionScope.DATASET_ROWS,
-        )
-
-        if expectation_type in known_expectations.keys():
-            assertion = known_expectations[expectation_type]
-            datasetAssertionInfo.scope = assertion.scope
-            datasetAssertionInfo.aggregation = assertion.aggregation
-            datasetAssertionInfo.operator = assertion.operator
-            datasetAssertionInfo.parameters = assertion.parameters
-
-        # Heuristically mapping other expectations
-        else:
-            if "column" in kwargs and expectation_type.startswith(
-                "expect_column_value"
-            ):
-                datasetAssertionInfo.scope = DatasetAssertionScope.DATASET_COLUMN
-                datasetAssertionInfo.aggregation = AssertionStdAggregation.IDENTITY
-            elif "column" in kwargs:
-                datasetAssertionInfo.scope = DatasetAssertionScope.DATASET_COLUMN
-                datasetAssertionInfo.aggregation = AssertionStdAggregation._NATIVE_
-
-        return AssertionInfo(
-            type=AssertionType.DATASET,
-            datasetAssertion=datasetAssertionInfo,
-            customProperties={"expectation_suite_name": expectation_suite_name},
-        )
-
-    def get_dataset_partitions(self, batch_identifier, data_asset):
-        dataset_partitions = []
-
-        logger.debug("Finding datasets being validated")
-
-        # for now, we support only v3-api and sqlalchemy execution engine and Pandas engine
-        is_sql_alchemy = isinstance(data_asset, Validator) and (
-            isinstance(data_asset.execution_engine, SqlAlchemyExecutionEngine)
-        )
-        is_pandas = isinstance(data_asset.execution_engine, PandasExecutionEngine)
-        if is_sql_alchemy or is_pandas:
-            ge_batch_spec = data_asset.active_batch_spec
-            partitionSpec = None
-            batchSpecProperties = {
-                "data_asset_name": str(
-                    data_asset.active_batch_definition.data_asset_name
-                ),
-                "datasource_name": str(
-                    data_asset.active_batch_definition.datasource_name
-                ),
-            }
-            sqlalchemy_uri = None
-            if is_sql_alchemy and isinstance(
-                data_asset.execution_engine.engine, Engine
-            ):
-                sqlalchemy_uri = data_asset.execution_engine.engine.url
-            # For snowflake sqlalchemy_execution_engine.engine is actually instance of Connection
-            elif is_sql_alchemy and isinstance(
-                data_asset.execution_engine.engine, Connection
-            ):
-                sqlalchemy_uri = data_asset.execution_engine.engine.engine.url
-
-            if isinstance(ge_batch_spec, SqlAlchemyDatasourceBatchSpec):
-                # e.g. ConfiguredAssetSqlDataConnector with splitter_method or sampling_method
-                schema_name = ge_batch_spec.get("schema_name")
-                table_name = ge_batch_spec.get("table_name")
-
-                dataset_urn = make_dataset_urn_from_sqlalchemy_uri(
-                    sqlalchemy_uri,
-                    schema_name,
-                    table_name,
-                    self.env,
-                    self.get_platform_instance(
-                        data_asset.active_batch_definition.datasource_name
-                    ),
-                    self.exclude_dbname,
-                    self.platform_alias,
-                    self.convert_urns_to_lowercase,
-                )
-                batchSpec = BatchSpec(
-                    nativeBatchId=batch_identifier,
-                    customProperties=batchSpecProperties,
-                )
-
-                splitter_method = ge_batch_spec.get("splitter_method")
-                if (
-                    splitter_method is not None
-                    and splitter_method != "_split_on_whole_table"
-                ):
-                    batch_identifiers = ge_batch_spec.get("batch_identifiers", {})
-                    partitionSpec = PartitionSpecClass(
-                        partition=convert_to_string(batch_identifiers)
-                    )
-                sampling_method = ge_batch_spec.get("sampling_method", "")
-                if sampling_method == "_sample_using_limit":
-                    batchSpec.limit = ge_batch_spec["sampling_kwargs"]["n"]
-
-                dataset_partitions.append(
-                    {
-                        "dataset_urn": dataset_urn,
-                        "partitionSpec": partitionSpec,
-                        "batchSpec": batchSpec,
-                    }
-                )
-            elif isinstance(ge_batch_spec, RuntimeQueryBatchSpec):
-                if not self.parse_table_names_from_sql:
-                    warn(
-                        "Enable parse_table_names_from_sql in DatahubValidationAction config\
-                            to try to parse the tables being asserted from SQL query"
-                    )
-                    return []
-                query = data_asset.batches[
-                    batch_identifier
-                ].batch_request.runtime_parameters["query"]
-                partitionSpec = PartitionSpecClass(
-                    type=PartitionTypeClass.QUERY,
-                    partition=f"Query_{builder.datahub_guid(pre_json_transform(query))}",
-                )
-
-                batchSpec = BatchSpec(
-                    nativeBatchId=batch_identifier,
-                    query=query,
-                    customProperties=batchSpecProperties,
-                )
-                try:
-                    tables = DefaultSQLParser(query).get_tables()
-                except Exception as e:
-                    logger.warning(f"Sql parser failed on {query} with {e}")
-                    tables = []
-
-                if len(set(tables)) != 1:
-                    warn(
-                        "DataHubValidationAction does not support cross dataset assertions."
-                    )
-                    return []
-                for table in tables:
-                    dataset_urn = make_dataset_urn_from_sqlalchemy_uri(
-                        sqlalchemy_uri,
-                        None,
-                        table,
-                        self.env,
-                        self.get_platform_instance(
-                            data_asset.active_batch_definition.datasource_name
-                        ),
-                        self.exclude_dbname,
-                        self.platform_alias,
-                        self.convert_urns_to_lowercase,
-                    )
-                    dataset_partitions.append(
-                        {
-                            "dataset_urn": dataset_urn,
-                            "partitionSpec": partitionSpec,
-                            "batchSpec": batchSpec,
-                        }
-                    )
-            elif isinstance(ge_batch_spec, RuntimeDataBatchSpec):
-                data_platform = self.get_platform_instance(
-                    data_asset.active_batch_definition.datasource_name
-                )
-                dataset_urn = builder.make_dataset_urn_with_platform_instance(
-                    platform=data_platform
-                    if self.platform_alias is None
-                    else self.platform_alias,
-                    name=data_asset.active_batch_definition.datasource_name,
-                    platform_instance="",
-                    env=self.env,
-                )
-                batchSpec = BatchSpec(
-                    nativeBatchId=batch_identifier,
-                    query="",
-                    customProperties=batchSpecProperties,
-                )
-                dataset_partitions.append(
-                    {
-                        "dataset_urn": dataset_urn,
-                        "partitionSpec": partitionSpec,
-                        "batchSpec": batchSpec,
-                    }
-                )
-            else:
-                warn(
-                    "DataHubValidationAction does not recognize this GE batch spec type- {batch_spec_type}.".format(
-                        batch_spec_type=type(ge_batch_spec)
-                    )
-                )
-        else:
-            # TODO - v2-spec - SqlAlchemyDataset support
-            warn(
-                "DataHubValidationAction does not recognize this GE data asset type - {asset_type}. This is either using v2-api or execution engine other than sqlalchemy.".format(
-                    asset_type=type(data_asset)
-                )
-            )
-
-        return dataset_partitions
-
-    def get_platform_instance(self, datasource_name):
-        if self.platform_instance_map and datasource_name in self.platform_instance_map:
-            return self.platform_instance_map[datasource_name]
-        else:
-            warn(
-                f"Datasource {datasource_name} is not present in platform_instance_map"
-            )
-        return None
-
-
-def parse_int_or_default(value, default_value=None):
-    if value is None:
-        return default_value
-    else:
-        return int(value)
-
-
-def make_dataset_urn_from_sqlalchemy_uri(
-    sqlalchemy_uri,
-    schema_name,
-    table_name,
-    env,
-    platform_instance=None,
-    exclude_dbname=None,
-    platform_alias=None,
-    convert_urns_to_lowercase=False,
-):
-    data_platform = get_platform_from_sqlalchemy_uri(str(sqlalchemy_uri))
-    url_instance = make_url(sqlalchemy_uri)
-
-    if schema_name is None and "." in table_name:
-        schema_name, table_name = table_name.split(".")[-2:]
-
-    if data_platform in ["redshift", "postgres"]:
-        schema_name = schema_name or "public"
-        if url_instance.database is None:
-            warn(
-                f"DataHubValidationAction failed to locate database name for {data_platform}."
-            )
-            return None
-        schema_name = (
-            schema_name if exclude_dbname else f"{url_instance.database}.{schema_name}"
-        )
-    elif data_platform == "mssql":
-        schema_name = schema_name or "dbo"
-        if url_instance.database is None:
-            warn(
-                f"DataHubValidationAction failed to locate database name for {data_platform}."
-            )
-            return None
-        schema_name = (
-            schema_name if exclude_dbname else f"{url_instance.database}.{schema_name}"
-        )
-    elif data_platform in ["trino", "snowflake"]:
-        if schema_name is None or url_instance.database is None:
-            warn(
-                "DataHubValidationAction failed to locate schema name and/or database name for {data_platform}.".format(
-                    data_platform=data_platform
-                )
-            )
-            return None
-        # If data platform is snowflake, we artificially lowercase the Database name.
-        # This is because DataHub also does this during ingestion.
-        # Ref: https://github.com/datahub-project/datahub/blob/master/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_utils.py#L155
-        database_name = (
-            url_instance.database.lower()
-            if data_platform == "snowflake"
-            else url_instance.database
-        )
-        if database_name.endswith(f"/{schema_name}"):
-            database_name = database_name[: -len(f"/{schema_name}")]
-        schema_name = (
-            schema_name if exclude_dbname else f"{database_name}.{schema_name}"
-        )
-
-    elif data_platform == "bigquery":
-        if url_instance.host is None or url_instance.database is None:
-            warn(
-                "DataHubValidationAction failed to locate host and/or database name for {data_platform}. ".format(
-                    data_platform=data_platform
-                )
-            )
-            return None
-        schema_name = f"{url_instance.host}.{url_instance.database}"
-
-    schema_name = schema_name or url_instance.database
-    if schema_name is None:
-        warn(
-            f"DataHubValidationAction failed to locate schema name for {data_platform}."
-        )
-        return None
-
-    dataset_name = f"{schema_name}.{table_name}"
-
-    if convert_urns_to_lowercase:
-        dataset_name = dataset_name.lower()
-
-    dataset_urn = builder.make_dataset_urn_with_platform_instance(
-        platform=data_platform if platform_alias is None else platform_alias,
-        name=dataset_name,
-        platform_instance=platform_instance,
-        env=env,
-    )
-
-    return dataset_urn
-
-
-@dataclass
-class DataHubStdAssertion:
-    scope: Union[str, DatasetAssertionScope]
-    operator: Union[str, AssertionStdOperator]
-    aggregation: Union[str, AssertionStdAggregation]
-    parameters: Optional[AssertionStdParameters] = None
-
-
-class DecimalEncoder(json.JSONEncoder):
-    def default(self, o):
-        if isinstance(o, Decimal):
-            return str(o)
-        return super().default(o)
-
-
-def convert_to_string(var: Any) -> str:
-    try:
-        tmp = (
-            str(var)
-            if isinstance(var, (str, int, float))
-            else json.dumps(var, cls=DecimalEncoder)
-        )
-    except TypeError as e:
-        logger.debug(e)
-        tmp = str(var)
-    return tmp
-
-
-def warn(msg):
-    logger.warning(msg)
+__all__ = ["DataHubValidationAction"]
diff --git a/metadata-ingestion/src/datahub/specific/chart.py b/metadata-ingestion/src/datahub/specific/chart.py
index 51994ad1d063eb..cc68168b68db7e 100644
--- a/metadata-ingestion/src/datahub/specific/chart.py
+++ b/metadata-ingestion/src/datahub/specific/chart.py
@@ -3,8 +3,11 @@
 
 from datahub.emitter.mcp_patch_builder import MetadataPatchProposal
 from datahub.metadata.schema_classes import (
+    AccessLevelClass,
     AuditStampClass,
+    ChangeAuditStampsClass,
     ChartInfoClass as ChartInfo,
+    ChartTypeClass,
     EdgeClass as Edge,
     GlobalTagsClass as GlobalTags,
     GlossaryTermAssociationClass as Term,
@@ -311,3 +314,108 @@ def remove_custom_property(self, key: str) -> "ChartPatchBuilder":
         """
         self.custom_properties_patch_helper.remove_property(key)
         return self
+
+    def set_title(self, title: str) -> "ChartPatchBuilder":
+        assert title, "ChartInfo title should not be None"
+        self._add_patch(
+            ChartInfo.ASPECT_NAME,
+            "add",
+            path="/title",
+            value=title,
+        )
+
+        return self
+
+    def set_description(self, description: str) -> "ChartPatchBuilder":
+        assert description, "DashboardInfo description should not be None"
+        self._add_patch(
+            ChartInfo.ASPECT_NAME,
+            "add",
+            path="/description",
+            value=description,
+        )
+
+        return self
+
+    def set_last_refreshed(self, last_refreshed: Optional[int]) -> "ChartPatchBuilder":
+        if last_refreshed:
+            self._add_patch(
+                ChartInfo.ASPECT_NAME,
+                "add",
+                path="/lastRefreshed",
+                value=last_refreshed,
+            )
+
+        return self
+
+    def set_last_modified(
+        self, last_modified: "ChangeAuditStampsClass"
+    ) -> "ChartPatchBuilder":
+        if last_modified:
+            self._add_patch(
+                ChartInfo.ASPECT_NAME,
+                "add",
+                path="/lastModified",
+                value=last_modified,
+            )
+
+        return self
+
+    def set_external_url(self, external_url: Optional[str]) -> "ChartPatchBuilder":
+        if external_url:
+            self._add_patch(
+                ChartInfo.ASPECT_NAME,
+                "add",
+                path="/externalUrl",
+                value=external_url,
+            )
+        return self
+
+    def set_chart_url(self, dashboard_url: Optional[str]) -> "ChartPatchBuilder":
+        if dashboard_url:
+            self._add_patch(
+                ChartInfo.ASPECT_NAME,
+                "add",
+                path="/chartUrl",
+                value=dashboard_url,
+            )
+
+        return self
+
+    def set_type(
+        self, type: Union[None, Union[str, "ChartTypeClass"]] = None
+    ) -> "ChartPatchBuilder":
+        if type:
+            self._add_patch(
+                ChartInfo.ASPECT_NAME,
+                "add",
+                path="/type",
+                value=type,
+            )
+
+        return self
+
+    def set_access(
+        self, access: Union[None, Union[str, "AccessLevelClass"]] = None
+    ) -> "ChartPatchBuilder":
+        if access:
+            self._add_patch(
+                ChartInfo.ASPECT_NAME,
+                "add",
+                path="/access",
+                value=access,
+            )
+
+        return self
+
+    def add_inputs(self, input_urns: Optional[List[str]]) -> "ChartPatchBuilder":
+        if input_urns:
+            for urn in input_urns:
+                self._add_patch(
+                    aspect_name=ChartInfo.ASPECT_NAME,
+                    op="add",
+                    path=f"/inputs/{urn}",
+                    value=urn,
+                )
+
+        return self
diff --git a/metadata-ingestion/src/datahub/specific/dashboard.py b/metadata-ingestion/src/datahub/specific/dashboard.py
index e6d911b5986550..8228dbc011db2f 100644
--- a/metadata-ingestion/src/datahub/specific/dashboard.py
+++ b/metadata-ingestion/src/datahub/specific/dashboard.py
@@ -3,7 +3,9 @@
 
 from datahub.emitter.mcp_patch_builder import MetadataPatchProposal
 from datahub.metadata.schema_classes import (
+    AccessLevelClass,
     AuditStampClass,
+    ChangeAuditStampsClass,
     DashboardInfoClass as DashboardInfo,
     EdgeClass as Edge,
     GlobalTagsClass as GlobalTags,
@@ -405,3 +407,123 @@ def remove_custom_property(self, key: str) -> "DashboardPatchBuilder":
         """
         self.custom_properties_patch_helper.remove_property(key)
         return self
+
+    def set_title(self, title: str) -> "DashboardPatchBuilder":
+        assert title, "DashboardInfo title should not be None"
+        self._add_patch(
+            DashboardInfo.ASPECT_NAME,
+            "add",
+            path="/title",
+            value=title,
+        )
+
+        return self
+
+    def set_description(self, description: str) -> "DashboardPatchBuilder":
+        assert description, "DashboardInfo description should not be None"
+        self._add_patch(
+            DashboardInfo.ASPECT_NAME,
+            "add",
+            path="/description",
+            value=description,
+        )
+
+        return self
+
+    def add_custom_properties(
+        self, custom_properties: Optional[Dict[str, str]] = None
+    ) -> "DashboardPatchBuilder":
+
+        if custom_properties:
+            for key, value in custom_properties.items():
+                self.custom_properties_patch_helper.add_property(key, value)
+
+        return self
+
+    def set_external_url(self, external_url: Optional[str]) -> "DashboardPatchBuilder":
+        if external_url:
+            self._add_patch(
+                DashboardInfo.ASPECT_NAME,
+                "add",
+                path="/externalUrl",
+                value=external_url,
+            )
+        return self
+
+    def add_charts(self, chart_urns: Optional[List[str]]) -> "DashboardPatchBuilder":
+        if chart_urns:
+            for urn in chart_urns:
+                self._add_patch(
+                    aspect_name=DashboardInfo.ASPECT_NAME,
+                    op="add",
+                    path=f"/charts/{urn}",
+                    value=urn,
+                )
+
+        return self
+
+    def add_datasets(
+        self, dataset_urns: Optional[List[str]]
+    ) -> "DashboardPatchBuilder":
+        if dataset_urns:
+            for urn in dataset_urns:
+                self._add_patch(
+                    aspect_name=DashboardInfo.ASPECT_NAME,
+                    op="add",
+                    path=f"/datasets/{urn}",
+                    value=urn,
+                )
+
+        return self
+
+    def set_dashboard_url(
+        self, dashboard_url: Optional[str]
+    ) -> "DashboardPatchBuilder":
+        if dashboard_url:
+            self._add_patch(
+                DashboardInfo.ASPECT_NAME,
+                "add",
+                path="/dashboardUrl",
+                value=dashboard_url,
+            )
+
+        return self
+
+    def set_access(
+        self, access: Union[None, Union[str, "AccessLevelClass"]] = None
+    ) -> "DashboardPatchBuilder":
+        if access:
+            self._add_patch(
+                DashboardInfo.ASPECT_NAME,
+                "add",
+                path="/access",
+                value=access,
+            )
+
+        return self
+
+    def set_last_refreshed(
+        self, last_refreshed: Optional[int]
+    ) -> "DashboardPatchBuilder":
+        if last_refreshed:
+            self._add_patch(
+                DashboardInfo.ASPECT_NAME,
+                "add",
+                path="/lastRefreshed",
+                value=last_refreshed,
+            )
+
+        return self
+
+    def set_last_modified(
+        self, last_modified: "ChangeAuditStampsClass"
+    ) -> "DashboardPatchBuilder":
+        if last_modified:
+            self._add_patch(
+                DashboardInfo.ASPECT_NAME,
+                "add",
+                path="/lastModified",
+                value=last_modified,
+            )
+
+        return self
diff --git a/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py b/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
index fbf6f954f82bbc..d945e135f00122 100644
--- a/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
+++ b/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
@@ -25,6 +25,7 @@
 from datahub.ingestion.graph.client import DataHubGraph
 from datahub.ingestion.source.usage.usage_common import BaseUsageConfig, UsageAggregator
 from datahub.metadata.urns import (
+    CorpGroupUrn,
     CorpUserUrn,
     DataPlatformUrn,
     DatasetUrn,
@@ -36,6 +37,7 @@
 from datahub.sql_parsing.sqlglot_lineage import (
     ColumnLineageInfo,
     ColumnRef,
+    DownstreamColumnRef,
     SqlParsingResult,
     infer_output_schema,
     sqlglot_lineage,
@@ -45,6 +47,10 @@
     get_query_fingerprint,
     try_format_query,
 )
+from datahub.sql_parsing.tool_meta_extractor import (
+    ToolMetaExtractor,
+    ToolMetaExtractorReport,
+)
 from datahub.utilities.cooperative_timeout import CooperativeTimeoutError
 from datahub.utilities.file_backed_collections import (
     ConnectionWrapper,
@@ -71,6 +77,8 @@ class QueryLogSetting(enum.Enum):
 _DEFAULT_QUERY_LOG_SETTING = QueryLogSetting[
     os.getenv("DATAHUB_SQL_AGG_QUERY_LOG") or QueryLogSetting.DISABLED.name
 ]
+MAX_UPSTREAM_TABLES_COUNT = 300
+MAX_FINEGRAINEDLINEAGE_COUNT = 2000
 
 
 @dataclasses.dataclass
@@ -83,6 +91,21 @@ class LoggedQuery:
     default_schema: Optional[str]
 
 
+@dataclasses.dataclass
+class ObservedQuery:
+    query: str
+    session_id: Optional[str] = None
+    timestamp: Optional[datetime] = None
+    user: Optional[Union[CorpUserUrn, CorpGroupUrn]] = None
+    default_db: Optional[str] = None
+    default_schema: Optional[str] = None
+    query_hash: Optional[str] = None
+    usage_multiplier: int = 1
+
+    # Use this to store addtitional key-value information about query for debugging
+    extra_info: Optional[dict] = None
+
+
 @dataclasses.dataclass
 class ViewDefinition:
     view_definition: str
@@ -101,7 +124,7 @@ class QueryMetadata:
     query_type: QueryType
     lineage_type: str  # from models.DatasetLineageTypeClass
     latest_timestamp: Optional[datetime]
-    actor: Optional[CorpUserUrn]
+    actor: Optional[Union[CorpUserUrn, CorpGroupUrn]]
 
     upstreams: List[UrnStr]  # this is direct upstreams, which may be temp tables
     column_lineage: List[ColumnLineageInfo]
@@ -160,13 +183,15 @@ class PreparsedQuery:
     confidence_score: float = 1.0
 
     query_count: int = 1
-    user: Optional[CorpUserUrn] = None
+    user: Optional[Union[CorpUserUrn, CorpGroupUrn]] = None
     timestamp: Optional[datetime] = None
     session_id: str = _MISSING_SESSION_ID
     query_type: QueryType = QueryType.UNKNOWN
     query_type_props: QueryTypeProps = dataclasses.field(
         default_factory=lambda: QueryTypeProps()
     )
+    # Use this to store addtitional key-value information about query for debugging
+    extra_info: Optional[dict] = None
 
 
 @dataclasses.dataclass
@@ -220,6 +245,8 @@ class SqlAggregatorReport(Report):
     num_unique_query_fingerprints: Optional[int] = None
     num_urns_with_lineage: Optional[int] = None
     num_lineage_skipped_due_to_filters: int = 0
+    num_table_lineage_trimmed_due_to_large_size: int = 0
+    num_column_lineage_trimmed_due_to_large_size: int = 0
 
     # Queries.
     num_queries_entities_generated: int = 0
@@ -228,11 +255,15 @@ class SqlAggregatorReport(Report):
     # Usage-related.
     usage_skipped_missing_timestamp: int = 0
     num_query_usage_stats_generated: int = 0
+    num_query_usage_stats_outside_window: int = 0
 
     # Operation-related.
     num_operations_generated: int = 0
     num_operations_skipped_due_to_filters: int = 0
 
+    # Tool Metadata Extraction
+    tool_meta_report: Optional[ToolMetaExtractorReport] = None
+
     def compute_stats(self) -> None:
         self.schema_resolver_count = self._aggregator._schema_resolver.schema_count()
         self.num_unique_query_fingerprints = len(self._aggregator._query_map)
@@ -407,6 +438,10 @@ def __init__(
                 tablename="query_usage_counts",
             )
 
+        # Tool Extractor
+        self._tool_meta_extractor = ToolMetaExtractor()
+        self.report.tool_meta_report = self._tool_meta_extractor.report
+
     def close(self) -> None:
         self._exit_stack.close()
 
@@ -418,6 +453,7 @@ def _need_schemas(self) -> bool:
             or self.generate_usage_statistics
             or self.generate_queries
             or self.generate_operations
+            or self.generate_query_usage_statistics
         )
 
     def register_schema(
@@ -469,7 +505,10 @@ def is_allowed_table(self, urn: UrnStr) -> bool:
         return self._is_allowed_table(self._name_from_urn(urn))
 
     def add(
-        self, item: Union[KnownQueryLineageInfo, KnownLineageMapping, PreparsedQuery]
+        self,
+        item: Union[
+            KnownQueryLineageInfo, KnownLineageMapping, PreparsedQuery, ObservedQuery
+        ],
     ) -> None:
         if isinstance(item, KnownQueryLineageInfo):
             self.add_known_query_lineage(item)
@@ -477,6 +516,8 @@ def add(
             self.add_known_lineage_mapping(item.upstream_urn, item.downstream_urn)
         elif isinstance(item, PreparsedQuery):
             self.add_preparsed_query(item)
+        elif isinstance(item, ObservedQuery):
+            self.add_observed_query(item)
         else:
             raise ValueError(f"Cannot add unknown item type: {type(item)}")
 
@@ -547,9 +588,6 @@ def add_known_lineage_mapping(
         Because this method takes in urns, it does not require that the urns
         are part of the platform that the aggregator is configured for.
 
-        TODO: In the future, this method will also generate CLL if we have
-        schemas for either the upstream or downstream.
-
         The known lineage mapping does not contribute to usage statistics or operations.
 
         Args:
@@ -562,6 +600,21 @@ def add_known_lineage_mapping(
         # We generate a fake "query" object to hold the lineage.
         query_id = self._known_lineage_query_id()
 
+        # Generate CLL if schema of downstream is known
+        column_lineage: List[ColumnLineageInfo] = []
+        if self._schema_resolver.has_urn(downstream_urn):
+            schema = self._schema_resolver._resolve_schema_info(downstream_urn)
+            if schema:
+                column_lineage = [
+                    ColumnLineageInfo(
+                        downstream=DownstreamColumnRef(
+                            table=downstream_urn, column=field_path
+                        ),
+                        upstreams=[ColumnRef(table=upstream_urn, column=field_path)],
+                    )
+                    for field_path in schema
+                ]
+
         # Register the query.
         self._add_to_query_map(
             QueryMetadata(
@@ -573,7 +626,7 @@ def add_known_lineage_mapping(
                 latest_timestamp=None,
                 actor=None,
                 upstreams=[upstream_urn],
-                column_lineage=[],
+                column_lineage=column_lineage,
                 column_usage={},
                 confidence_score=1.0,
             )
@@ -608,15 +661,7 @@ def add_view_definition(
 
     def add_observed_query(
         self,
-        query: str,
-        default_db: Optional[str] = None,
-        default_schema: Optional[str] = None,
-        query_timestamp: Optional[datetime] = None,
-        user: Optional[CorpUserUrn] = None,
-        session_id: Optional[
-            str
-        ] = None,  # can only see temp tables with the same session
-        usage_multiplier: int = 1,
+        observed: ObservedQuery,
         is_known_temp_table: bool = False,
         require_out_table_schema: bool = False,
     ) -> None:
@@ -632,7 +677,7 @@ def add_observed_query(
         self.report.num_observed_queries += 1
 
         # All queries with no session ID are assumed to be part of the same session.
-        session_id = session_id or _MISSING_SESSION_ID
+        session_id = observed.session_id or _MISSING_SESSION_ID
 
         # Load in the temp tables for this session.
         schema_resolver: SchemaResolverInterface = (
@@ -642,17 +687,17 @@ def add_observed_query(
 
         # Run the SQL parser.
         parsed = self._run_sql_parser(
-            query,
-            default_db=default_db,
-            default_schema=default_schema,
+            observed.query,
+            default_db=observed.default_db,
+            default_schema=observed.default_schema,
             schema_resolver=schema_resolver,
             session_id=session_id,
-            timestamp=query_timestamp,
-            user=user,
+            timestamp=observed.timestamp,
+            user=observed.user,
         )
         if parsed.debug_info.error:
             self.report.observed_query_parse_failures.append(
-                f"{parsed.debug_info.error} on query: {query[:100]}"
+                f"{parsed.debug_info.error} on query: {observed.query[:100]}"
             )
         if parsed.debug_info.table_error:
             self.report.num_observed_queries_failed += 1
@@ -662,15 +707,14 @@ def add_observed_query(
             if isinstance(parsed.debug_info.column_error, CooperativeTimeoutError):
                 self.report.num_observed_queries_column_timeout += 1
 
-        query_fingerprint = parsed.query_fingerprint
-
+        query_fingerprint = observed.query_hash or parsed.query_fingerprint
         self.add_preparsed_query(
             PreparsedQuery(
                 query_id=query_fingerprint,
-                query_text=query,
-                query_count=usage_multiplier,
-                timestamp=query_timestamp,
-                user=user,
+                query_text=observed.query,
+                query_count=observed.usage_multiplier,
+                timestamp=observed.timestamp,
+                user=observed.user,
                 session_id=session_id,
                 query_type=parsed.query_type,
                 query_type_props=parsed.query_type_props,
@@ -681,6 +725,7 @@ def add_observed_query(
                 column_usage=compute_upstream_fields(parsed),
                 inferred_schema=infer_output_schema(parsed),
                 confidence_score=parsed.debug_info.confidence,
+                extra_info=observed.extra_info,
             ),
             is_known_temp_table=is_known_temp_table,
             require_out_table_schema=require_out_table_schema,
@@ -696,6 +741,12 @@ def add_preparsed_query(
         session_has_temp_tables: bool = True,
         _is_internal: bool = False,
     ) -> None:
+
+        # Adding tool specific metadata extraction here allows it
+        # to work for both ObservedQuery and PreparsedQuery as
+        # add_preparsed_query it used within add_observed_query.
+        self._tool_meta_extractor.extract_bi_metadata(parsed)
+
         if not _is_internal:
             self.report.num_preparsed_queries += 1
 
@@ -909,7 +960,7 @@ def _run_sql_parser(
         schema_resolver: SchemaResolverInterface,
         session_id: str = _MISSING_SESSION_ID,
         timestamp: Optional[datetime] = None,
-        user: Optional[CorpUserUrn] = None,
+        user: Optional[Union[CorpUserUrn, CorpGroupUrn]] = None,
     ) -> SqlParsingResult:
         with self.report.sql_parsing_timer:
             parsed = sqlglot_lineage(
@@ -993,9 +1044,9 @@ def gen_metadata(self) -> Iterable[MetadataChangeProposalWrapper]:
         queries_generated: Set[QueryId] = set()
 
         yield from self._gen_lineage_mcps(queries_generated)
-        yield from self._gen_remaining_queries(queries_generated)
         yield from self._gen_usage_statistics_mcps()
-        yield from self._gen_operation_mcps()
+        yield from self._gen_operation_mcps(queries_generated)
+        yield from self._gen_remaining_queries(queries_generated)
 
     def _gen_lineage_mcps(
         self, queries_generated: Set[QueryId]
@@ -1131,10 +1182,33 @@ def _gen_lineage_for_downstream(
                         confidenceScore=queries_map[query_id].confidence_score,
                     )
                 )
+
+        if len(upstream_aspect.upstreams) > MAX_UPSTREAM_TABLES_COUNT:
+            logger.warning(
+                f"Too many upstream tables for {downstream_urn}: {len(upstream_aspect.upstreams)}"
+                f"Keeping only {MAX_UPSTREAM_TABLES_COUNT} table level upstreams/"
+            )
+            upstream_aspect.upstreams = upstream_aspect.upstreams[
+                :MAX_UPSTREAM_TABLES_COUNT
+            ]
+            self.report.num_table_lineage_trimmed_due_to_large_size += 1
+        if len(upstream_aspect.fineGrainedLineages) > MAX_FINEGRAINEDLINEAGE_COUNT:
+            logger.warning(
+                f"Too many upstream columns for {downstream_urn}: {len(upstream_aspect.fineGrainedLineages)}"
+                f"Keeping only {MAX_FINEGRAINEDLINEAGE_COUNT} column level upstreams/"
+            )
+            upstream_aspect.fineGrainedLineages = upstream_aspect.fineGrainedLineages[
+                :MAX_FINEGRAINEDLINEAGE_COUNT
+            ]
+            self.report.num_column_lineage_trimmed_due_to_large_size += 1
+
         upstream_aspect.fineGrainedLineages = (
             upstream_aspect.fineGrainedLineages or None
         )
 
+        if not upstream_aspect.upstreams and not upstream_aspect.fineGrainedLineages:
+            return
+
         yield MetadataChangeProposalWrapper(
             entityUrn=downstream_urn,
             aspect=upstream_aspect,
@@ -1259,9 +1333,15 @@ def _gen_query(
             query_counter = self._query_usage_counts.get(query_id)
             if not query_counter:
                 return
-            for bucket in self.usage_config.buckets():
-                count = query_counter.get(bucket)
-                if not count:
+
+            all_buckets = self.usage_config.buckets()
+
+            for bucket, count in query_counter.items():
+                if bucket not in all_buckets:
+                    # What happens if we get a query with a timestamp that's outside our configured window?
+                    # Theoretically this should never happen, since the audit logs are also fetched
+                    # for the window. However, it's useful to have reporting for it, just in case.
+                    self.report.num_query_usage_stats_outside_window += 1
                     continue
 
                 yield MetadataChangeProposalWrapper(
@@ -1432,7 +1512,9 @@ def _gen_usage_statistics_mcps(self) -> Iterable[MetadataChangeProposalWrapper]:
             # TODO: We should change the usage aggregator to return MCPWs directly.
             yield cast(MetadataChangeProposalWrapper, wu.metadata)
 
-    def _gen_operation_mcps(self) -> Iterable[MetadataChangeProposalWrapper]:
+    def _gen_operation_mcps(
+        self, queries_generated: Set[QueryId]
+    ) -> Iterable[MetadataChangeProposalWrapper]:
         if not self.generate_operations:
             return
 
@@ -1440,6 +1522,12 @@ def _gen_operation_mcps(self) -> Iterable[MetadataChangeProposalWrapper]:
             for query_id in query_ids:
                 yield from self._gen_operation_for_downstream(downstream_urn, query_id)
 
+                # Avoid generating the same query twice.
+                if query_id in queries_generated:
+                    continue
+                queries_generated.add(query_id)
+                yield from self._gen_query(self._query_map[query_id], downstream_urn)
+
     def _gen_operation_for_downstream(
         self, downstream_urn: UrnStr, query_id: QueryId
     ) -> Iterable[MetadataChangeProposalWrapper]:
diff --git a/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py b/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py
index 976ff8bcc9b3ff..27d99a14c0520b 100644
--- a/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py
+++ b/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py
@@ -189,35 +189,49 @@ def _table_level_lineage(
     statement: sqlglot.Expression, dialect: sqlglot.Dialect
 ) -> Tuple[Set[_TableName], Set[_TableName]]:
     # Generate table-level lineage.
-    modified = {
-        _TableName.from_sqlglot_table(expr.this)
-        for expr in statement.find_all(
-            sqlglot.exp.Create,
-            sqlglot.exp.Insert,
-            sqlglot.exp.Update,
-            sqlglot.exp.Delete,
-            sqlglot.exp.Merge,
-        )
-        # In some cases like "MERGE ... then INSERT (col1, col2) VALUES (col1, col2)",
-        # the `this` on the INSERT part isn't a table.
-        if isinstance(expr.this, sqlglot.exp.Table)
-    } | {
-        # For statements that include a column list, like
-        # CREATE DDL statements and `INSERT INTO table (col1, col2) SELECT ...`
-        # the table name is nested inside a Schema object.
-        _TableName.from_sqlglot_table(expr.this.this)
-        for expr in statement.find_all(
-            sqlglot.exp.Create,
-            sqlglot.exp.Insert,
-        )
-        if isinstance(expr.this, sqlglot.exp.Schema)
-        and isinstance(expr.this.this, sqlglot.exp.Table)
-    }
+    modified = (
+        {
+            _TableName.from_sqlglot_table(expr.this)
+            for expr in statement.find_all(
+                sqlglot.exp.Create,
+                sqlglot.exp.Insert,
+                sqlglot.exp.Update,
+                sqlglot.exp.Delete,
+                sqlglot.exp.Merge,
+                sqlglot.exp.Alter,
+            )
+            # In some cases like "MERGE ... then INSERT (col1, col2) VALUES (col1, col2)",
+            # the `this` on the INSERT part isn't a table.
+            if isinstance(expr.this, sqlglot.exp.Table)
+        }
+        | {
+            # For statements that include a column list, like
+            # CREATE DDL statements and `INSERT INTO table (col1, col2) SELECT ...`
+            # the table name is nested inside a Schema object.
+            _TableName.from_sqlglot_table(expr.this.this)
+            for expr in statement.find_all(
+                sqlglot.exp.Create,
+                sqlglot.exp.Insert,
+            )
+            if isinstance(expr.this, sqlglot.exp.Schema)
+            and isinstance(expr.this.this, sqlglot.exp.Table)
+        }
+        | {
+            # For drop statements, we only want it if a table/view is being dropped.
+            # Other "kinds" will not have table.name populated.
+            _TableName.from_sqlglot_table(expr.this)
+            for expr in ([statement] if isinstance(statement, sqlglot.exp.Drop) else [])
+            if isinstance(expr.this, sqlglot.exp.Table)
+            and expr.this.this
+            and expr.this.name
+        }
+    )
 
     tables = (
         {
             _TableName.from_sqlglot_table(table)
             for table in statement.find_all(sqlglot.exp.Table)
+            if not isinstance(table.parent, sqlglot.exp.Drop)
         }
         # ignore references created in this query
         - modified
@@ -823,7 +837,10 @@ def _translate_internal_column_lineage(
                 raw_column_lineage.downstream.column_type.sql(dialect=dialect)
                 if raw_column_lineage.downstream.column_type
                 and raw_column_lineage.downstream.column_type.this
-                != sqlglot.exp.DataType.Type.UNKNOWN
+                not in {
+                    sqlglot.exp.DataType.Type.UNKNOWN,
+                    sqlglot.exp.DataType.Type.NULL,
+                }
                 else None
             ),
         ),
diff --git a/metadata-ingestion/src/datahub/sql_parsing/tool_meta_extractor.py b/metadata-ingestion/src/datahub/sql_parsing/tool_meta_extractor.py
new file mode 100644
index 00000000000000..cdd35c23e30885
--- /dev/null
+++ b/metadata-ingestion/src/datahub/sql_parsing/tool_meta_extractor.py
@@ -0,0 +1,96 @@
+import json
+import logging
+from dataclasses import dataclass, field
+from typing import Callable, Dict, List, Optional, Tuple, Union
+
+from typing_extensions import Protocol
+
+from datahub.ingestion.api.report import Report
+from datahub.metadata.urns import CorpGroupUrn, CorpUserUrn
+from datahub.utilities.stats_collections import int_top_k_dict
+
+UrnStr = str
+
+logger = logging.getLogger(__name__)
+
+
+class QueryLog(Protocol):
+    """Represents Query Log Entry
+    expected by QueryMetaExractor interface
+    """
+
+    query_text: str
+    user: Optional[Union[CorpUserUrn, CorpGroupUrn]]
+    extra_info: Optional[dict]
+
+
+def _get_last_line(query: str) -> str:
+    return query.rstrip().rsplit("\n", maxsplit=1)[-1]
+
+
+@dataclass
+class ToolMetaExtractorReport(Report):
+    num_queries_meta_extracted: Dict[str, int] = field(default_factory=int_top_k_dict)
+
+
+class ToolMetaExtractor:
+    """Enriches input query log entry with tool-specific details captured as part of query log
+
+    Such as
+    - Queries executed on warehouse by Mode BI tool contain information of actual user interacting
+    with BI tool which is more useful as compared to service account used to execute query as reported
+    by warehouse query logs.
+    """
+
+    def __init__(self) -> None:
+        self.report = ToolMetaExtractorReport()
+        self.known_tool_extractors: List[Tuple[str, Callable[[QueryLog], bool]]] = [
+            (
+                "mode",
+                self._extract_mode_query,
+            )
+        ]
+
+    def _extract_mode_query(self, entry: QueryLog) -> bool:
+        """
+        Returns:
+            bool: whether QueryLog entry is that of mode and mode user info
+            is extracted into entry.
+        """
+        last_line = _get_last_line(entry.query_text)
+
+        if not (
+            last_line.startswith("--")
+            and '"url":"https://modeanalytics.com' in last_line
+        ):
+            return False
+
+        mode_json_raw = last_line[2:]
+        mode_json = json.loads(mode_json_raw)
+
+        original_user = entry.user
+
+        entry.user = email_to_user_urn(mode_json["email"])
+        entry.extra_info = entry.extra_info or {}
+        entry.extra_info["user_via"] = original_user
+
+        # TODO: Generate an "origin" urn.
+
+        return True
+
+    def extract_bi_metadata(self, entry: QueryLog) -> bool:
+
+        for tool, meta_extractor in self.known_tool_extractors:
+            try:
+                if meta_extractor(entry):
+                    self.report.num_queries_meta_extracted[tool] += 1
+                    return True
+            except Exception:
+                logger.debug("Tool metadata extraction failed with error : {e}")
+        return False
+
+
+# NOTE: This is implementing the most common user urn generation scenario
+# however may need to be revisited at later point
+def email_to_user_urn(email: str) -> CorpUserUrn:
+    return CorpUserUrn(email.split("@", 1)[0])
diff --git a/metadata-ingestion/src/datahub/telemetry/telemetry.py b/metadata-ingestion/src/datahub/telemetry/telemetry.py
index 69a790b3d9bc76..4faf04ee2d2c76 100644
--- a/metadata-ingestion/src/datahub/telemetry/telemetry.py
+++ b/metadata-ingestion/src/datahub/telemetry/telemetry.py
@@ -283,7 +283,7 @@ def init_tracking(self) -> None:
         if not self.enabled or self.mp is None or self.tracking_init is True:
             return
 
-        logger.debug("Sending init Telemetry")
+        logger.debug("Sending init telemetry")
         try:
             self.mp.people_set(
                 self.client_id,
@@ -310,13 +310,21 @@ def ping(
         if not self.enabled or self.mp is None:
             return
 
+        properties = properties or {}
+
         # send event
         try:
-            logger.debug(f"Sending telemetry for {event_name}")
+            if event_name == "function-call":
+                logger.debug(
+                    f"Sending telemetry for {event_name} {properties.get('function')}, status {properties.get('status')}"
+                )
+            else:
+                logger.debug(f"Sending telemetry for {event_name}")
+
             properties = {
                 **_default_telemetry_properties(),
                 **self._server_props(server),
-                **(properties or {}),
+                **properties,
             }
             self.mp.track(self.client_id, event_name, properties)
         except Exception as e:
diff --git a/metadata-ingestion/src/datahub/testing/check_sql_parser_result.py b/metadata-ingestion/src/datahub/testing/check_sql_parser_result.py
index 39c0dddd314002..72b5f6c5e26e4b 100644
--- a/metadata-ingestion/src/datahub/testing/check_sql_parser_result.py
+++ b/metadata-ingestion/src/datahub/testing/check_sql_parser_result.py
@@ -15,7 +15,6 @@
 
 logger = logging.getLogger(__name__)
 
-# TODO: Hook this into the standard --update-golden-files mechanism.
 UPDATE_FILES = os.environ.get("UPDATE_SQLPARSER_FILES", "false").lower() == "true"
 
 
diff --git a/metadata-ingestion/src/datahub/testing/check_str_enum.py b/metadata-ingestion/src/datahub/testing/check_str_enum.py
new file mode 100644
index 00000000000000..2d1a84aa5f738d
--- /dev/null
+++ b/metadata-ingestion/src/datahub/testing/check_str_enum.py
@@ -0,0 +1,33 @@
+import pathlib
+from typing import List
+
+
+def ensure_no_enum_mixin(dirs: List[pathlib.Path]) -> None:
+    # See the docs on the StrEnum implementation for why this is necessary.
+
+    bad_lines = {
+        "(str, Enum)",
+        "(str, enum.Enum)",
+        # We don't have any int enums right now, but this will catch them if we add some.
+        "(int, Enum)",
+        "(int, enum.Enum)",
+    }
+
+    ignored_files = {
+        "datahub/utilities/str_enum.py",
+        "datahub/testing/check_str_enum.py",
+    }
+
+    for dir in dirs:
+        for file in dir.rglob("*.py"):
+            if any(str(file).endswith(ignored_file) for ignored_file in ignored_files):
+                continue
+
+            with file.open() as f:
+                for line in f:
+                    if any(bad_line in line for bad_line in bad_lines):
+                        raise ValueError(
+                            f"Disallowed enum mixin found in {file}: `{line.rstrip()}`. "
+                            "This enum mixin's behavior changed in Python 3.11, so it will work inconsistently across versions."
+                            "Use datahub.utilities.str_enum.StrEnum instead."
+                        )
diff --git a/metadata-ingestion/src/datahub/testing/docker_utils.py b/metadata-ingestion/src/datahub/testing/docker_utils.py
new file mode 100644
index 00000000000000..7c1c0304f480e6
--- /dev/null
+++ b/metadata-ingestion/src/datahub/testing/docker_utils.py
@@ -0,0 +1,70 @@
+import contextlib
+import logging
+import subprocess
+from typing import Callable, Iterator, List, Optional, Union
+
+import pytest
+import pytest_docker.plugin
+
+logger = logging.getLogger(__name__)
+
+
+def is_responsive(container_name: str, port: int, hostname: Optional[str]) -> bool:
+    """A cheap way to figure out if a port is responsive on a container"""
+    if hostname:
+        cmd = f"docker exec {container_name} /bin/bash -c 'echo -n > /dev/tcp/{hostname}/{port}'"
+    else:
+        # use the hostname of the container
+        cmd = f"docker exec {container_name} /bin/bash -c 'c_host=`hostname`;echo -n > /dev/tcp/$c_host/{port}'"
+    ret = subprocess.run(
+        cmd,
+        shell=True,
+    )
+    return ret.returncode == 0
+
+
+def wait_for_port(
+    docker_services: pytest_docker.plugin.Services,
+    container_name: str,
+    container_port: int,
+    hostname: Optional[str] = None,
+    timeout: float = 30.0,
+    pause: float = 0.5,
+    checker: Optional[Callable[[], bool]] = None,
+) -> None:
+    try:
+        docker_services.wait_until_responsive(
+            timeout=timeout,
+            pause=pause,
+            check=(
+                checker
+                if checker
+                else lambda: is_responsive(container_name, container_port, hostname)
+            ),
+        )
+        logger.info(f"Container {container_name} is ready!")
+    finally:
+        # use check=True to raise an error if command gave bad exit code
+        subprocess.run(f"docker logs {container_name}", shell=True, check=True)
+
+
+@pytest.fixture(scope="module")
+def docker_compose_runner(
+    docker_compose_command, docker_compose_project_name, docker_setup, docker_cleanup
+):
+    @contextlib.contextmanager
+    def run(
+        compose_file_path: Union[str, List[str]], key: str, cleanup: bool = True
+    ) -> Iterator[pytest_docker.plugin.Services]:
+        with pytest_docker.plugin.get_docker_services(
+            docker_compose_command=docker_compose_command,
+            # We can remove the type ignore once this is merged:
+            # https://github.com/avast/pytest-docker/pull/108
+            docker_compose_file=compose_file_path,  # type: ignore
+            docker_compose_project_name=f"{docker_compose_project_name}-{key}",
+            docker_setup=docker_setup,
+            docker_cleanup=docker_cleanup if cleanup else [],
+        ) as docker_services:
+            yield docker_services
+
+    return run
diff --git a/metadata-ingestion/src/datahub/upgrade/upgrade.py b/metadata-ingestion/src/datahub/upgrade/upgrade.py
index cdb7df57efe798..9e2639abdca415 100644
--- a/metadata-ingestion/src/datahub/upgrade/upgrade.py
+++ b/metadata-ingestion/src/datahub/upgrade/upgrade.py
@@ -12,7 +12,8 @@
 from termcolor import colored
 
 from datahub import __version__
-from datahub.ingestion.graph.client import DataHubGraph, load_client_config
+from datahub.cli.config_utils import load_client_config
+from datahub.ingestion.graph.client import DataHubGraph
 
 log = logging.getLogger(__name__)
 
diff --git a/metadata-ingestion/src/datahub/utilities/file_backed_collections.py b/metadata-ingestion/src/datahub/utilities/file_backed_collections.py
index bb2b827dc06c31..e866a372fbbaf2 100644
--- a/metadata-ingestion/src/datahub/utilities/file_backed_collections.py
+++ b/metadata-ingestion/src/datahub/utilities/file_backed_collections.py
@@ -35,8 +35,13 @@
 
 _DEFAULT_FILE_NAME = "sqlite.db"
 _DEFAULT_TABLE_NAME = "data"
-_DEFAULT_MEMORY_CACHE_MAX_SIZE = 2000
-_DEFAULT_MEMORY_CACHE_EVICTION_BATCH_SIZE = 200
+
+# As per https://stackoverflow.com/questions/7106016/too-many-sql-variables-error-in-django-with-sqlite3
+# the default SQLITE_MAX_VARIABLE_NUMBER is 999. There's a few places where we embed one id from every
+# item in the cache into a query (e.g. when implementing __len__), so we need to be careful not to
+# exceed this limit.
+_DEFAULT_MEMORY_CACHE_MAX_SIZE = 900
+_DEFAULT_MEMORY_CACHE_EVICTION_BATCH_SIZE = 150
 
 # https://docs.python.org/3/library/sqlite3.html#sqlite-and-python-types
 # Datetimes get converted to strings
@@ -178,6 +183,12 @@ class FileBackedDict(MutableMapping[str, _VT], Closeable, Generic[_VT]):
     """A dict-like object that stores its data in a temporary SQLite database.
 
     This is useful for storing large amounts of data that don't fit in memory.
+
+    Like a standard Python dict / OrderedDict, it maintains insertion order.
+
+    It maintains a small in-memory cache to avoid having to serialize/deserialize
+    data from the database too often. This is an implementation detail that isn't
+    exposed to the user.
     """
 
     # Use a predefined connection, able to be shared across multiple FileBacked* objects
@@ -207,8 +218,9 @@ def __post_init__(self) -> None:
             self.cache_eviction_batch_size > 0
         ), "cache_eviction_batch_size must be positive"
 
-        assert "key" not in self.extra_columns, '"key" is a reserved column name'
-        assert "value" not in self.extra_columns, '"value" is a reserved column name'
+        for reserved_column in ("key", "value", "rowid"):
+            if reserved_column in self.extra_columns:
+                raise ValueError(f'"{reserved_column}" is a reserved column name')
 
         if self.shared_connection:
             self._conn = self.shared_connection
@@ -222,10 +234,13 @@ def __post_init__(self) -> None:
         self._active_object_cache = collections.OrderedDict()
 
         # Create the table.
+        # We could use the built-in sqlite `rowid` column, but that can get changed
+        # if a VACUUM is performed and would break our ordering guarantees.
         if_not_exists = "IF NOT EXISTS" if self._conn.allow_table_name_reuse else ""
         self._conn.execute(
             f"""CREATE TABLE {if_not_exists} {self.tablename} (
-                key TEXT PRIMARY KEY,
+                rowid INTEGER PRIMARY KEY AUTOINCREMENT,
+                key TEXT UNIQUE,
                 value BLOB
                 {''.join(f', {column_name} BLOB' for column_name in self.extra_columns.keys())}
             )"""
@@ -275,13 +290,20 @@ def _prune_cache(self, num_items_to_prune: int) -> None:
                 items_to_write.append(tuple(values))
 
         if items_to_write:
+            # Tricky: By using a INSERT INTO ... ON CONFLICT (key) structure, we can
+            # ensure that the rowid remains the same if a value is updated but is
+            # autoincremented when rows are inserted.
             self._conn.executemany(
-                f"""INSERT OR REPLACE INTO {self.tablename} (
+                f"""INSERT INTO {self.tablename} (
                     key,
                     value
                     {''.join(f', {column_name}' for column_name in self.extra_columns.keys())}
                 )
-                VALUES ({', '.join(['?'] *(2 + len(self.extra_columns)))})""",
+                VALUES ({', '.join(['?'] *(2 + len(self.extra_columns)))})
+                ON CONFLICT (key) DO UPDATE SET
+                    value = excluded.value
+                    {''.join(f', {column_name} = excluded.{column_name}' for column_name in self.extra_columns.keys())}
+                """,
                 items_to_write,
             )
 
@@ -351,14 +373,15 @@ def mark_dirty(self, key: str) -> None:
             self._active_object_cache[key] = self._active_object_cache[key][0], True
 
     def __iter__(self) -> Iterator[str]:
-        # Cache should be small, so safe set cast to avoid mutation during iteration
-        cache_keys = set(self._active_object_cache.keys())
-        yield from cache_keys
+        self.flush()
 
-        cursor = self._conn.execute(f"SELECT key FROM {self.tablename}")
+        # Our active object cache should now be empty, so it's fine to
+        # just pull from the DB.
+        cursor = self._conn.execute(
+            f"SELECT key FROM {self.tablename} ORDER BY rowid ASC"
+        )
         for row in cursor:
-            if row[0] not in cache_keys:
-                yield row[0]
+            yield row[0]
 
     def items_snapshot(
         self, cond_sql: Optional[str] = None
diff --git a/metadata-ingestion/src/datahub/utilities/logging_manager.py b/metadata-ingestion/src/datahub/utilities/logging_manager.py
index 64383745eb2d1b..926b8782fbf119 100644
--- a/metadata-ingestion/src/datahub/utilities/logging_manager.py
+++ b/metadata-ingestion/src/datahub/utilities/logging_manager.py
@@ -35,6 +35,8 @@
     "acryl_datahub_cloud",
 ]
 IN_MEMORY_LOG_BUFFER_SIZE = 2000  # lines
+IN_MEMORY_LOG_BUFFER_MAX_LINE_LENGTH = 2000  # characters
+
 
 NO_COLOR = os.environ.get("NO_COLOR", False)
 
@@ -159,6 +161,9 @@ def __init__(self, maxlen: Optional[int] = None) -> None:
         self._buffer: Deque[str] = collections.deque(maxlen=maxlen)
 
     def write(self, line: str) -> None:
+        if len(line) > IN_MEMORY_LOG_BUFFER_MAX_LINE_LENGTH:
+            line = line[:IN_MEMORY_LOG_BUFFER_MAX_LINE_LENGTH] + "[truncated]"
+
         self._buffer.append(line)
 
     def clear(self) -> None:
@@ -278,3 +283,4 @@ def configure_logging(debug: bool, log_file: Optional[str] = None) -> Iterator[N
 logging.getLogger("snowflake").setLevel(level=logging.WARNING)
 # logging.getLogger("botocore").setLevel(logging.INFO)
 # logging.getLogger("google").setLevel(logging.INFO)
+logging.getLogger("pyodata").setLevel(logging.WARNING)
diff --git a/metadata-ingestion/src/datahub/utilities/mapping.py b/metadata-ingestion/src/datahub/utilities/mapping.py
index ac10e26f765563..6cc7d9c50b775d 100644
--- a/metadata-ingestion/src/datahub/utilities/mapping.py
+++ b/metadata-ingestion/src/datahub/utilities/mapping.py
@@ -383,14 +383,24 @@ def get_operation_value(
             if self.tag_prefix:
                 tag = self.tag_prefix + tag
             return tag
-        elif (
-            operation_type == Constants.ADD_OWNER_OPERATION
-            and operation_config[Constants.OWNER_TYPE]
-        ):
+        elif operation_type == Constants.ADD_OWNER_OPERATION:
             owner_id = _get_best_match(match, "owner")
-
             owner_ids: List[str] = [_id.strip() for _id in owner_id.split(",")]
 
+            owner_type_raw = operation_config.get(
+                Constants.OWNER_TYPE, Constants.USER_OWNER
+            )
+            owner_type_mapping: Dict[str, OwnerType] = {
+                Constants.USER_OWNER: OwnerType.USER,
+                Constants.GROUP_OWNER: OwnerType.GROUP,
+            }
+            if owner_type_raw not in owner_type_mapping:
+                logger.warning(
+                    f"Invalid owner type: {owner_type_raw}. Valid owner types are {', '.join(owner_type_mapping.keys())}"
+                )
+                return None
+            owner_type = owner_type_mapping[owner_type_raw]
+
             owner_category = (
                 operation_config.get(Constants.OWNER_CATEGORY)
                 or OwnershipTypeClass.DATAOWNER
@@ -402,19 +412,12 @@ def get_operation_value(
                     self.sanitize_owner_ids(owner_id) for owner_id in owner_ids
                 ]
 
-            owner_type_mapping: Dict[str, OwnerType] = {
-                Constants.USER_OWNER: OwnerType.USER,
-                Constants.GROUP_OWNER: OwnerType.GROUP,
-            }
-            if operation_config[Constants.OWNER_TYPE] in owner_type_mapping:
-                return _make_owner_category_list(
-                    owner_ids=owner_ids,
-                    owner_category=owner_category,
-                    owner_category_urn=owner_category_urn,
-                    owner_type=owner_type_mapping[
-                        operation_config[Constants.OWNER_TYPE]
-                    ],
-                )
+            return _make_owner_category_list(
+                owner_ids=owner_ids,
+                owner_category=owner_category,
+                owner_category_urn=owner_category_urn,
+                owner_type=owner_type,
+            )
 
         elif (
             operation_type == Constants.ADD_TERM_OPERATION
diff --git a/metadata-ingestion/src/datahub/utilities/sqlalchemy_type_converter.py b/metadata-ingestion/src/datahub/utilities/sqlalchemy_type_converter.py
index 41d02646fdb8a0..ad94c6904e2807 100644
--- a/metadata-ingestion/src/datahub/utilities/sqlalchemy_type_converter.py
+++ b/metadata-ingestion/src/datahub/utilities/sqlalchemy_type_converter.py
@@ -5,6 +5,8 @@
 from typing import Any, Dict, List, Optional, Type, Union
 
 from sqlalchemy import types
+from sqlalchemy.engine.reflection import Inspector
+from sqlalchemy.sql.visitors import Visitable
 
 from datahub.ingestion.extractor.schema_util import avro_schema_to_mce_fields
 from datahub.metadata.com.linkedin.pegasus2avro.schema import SchemaField
@@ -176,6 +178,7 @@ def get_avro_for_sqlalchemy_column(
 def get_schema_fields_for_sqlalchemy_column(
     column_name: str,
     column_type: types.TypeEngine,
+    inspector: Inspector,
     description: Optional[str] = None,
     nullable: Optional[bool] = True,
     is_part_of_key: Optional[bool] = False,
@@ -216,7 +219,10 @@ def get_schema_fields_for_sqlalchemy_column(
             SchemaField(
                 fieldPath=column_name,
                 type=SchemaFieldDataTypeClass(type=NullTypeClass()),
-                nativeDataType=str(column_type),
+                nativeDataType=get_native_data_type_for_sqlalchemy_type(
+                    column_type,
+                    inspector,
+                ),
             )
         ]
 
@@ -240,3 +246,25 @@ def get_schema_fields_for_sqlalchemy_column(
     )
 
     return schema_fields
+
+
+def get_native_data_type_for_sqlalchemy_type(
+    column_type: types.TypeEngine, inspector: Inspector
+) -> str:
+    if isinstance(column_type, types.NullType):
+        return column_type.__visit_name__
+
+    try:
+        return column_type.compile(dialect=inspector.dialect)
+    except Exception as e:
+        logger.debug(
+            f"Unable to compile sqlalchemy type {column_type} the error was: {e}"
+        )
+
+        if (
+            isinstance(column_type, Visitable)
+            and column_type.__visit_name__ is not None
+        ):
+            return column_type.__visit_name__
+
+        return repr(column_type)
diff --git a/metadata-ingestion/src/datahub/utilities/str_enum.py b/metadata-ingestion/src/datahub/utilities/str_enum.py
new file mode 100644
index 00000000000000..b8392f40770e4a
--- /dev/null
+++ b/metadata-ingestion/src/datahub/utilities/str_enum.py
@@ -0,0 +1,14 @@
+from enum import Enum
+
+
+class StrEnum(str, Enum):
+    """String Enum class."""
+
+    # This is required for compatibility with Python 3.11+, which changed the
+    # behavior of enums in format() and f-strings.
+    # Once we're using only Python 3.11+, we can replace this with enum.StrEnum.
+    # See https://blog.pecar.me/python-enum for more details.
+
+    def __str__(self) -> str:
+        """Return the string representation of the enum."""
+        return str(self.value)
diff --git a/metadata-ingestion/src/datahub/utilities/urns/urn_iter.py b/metadata-ingestion/src/datahub/utilities/urns/urn_iter.py
index 5bef17119675e0..f0e4c6f5ee14a1 100644
--- a/metadata-ingestion/src/datahub/utilities/urns/urn_iter.py
+++ b/metadata-ingestion/src/datahub/utilities/urns/urn_iter.py
@@ -131,7 +131,7 @@ def _modify_at_path(
         _modify_at_path(getattr(model, path[0]), path[1:], new_value)
 
 
-def _lowercase_dataset_urn(dataset_urn: str) -> str:
+def lowercase_dataset_urn(dataset_urn: str) -> str:
     cur_urn = DatasetUrn.from_string(dataset_urn)
     new_urn = DatasetUrn(
         platform=cur_urn.platform, name=cur_urn.name.lower(), env=cur_urn.env
@@ -149,10 +149,10 @@ def lowercase_dataset_urns(
 ) -> None:
     def modify_urn(urn: str) -> str:
         if guess_entity_type(urn) == "dataset":
-            return _lowercase_dataset_urn(urn)
+            return lowercase_dataset_urn(urn)
         elif guess_entity_type(urn) == "schemaField":
             cur_urn = Urn.from_string(urn)
-            cur_urn._entity_ids[0] = _lowercase_dataset_urn(cur_urn._entity_ids[0])
+            cur_urn._entity_ids[0] = lowercase_dataset_urn(cur_urn._entity_ids[0])
             return str(cur_urn)
         return urn
 
diff --git a/metadata-ingestion/tests/integration/bigquery_v2/bigquery_lineage_usage_golden.json b/metadata-ingestion/tests/integration/bigquery_v2/bigquery_lineage_usage_golden.json
new file mode 100644
index 00000000000000..a7d46a2412b6cd
--- /dev/null
+++ b/metadata-ingestion/tests/integration/bigquery_v2/bigquery_lineage_usage_golden.json
@@ -0,0 +1,502 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1643871600000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1643871600000,
+                        "actor": "urn:li:corpuser:foo"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:176428c30cc3197730c20f6d0161efe869a0a041876d23c044aa2cd60d4c7a12"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1643846400000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 1,
+            "totalSqlQueries": 4,
+            "topSqlQueries": [
+                "create view `bigquery-dataset-1`.`view-1` as select * from `bigquery-dataset-1`.`table-1`",
+                "select * from `bigquery-dataset-1`.`table-1`"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:foo",
+                    "count": 4
+                }
+            ],
+            "fieldCounts": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:176428c30cc3197730c20f6d0161efe869a0a041876d23c044aa2cd60d4c7a12",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "create view `bigquery-dataset-1`.`view-1` as select * from `bigquery-dataset-1`.`table-1`",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1643871600000,
+                "actor": "urn:li:corpuser:foo"
+            },
+            "lastModified": {
+                "time": 1643871600000,
+                "actor": "urn:li:corpuser:foo"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:176428c30cc3197730c20f6d0161efe869a0a041876d23c044aa2cd60d4c7a12",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1643846400000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 2,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:foo",
+                    "count": 2
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:176428c30cc3197730c20f6d0161efe869a0a041876d23c044aa2cd60d4c7a12",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1643846400000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 1,
+            "totalSqlQueries": 4,
+            "topSqlQueries": [
+                "select * from `bigquery-dataset-1`.`view-1`\nLIMIT 100\n-- {\"user\":\"@bar\",\"email\":\"bar@xyz.com\",\"url\":\"https://modeanalytics.com/acryltest/reports/6234ff78bc7d/runs/662b21949629/queries/f0aad24d5b37\",\"scheduled\":false}\n"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:bar",
+                    "count": 4
+                }
+            ],
+            "fieldCounts": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:176428c30cc3197730c20f6d0161efe869a0a041876d23c044aa2cd60d4c7a12",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:23f1935934face229de381fad193e390153180bf1e7afaa6db58e91fc28d0021",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select * from `bigquery-dataset-1`.`table-1`",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1643871600000,
+                "actor": "urn:li:corpuser:foo"
+            },
+            "lastModified": {
+                "time": 1643871600000,
+                "actor": "urn:li:corpuser:foo"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:176428c30cc3197730c20f6d0161efe869a0a041876d23c044aa2cd60d4c7a12",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:23f1935934face229de381fad193e390153180bf1e7afaa6db58e91fc28d0021",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:23f1935934face229de381fad193e390153180bf1e7afaa6db58e91fc28d0021",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1643846400000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 2,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:foo",
+                    "count": 2
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:5c0fb184e7b94a6e8203b8c9772f7296ced18d89a38e487247c45751122e3199",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select * from `bigquery-dataset-1`.`view-1`\nLIMIT 100\n-- {\"user\":\"@bar\",\"email\":\"bar@xyz.com\",\"url\":\"https://modeanalytics.com/acryltest/reports/6234ff78bc7d/runs/662b21949629/queries/f0aad24d5b37\",\"scheduled\":false}\n",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1643871600000,
+                "actor": "urn:li:corpuser:bar"
+            },
+            "lastModified": {
+                "time": 1643871600000,
+                "actor": "urn:li:corpuser:bar"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:23f1935934face229de381fad193e390153180bf1e7afaa6db58e91fc28d0021",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:5c0fb184e7b94a6e8203b8c9772f7296ced18d89a38e487247c45751122e3199",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:5c0fb184e7b94a6e8203b8c9772f7296ced18d89a38e487247c45751122e3199",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:5c0fb184e7b94a6e8203b8c9772f7296ced18d89a38e487247c45751122e3199",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1643846400000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 4,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:bar",
+                    "count": 4
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1643871600000,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:foo",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:176428c30cc3197730c20f6d0161efe869a0a041876d23c044aa2cd60d4c7a12"
+            },
+            "lastUpdatedTimestamp": 1643871600000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:23f1935934face229de381fad193e390153180bf1e7afaa6db58e91fc28d0021",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:5c0fb184e7b94a6e8203b8c9772f7296ced18d89a38e487247c45751122e3199",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/bigquery_v2/bigquery_mcp_golden.json b/metadata-ingestion/tests/integration/bigquery_v2/bigquery_mcp_golden.json
index e7b2a7c4a9f4bb..bc9d734218903d 100644
--- a/metadata-ingestion/tests/integration/bigquery_v2/bigquery_mcp_golden.json
+++ b/metadata-ingestion/tests/integration/bigquery_v2/bigquery_mcp_golden.json
@@ -401,6 +401,145 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "project-id-1.bigquery-dataset-1.view-1",
+            "platform": "urn:li:dataPlatform:bigquery",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "age",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "INT",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": [
+                            {
+                                "tag": "urn:li:tag:Test Policy Tag"
+                            }
+                        ]
+                    },
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "email",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "STRING",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": []
+                    },
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "externalUrl": "https://console.cloud.google.com/bigquery?project=project-id-1&ws=!1m5!1m4!4m3!1sproject-id-1!2sbigquery-dataset-1!3sview-1",
+            "name": "view-1",
+            "qualifiedName": "project-id-1.bigquery-dataset-1.view-1",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "glossaryTerm",
     "entityUrn": "urn:li:glossaryTerm:Age",
@@ -417,6 +556,175 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "project-id-1.bigquery-dataset-1.snapshot-table-1",
+            "platform": "urn:li:dataPlatform:bigquery",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "age",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "INT",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": [
+                            {
+                                "tag": "urn:li:tag:Test Policy Tag"
+                            }
+                        ]
+                    },
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "email",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "STRING",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": []
+                    },
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "externalUrl": "https://console.cloud.google.com/bigquery?project=project-id-1&ws=!1m5!1m4!4m3!1sproject-id-1!2sbigquery-dataset-1!3ssnapshot-table-1",
+            "name": "snapshot-table-1",
+            "qualifiedName": "project-id-1.bigquery-dataset-1.snapshot-table-1",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:bigquery,project-id-1)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "create view `bigquery-dataset-1.view-1` as select email from `bigquery-dataset-1.table-1`",
+            "viewLanguage": "SQL"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+                    "urn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3"
+                },
+                {
+                    "id": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+                    "urn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "glossaryTerm",
     "entityUrn": "urn:li:glossaryTerm:Email_Address",
@@ -433,6 +741,57 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Bigquery Table Snapshot"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:bigquery,project-id-1)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "tag",
     "entityUrn": "urn:li:tag:Test Policy Tag",
@@ -448,5 +807,216 @@
         "runId": "bigquery-2022_02_03-07_00_00",
         "lastRunId": "no-run-id-provided"
     }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "CREATE VIEW `bigquery-dataset-1.view-1` AS\nSELECT\n  email\nFROM `bigquery-dataset-1.table-1`",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1643871600000,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+                    "urn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3"
+                },
+                {
+                    "id": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+                    "urn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD),email)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD),email)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1643871600000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+                    "type": "COPY"
+                }
+            ],
+            "fineGrainedLineages": [
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD),age)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD),age)"
+                    ],
+                    "confidenceScore": 1.0
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD),email)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD),email)"
+                    ],
+                    "confidenceScore": 1.0
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1643871600000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+                    "type": "VIEW",
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29"
+                }
+            ],
+            "fineGrainedLineages": [
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD),email)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD),email)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/bigquery_v2/bigquery_project_label_mcp_golden.json b/metadata-ingestion/tests/integration/bigquery_v2/bigquery_project_label_mcp_golden.json
new file mode 100644
index 00000000000000..a529ddc6221a7a
--- /dev/null
+++ b/metadata-ingestion/tests/integration/bigquery_v2/bigquery_project_label_mcp_golden.json
@@ -0,0 +1,452 @@
+[
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f284164f9a7db03ca6bbdb7bb17d5a7e",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "bigquery",
+                "env": "PROD",
+                "project_id": "dev"
+            },
+            "name": "dev"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f284164f9a7db03ca6bbdb7bb17d5a7e",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f284164f9a7db03ca6bbdb7bb17d5a7e",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f284164f9a7db03ca6bbdb7bb17d5a7e",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Project"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f284164f9a7db03ca6bbdb7bb17d5a7e",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ce17940c2d64e7e315e68f8d7d071b1e",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "bigquery",
+                "env": "PROD",
+                "project_id": "dev",
+                "dataset_id": "bigquery-dataset-1"
+            },
+            "externalUrl": "https://console.cloud.google.com/bigquery?project=dev&ws=!1m4!1m3!3m2!1sdev!2sbigquery-dataset-1",
+            "name": "bigquery-dataset-1"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ce17940c2d64e7e315e68f8d7d071b1e",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ce17940c2d64e7e315e68f8d7d071b1e",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ce17940c2d64e7e315e68f8d7d071b1e",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Dataset"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ce17940c2d64e7e315e68f8d7d071b1e",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f284164f9a7db03ca6bbdb7bb17d5a7e"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ce17940c2d64e7e315e68f8d7d071b1e",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:f284164f9a7db03ca6bbdb7bb17d5a7e",
+                    "urn": "urn:li:container:f284164f9a7db03ca6bbdb7bb17d5a7e"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,dev.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,dev.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "dev.bigquery-dataset-1.table-1",
+            "platform": "urn:li:dataPlatform:bigquery",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "age",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "INT",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": [
+                            {
+                                "tag": "urn:li:tag:Test Policy Tag"
+                            }
+                        ]
+                    },
+                    "glossaryTerms": {
+                        "terms": [
+                            {
+                                "urn": "urn:li:glossaryTerm:Age"
+                            }
+                        ],
+                        "auditStamp": {
+                            "time": 1643871600000,
+                            "actor": "urn:li:corpuser:datahub"
+                        }
+                    },
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "email",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "STRING",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": []
+                    },
+                    "glossaryTerms": {
+                        "terms": [
+                            {
+                                "urn": "urn:li:glossaryTerm:Email_Address"
+                            }
+                        ],
+                        "auditStamp": {
+                            "time": 1643871600000,
+                            "actor": "urn:li:corpuser:datahub"
+                        }
+                    },
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,dev.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "externalUrl": "https://console.cloud.google.com/bigquery?project=dev&ws=!1m5!1m4!4m3!1sdev!2sbigquery-dataset-1!3stable-1",
+            "name": "table-1",
+            "qualifiedName": "dev.bigquery-dataset-1.table-1",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,dev.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:ce17940c2d64e7e315e68f8d7d071b1e"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,dev.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:bigquery,dev)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,dev.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,dev.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:f284164f9a7db03ca6bbdb7bb17d5a7e",
+                    "urn": "urn:li:container:f284164f9a7db03ca6bbdb7bb17d5a7e"
+                },
+                {
+                    "id": "urn:li:container:ce17940c2d64e7e315e68f8d7d071b1e",
+                    "urn": "urn:li:container:ce17940c2d64e7e315e68f8d7d071b1e"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "glossaryTerm",
+    "entityUrn": "urn:li:glossaryTerm:Age",
+    "changeType": "UPSERT",
+    "aspectName": "glossaryTermKey",
+    "aspect": {
+        "json": {
+            "name": "Age"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "glossaryTerm",
+    "entityUrn": "urn:li:glossaryTerm:Email_Address",
+    "changeType": "UPSERT",
+    "aspectName": "glossaryTermKey",
+    "aspect": {
+        "json": {
+            "name": "Email_Address"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:Test Policy Tag",
+    "changeType": "UPSERT",
+    "aspectName": "tagKey",
+    "aspect": {
+        "json": {
+            "name": "Test Policy Tag"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/bigquery_v2/bigquery_queries_mcps_golden.json b/metadata-ingestion/tests/integration/bigquery_v2/bigquery_queries_mcps_golden.json
new file mode 100644
index 00000000000000..a2d21b84f19e8c
--- /dev/null
+++ b/metadata-ingestion/tests/integration/bigquery_v2/bigquery_queries_mcps_golden.json
@@ -0,0 +1,12592 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.derived_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322481569,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.base_table_2,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:88c4674d369ef49e881a5ea67ed3485e48f09b9a4924d5282c3ae25004737f95"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:88c4674d369ef49e881a5ea67ed3485e48f09b9a4924d5282c3ae25004737f95",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace table `gcp-staging-2.smoke_test_db_3.derived_table` as (select * from `gcp-staging-2.smoke_test_db_3.base_table_2`);\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549585813,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549585813,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178195,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_base,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322460257,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:8f7bb4efb71d494b2bfe115937d6022db0ab9e6ea3d293839a457480e75430e1"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:88c4674d369ef49e881a5ea67ed3485e48f09b9a4924d5282c3ae25004737f95",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178196,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:88c4674d369ef49e881a5ea67ed3485e48f09b9a4924d5282c3ae25004737f95",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:88c4674d369ef49e881a5ea67ed3485e48f09b9a4924d5282c3ae25004737f95",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.base_table_2,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.derived_table,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178196,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:630f9169072a11dfd8d08a44479f2466acdf2dc2b078b946a739db437b74ad1d",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498949,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_tmp_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322457731,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:composite_0db44e02f671b69df68565346e9d2b68c7166fccf75bd494f34560bfa16c381b"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:composite_0db44e02f671b69df68565346e9d2b68c7166fccf75bd494f34560bfa16c381b",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "create or replace table _smoke_test_db_tmp_tables.tmp_table as (select * from smoke_test_db.base_table);\n\ncreate or replace table smoke_test_db.lineage_from_tmp_table as (select * from _smoke_test_db_tmp_tables.tmp_table)",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549567376,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549567376,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997222,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6e250c6966754a5e6532fbb444172dacf5813b0b7afceefbf7772a29878f48f8",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6e250c6966754a5e6532fbb444172dacf5813b0b7afceefbf7772a29878f48f8",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace table `gcp-staging-2.smoke_test_db_4.derived_table_from_external_table` as (select * from `gcp-staging-2.smoke_test_db_4.external_table_us_states`);\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549602653,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549602653,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178198,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_external_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322505477,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.external_table_us_states,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:6e250c6966754a5e6532fbb444172dacf5813b0b7afceefbf7772a29878f48f8"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6e250c6966754a5e6532fbb444172dacf5813b0b7afceefbf7772a29878f48f8",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178200,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6e250c6966754a5e6532fbb444172dacf5813b0b7afceefbf7772a29878f48f8",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.external_table_us_states,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_external_table,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178199,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_timetravelled_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322508214,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:2fa44cc9d306c7523477fad59ff43e2e580081ee770da69b9b9f66e119b4dcab"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:49b267d0cd050c6a45b4d26bcdc6d9ddceb51aa7ed29399c52ef967e8da2b58d",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:composite_0db44e02f671b69df68565346e9d2b68c7166fccf75bd494f34560bfa16c381b",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_tmp_table,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997223,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.materialized_view_from_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322475572,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:e1769381f2d261efecb105f3ab6fc8a2fc6717a1509cc65ba125c03841b0923d"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_sharded_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322500148,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:49b267d0cd050c6a45b4d26bcdc6d9ddceb51aa7ed29399c52ef967e8da2b58d"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:composite_0db44e02f671b69df68565346e9d2b68c7166fccf75bd494f34560bfa16c381b",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997223,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:2fa44cc9d306c7523477fad59ff43e2e580081ee770da69b9b9f66e119b4dcab",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:630f9169072a11dfd8d08a44479f2466acdf2dc2b078b946a739db437b74ad1d",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace view smoke_test_db.view_from_view_on_table\n            as (select * from smoke_test_db.view_from_table)\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549572202,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549572202,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498921,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:49b267d0cd050c6a45b4d26bcdc6d9ddceb51aa7ed29399c52ef967e8da2b58d",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace table `gcp-staging-2.smoke_test_db_4.derived_table_from_sharded_table` as (select * from `gcp-staging-2.smoke_test_db_4.sharded_table1_20230101`);\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549598252,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549598252,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178202,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:630f9169072a11dfd8d08a44479f2466acdf2dc2b078b946a739db437b74ad1d",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498922,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.destination_table_of_select_query,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322510656,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:44c19e1fccfa56779f6958f62d3476819b48af701bbee43ccecf5c9e04d63fc4"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:44c19e1fccfa56779f6958f62d3476819b48af701bbee43ccecf5c9e04d63fc4",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "CREATE TABLE `gcp-staging-2.smoke_test_db_4.destination_table_of_select_query` AS\n                (\n                    SELECT * FROM `gcp-staging.smoke_test_db.base_table`\n                )",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322510656,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322510656,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:44c19e1fccfa56779f6958f62d3476819b48af701bbee43ccecf5c9e04d63fc4",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.destination_table_of_select_query,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6684f16158660588d874f7ac46dbd7e56ad42acfb95b8a3d1f01292de8dcb930",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:44c19e1fccfa56779f6958f62d3476819b48af701bbee43ccecf5c9e04d63fc4",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:49b267d0cd050c6a45b4d26bcdc6d9ddceb51aa7ed29399c52ef967e8da2b58d",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178203,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:49b267d0cd050c6a45b4d26bcdc6d9ddceb51aa7ed29399c52ef967e8da2b58d",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_sharded_table,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178203,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:630f9169072a11dfd8d08a44479f2466acdf2dc2b078b946a739db437b74ad1d",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_view_on_table,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498922,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:44c19e1fccfa56779f6958f62d3476819b48af701bbee43ccecf5c9e04d63fc4",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b9c1cbdddc1018284bdfb113865f5dc95b5c5a106c8e1dad1297bc9ef70debf1",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498952,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322465459,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:b66112fa9691aa02354115b5cef8356390b524fa67c6b06e018c362ac8d0b31d"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b9c1cbdddc1018284bdfb113865f5dc95b5c5a106c8e1dad1297bc9ef70debf1",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace table smoke_test_db_2.table_from_other_db\n            as (select * from smoke_test_db.base_table)\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549574990,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549574990,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498946,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:2fa44cc9d306c7523477fad59ff43e2e580081ee770da69b9b9f66e119b4dcab",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace table `gcp-staging-2.smoke_test_db_4.derived_table_from_timetravelled_table` as (\n                    SELECT *\n                    FROM `gcp-staging.smoke_test_db.base_table`\n                    FOR SYSTEM_TIME AS OF TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 1 HOUR)\n            );\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549605511,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549605511,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178206,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bb1e3c0fd1f6a26c2645cf4ba088a22ff346a9e323c6be451459ecfa7329a991",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace view smoke_test_db.view_from_multiple_tables\n            as \n            (\n                select a.date_utc, a.revenue, b.revenue as revenue2, c.revenue as revenue3 \n                from \n                    smoke_test_db.base_table a\n                left join \n                    smoke_test_db.lineage_from_base b \n                    on a.date_utc = b.date_utc \n                left join \n                    smoke_test_db_2.table_from_other_db c \n                    on b.date_utc = c.date_utc \n            );\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549588112,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549588112,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498924,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a049f27174fa88a7a7b1b7d5f60d2c353f3e9dd3d4994a8e35c91adb986eac4d",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace table `gcp-staging-2.smoke_test_db_4.sharded_table1_20230201` OPTIONS(description=\"Description of sharded table ending with _yyyyMMdd\") as (select * from `gcp-staging.smoke_test_db_2.table_from_other_db`);\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549591093,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549591093,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178217,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a049f27174fa88a7a7b1b7d5f60d2c353f3e9dd3d4994a8e35c91adb986eac4d",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:2fa44cc9d306c7523477fad59ff43e2e580081ee770da69b9b9f66e119b4dcab",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178207,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a049f27174fa88a7a7b1b7d5f60d2c353f3e9dd3d4994a8e35c91adb986eac4d",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178218,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a049f27174fa88a7a7b1b7d5f60d2c353f3e9dd3d4994a8e35c91adb986eac4d",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178217,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:8f7bb4efb71d494b2bfe115937d6022db0ab9e6ea3d293839a457480e75430e1",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322485618,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:a049f27174fa88a7a7b1b7d5f60d2c353f3e9dd3d4994a8e35c91adb986eac4d"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:2fa44cc9d306c7523477fad59ff43e2e580081ee770da69b9b9f66e119b4dcab",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_timetravelled_table,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178207,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6684f16158660588d874f7ac46dbd7e56ad42acfb95b8a3d1f01292de8dcb930",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace table `gcp-staging-2.smoke_test_db_4.derived_table_from_wildcard_table` as (select * from `gcp-staging-2.smoke_test_db_4.sharded_table1_*`);\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549600590,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549600590,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178211,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bb1e3c0fd1f6a26c2645cf4ba088a22ff346a9e323c6be451459ecfa7329a991",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD),date_utc)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_base,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_base,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD),date_utc)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD),revenue2)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD),revenue3)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498924,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6684f16158660588d874f7ac46dbd7e56ad42acfb95b8a3d1f01292de8dcb930",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178212,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:5efacf0ddad8fd852ba394b29e7a4654ea454915930fb8dd4882c6f294b95cf8",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace table `gcp-staging.smoke_test_db.table_from_another_project` as (select * from `gcp-staging-2.smoke_test_db_3.base_table_2`);\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549583501,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549583501,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178230,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6684f16158660588d874f7ac46dbd7e56ad42acfb95b8a3d1f01292de8dcb930",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_wildcard_table,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178211,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:5efacf0ddad8fd852ba394b29e7a4654ea454915930fb8dd4882c6f294b95cf8",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178231,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e1769381f2d261efecb105f3ab6fc8a2fc6717a1509cc65ba125c03841b0923d",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:5efacf0ddad8fd852ba394b29e7a4654ea454915930fb8dd4882c6f294b95cf8",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:5efacf0ddad8fd852ba394b29e7a4654ea454915930fb8dd4882c6f294b95cf8",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.base_table_2,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_another_project,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178231,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b9c1cbdddc1018284bdfb113865f5dc95b5c5a106c8e1dad1297bc9ef70debf1",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498946,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_wildcard_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322502689,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:6684f16158660588d874f7ac46dbd7e56ad42acfb95b8a3d1f01292de8dcb930"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bb1e3c0fd1f6a26c2645cf4ba088a22ff346a9e323c6be451459ecfa7329a991",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498924,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view_and_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322472836,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:a4d62b3996203c5661d02d28c1908d209a56e9966cefc274600a76335bc75de0"
+                },
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322472836,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:a4d62b3996203c5661d02d28c1908d209a56e9966cefc274600a76335bc75de0"
+                }
+            ],
+            "fineGrainedLineages": [
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD),date_utc)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view_and_table,PROD),date_utc)"
+                    ],
+                    "confidenceScore": 0.2,
+                    "query": "urn:li:query:a4d62b3996203c5661d02d28c1908d209a56e9966cefc274600a76335bc75de0"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD),revenue)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view_and_table,PROD),revenue)"
+                    ],
+                    "confidenceScore": 0.2,
+                    "query": "urn:li:query:a4d62b3996203c5661d02d28c1908d209a56e9966cefc274600a76335bc75de0"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b9c1cbdddc1018284bdfb113865f5dc95b5c5a106c8e1dad1297bc9ef70debf1",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498946,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322484293,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:bb1e3c0fd1f6a26c2645cf4ba088a22ff346a9e323c6be451459ecfa7329a991"
+                },
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322484293,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_base,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:bb1e3c0fd1f6a26c2645cf4ba088a22ff346a9e323c6be451459ecfa7329a991"
+                },
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322484293,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:bb1e3c0fd1f6a26c2645cf4ba088a22ff346a9e323c6be451459ecfa7329a991"
+                }
+            ],
+            "fineGrainedLineages": [
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD),date_utc)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD),date_utc)"
+                    ],
+                    "confidenceScore": 0.2,
+                    "query": "urn:li:query:bb1e3c0fd1f6a26c2645cf4ba088a22ff346a9e323c6be451459ecfa7329a991"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD),revenue)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD),revenue)"
+                    ],
+                    "confidenceScore": 0.2,
+                    "query": "urn:li:query:bb1e3c0fd1f6a26c2645cf4ba088a22ff346a9e323c6be451459ecfa7329a991"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_base,PROD),revenue)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD),revenue2)"
+                    ],
+                    "confidenceScore": 0.2,
+                    "query": "urn:li:query:bb1e3c0fd1f6a26c2645cf4ba088a22ff346a9e323c6be451459ecfa7329a991"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD),revenue)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD),revenue3)"
+                    ],
+                    "confidenceScore": 0.2,
+                    "query": "urn:li:query:bb1e3c0fd1f6a26c2645cf4ba088a22ff346a9e323c6be451459ecfa7329a991"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:005ef53d98fe9ce2d807a16f00695367e6923b11729f2fba0db3e694bd2fe9c9",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            insert into smoke_test_db.usage_test values\n              (\"2022-05-01\", \"seven\", 7),\n              (\"2022-05-02\", \"ten\", 10),\n              (\"2022-06-01\", \"four\", 4)\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549557813,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549557813,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498926,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:005ef53d98fe9ce2d807a16f00695367e6923b11729f2fba0db3e694bd2fe9c9",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498927,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_snapshot_on_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322471500,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.snapshot_from_table,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:dc49a3d580b4df6c8d24961c39a18b3569d8e58783fe9895324876da32d98d1e"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b66112fa9691aa02354115b5cef8356390b524fa67c6b06e018c362ac8d0b31d",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:dc49a3d580b4df6c8d24961c39a18b3569d8e58783fe9895324876da32d98d1e",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498953,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_another_project,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322478955,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.base_table_2,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:5efacf0ddad8fd852ba394b29e7a4654ea454915930fb8dd4882c6f294b95cf8"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:005ef53d98fe9ce2d807a16f00695367e6923b11729f2fba0db3e694bd2fe9c9",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498927,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:dc49a3d580b4df6c8d24961c39a18b3569d8e58783fe9895324876da32d98d1e",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace view smoke_test_db.view_from_snapshot_on_table\n            as (select * from smoke_test_db.snapshot_from_table)\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549577574,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549577574,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498924,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322462741,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:bb3d7f6685e1f71868d0821451e52bfcf1a3bdfeb34c739c0305386256c38f9b"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_view_on_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322464098,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:630f9169072a11dfd8d08a44479f2466acdf2dc2b078b946a739db437b74ad1d"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:dc49a3d580b4df6c8d24961c39a18b3569d8e58783fe9895324876da32d98d1e",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498925,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:dc49a3d580b4df6c8d24961c39a18b3569d8e58783fe9895324876da32d98d1e",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.snapshot_from_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_snapshot_on_table,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498925,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a4d62b3996203c5661d02d28c1908d209a56e9966cefc274600a76335bc75de0",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1724050800000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 1724322467835,
+                        "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:b9c1cbdddc1018284bdfb113865f5dc95b5c5a106c8e1dad1297bc9ef70debf1"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bb1e3c0fd1f6a26c2645cf4ba088a22ff346a9e323c6be451459ecfa7329a991",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.snapshot_from_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 1,
+            "totalSqlQueries": 1,
+            "topSqlQueries": [
+                "\n            create or replace view smoke_test_db.view_from_snapshot_on_table\n            as (select * from smoke_test_db.snapshot_from_table)\n        "
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997260,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bb3d7f6685e1f71868d0821451e52bfcf1a3bdfeb34c739c0305386256c38f9b",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace view smoke_test_db.view_from_table\n            as (select * from smoke_test_db.base_table)\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549571609,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549571609,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498930,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_base,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 3,
+            "topSqlQueries": [
+                "select revenue, date_utc from gcp-staging.smoke_test_db.lineage_from_base",
+                "select revenue from gcp-staging.smoke_test_db.lineage_from_base",
+                "\n            create or replace view smoke_test_db.view_from_multiple_tables\n            as \n            (\n                select a.date_utc, a.revenue, b.revenue as revenue2, c.revenue as revenue3 \n                from \n                    smoke_test_db.base_table a\n                left join \n                    smoke_test_db.lineage_from_base b \n                    on a.date_utc = b.date_utc \n                left join \n                    smoke_test_db_2.table_from_other_db c \n                    on b.date_utc = c.date_utc \n            );\n        "
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 2
+                },
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "revenue",
+                    "count": 3
+                },
+                {
+                    "fieldPath": "date_utc",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178262,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bb3d7f6685e1f71868d0821451e52bfcf1a3bdfeb34c739c0305386256c38f9b",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498930,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 13,
+            "topSqlQueries": [
+                "create or replace table smoke_test_db.lineage_from_base as (select * from smoke_test_db.base_table)",
+                "\n            create or replace table smoke_test_db_2.table_from_other_db\n            as (select * from smoke_test_db.base_table)\n        ",
+                "\n            create or replace table smoke_test_db.table_from_view_and_table\n            as (select b.date_utc, v.revenue from smoke_test_db.base_table b, smoke_test_db.view_from_table v)\n        ",
+                "\n            create or replace table `gcp-staging-2.smoke_test_db_4.derived_table_from_timetravelled_table` as (\n                    SELECT *\n                    FROM `gcp-staging.smoke_test_db.base_table`\n                    FOR SYSTEM_TIME AS OF TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 1 HOUR)\n            );\n        ",
+                "select revenue, date_utc from gcp-staging.smoke_test_db.base_table",
+                "\n            create or replace view smoke_test_db.view_from_table\n            as (select * from smoke_test_db.base_table)\n        ",
+                "create or replace table _smoke_test_db_tmp_tables.tmp_table as (select * from smoke_test_db.base_table)",
+                "select revenue from gcp-staging.smoke_test_db.base_table FOR SYSTEM_TIME AS OF TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 1 HOUR)",
+                "select revenue from gcp-staging.smoke_test_db.base_table",
+                "\n            create or replace view smoke_test_db.view_from_multiple_tables\n            as \n            (\n                select a.date_utc, a.revenue, b.revenue as revenue2, c.revenue as revenue3 \n                from \n                    smoke_test_db.base_table a\n                left join \n                    smoke_test_db.lineage_from_base b \n                    on a.date_utc = b.date_utc \n                left join \n                    smoke_test_db_2.table_from_other_db c \n                    on b.date_utc = c.date_utc \n            );\n        ",
+                "create MATERIALIZED VIEW smoke_test_db.materialized_view_from_table as (select * from smoke_test_db.base_table where revenue>100)",
+                "CREATE TABLE `gcp-staging-2.smoke_test_db_4.destination_table_of_select_query` AS\n                (\n                    SELECT * FROM `gcp-staging.smoke_test_db.base_table`\n                )",
+                "select revenue, date_utc from gcp-staging.smoke_test_db.base_table FOR SYSTEM_TIME AS OF TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 1 HOUR)"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 11
+                },
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 2
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "revenue",
+                    "count": 5
+                },
+                {
+                    "fieldPath": "date_utc",
+                    "count": 4
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bb3d7f6685e1f71868d0821451e52bfcf1a3bdfeb34c739c0305386256c38f9b",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 5,
+            "topSqlQueries": [
+                "\n            create or replace table `gcp-staging-2.smoke_test_db_4.sharded_table1_20230101` OPTIONS(description=\"Description of sharded table ending with _yyyyMMdd\") as (select * from `gcp-staging.smoke_test_db_2.table_from_other_db`) ;\n        ",
+                "select revenue from gcp-staging.smoke_test_db_2.table_from_other_db",
+                "\n            create or replace table `gcp-staging-2.smoke_test_db_4.sharded_table1_20230201` OPTIONS(description=\"Description of sharded table ending with _yyyyMMdd\") as (select * from `gcp-staging.smoke_test_db_2.table_from_other_db`);\n        ",
+                "\n            create or replace view smoke_test_db.view_from_multiple_tables\n            as \n            (\n                select a.date_utc, a.revenue, b.revenue as revenue2, c.revenue as revenue3 \n                from \n                    smoke_test_db.base_table a\n                left join \n                    smoke_test_db.lineage_from_base b \n                    on a.date_utc = b.date_utc \n                left join \n                    smoke_test_db_2.table_from_other_db c \n                    on b.date_utc = c.date_utc \n            );\n        ",
+                "select revenue, date_utc from gcp-staging.smoke_test_db_2.table_from_other_db"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 4
+                },
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "revenue",
+                    "count": 3
+                },
+                {
+                    "fieldPath": "date_utc",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178265,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 5,
+            "topSqlQueries": [
+                "select revenue from gcp-staging.smoke_test_db.view_from_table",
+                "\n            create or replace table smoke_test_db.table_from_view_and_table\n            as (select b.date_utc, v.revenue from smoke_test_db.base_table b, smoke_test_db.view_from_table v)\n        ",
+                "\n            create or replace table smoke_test_db.table_from_view\n            as (select * from smoke_test_db.view_from_table)\n        ",
+                "\n            create or replace view smoke_test_db.view_from_view_on_table\n            as (select * from smoke_test_db.view_from_table)\n        ",
+                "select revenue, date_utc from gcp-staging.smoke_test_db.view_from_table"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 4
+                },
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "revenue",
+                    "count": 3
+                },
+                {
+                    "fieldPath": "date_utc",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178260,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:4f5fd82d4808115ef07900a543b7d6e3551899815d11a945870c607d2dbda56e",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "insert into smoke_test_db.partition_test values (\"2022-05-24\", 20), (\"2022-06-24\", 30)",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549560560,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549560560,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498928,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:dc49a3d580b4df6c8d24961c39a18b3569d8e58783fe9895324876da32d98d1e",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bb3d7f6685e1f71868d0821451e52bfcf1a3bdfeb34c739c0305386256c38f9b",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498930,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:4f5fd82d4808115ef07900a543b7d6e3551899815d11a945870c607d2dbda56e",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498928,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:4f5fd82d4808115ef07900a543b7d6e3551899815d11a945870c607d2dbda56e",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498929,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:cb345cc231c81ec7b871d6727437a87b5bc18a95ecf37e857f07096254c2d2c1",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "create or replace table smoke_test_db.usage_test (date_utc date, key STRING, value INTEGER)",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549557257,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549557257,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498927,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:cb345cc231c81ec7b871d6727437a87b5bc18a95ecf37e857f07096254c2d2c1",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD),date_utc)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD),key)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD),value)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498927,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e1769381f2d261efecb105f3ab6fc8a2fc6717a1509cc65ba125c03841b0923d",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498953,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:cb345cc231c81ec7b871d6727437a87b5bc18a95ecf37e857f07096254c2d2c1",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498928,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997269,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "INSERT",
+            "customProperties": {
+                "query_urn": "urn:li:query:ebfe552aa0ddb538f3a6c4d444aff757e6df574f16a6dffc3ac146ce587fc491"
+            },
+            "lastUpdatedTimestamp": 1721549563403
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997270,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e1769381f2d261efecb105f3ab6fc8a2fc6717a1509cc65ba125c03841b0923d",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "create MATERIALIZED VIEW smoke_test_db.materialized_view_from_table as (select * from smoke_test_db.base_table where revenue>100)",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549581208,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549581208,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498938,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e1769381f2d261efecb105f3ab6fc8a2fc6717a1509cc65ba125c03841b0923d",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498938,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_snapshot_on_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997268,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:dc49a3d580b4df6c8d24961c39a18b3569d8e58783fe9895324876da32d98d1e"
+            },
+            "lastUpdatedTimestamp": 1721549577574
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997270,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:630f9169072a11dfd8d08a44479f2466acdf2dc2b078b946a739db437b74ad1d",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997271,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:53d20616e4dd30dfc16ccc5771998f5ed93c9afa9b846104a19d072ba364fb5c"
+            },
+            "lastUpdatedTimestamp": 1721549562792
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997273,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b9c1cbdddc1018284bdfb113865f5dc95b5c5a106c8e1dad1297bc9ef70debf1",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view_and_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997267,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:a4d62b3996203c5661d02d28c1908d209a56e9966cefc274600a76335bc75de0"
+            },
+            "lastUpdatedTimestamp": 1721549578210
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997269,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e1769381f2d261efecb105f3ab6fc8a2fc6717a1509cc65ba125c03841b0923d",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.materialized_view_from_table,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498938,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:4bd08adca1e16a1e10673f736ae2c91e0ee68fd56b187bd507f360e429dbcb8c",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498948,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:4bd08adca1e16a1e10673f736ae2c91e0ee68fd56b187bd507f360e429dbcb8c",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace table smoke_test_db.partition_test (date_utc date, revenue INTEGER) \n            PARTITION BY date_utc\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549559855,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549559855,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498929,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_tmp_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 2,
+            "topSqlQueries": [
+                "select revenue from gcp-staging.smoke_test_db.lineage_from_tmp_table",
+                "select revenue, date_utc from gcp-staging.smoke_test_db.lineage_from_tmp_table"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                },
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "revenue",
+                    "count": 2
+                },
+                {
+                    "fieldPath": "date_utc",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178256,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:4bd08adca1e16a1e10673f736ae2c91e0ee68fd56b187bd507f360e429dbcb8c",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498930,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 15,
+            "topSqlQueries": [
+                "\n    select revenue from gcp-staging.smoke_test_db.partition_test t\n    where cast(t.date_utc as DATE) < (select max(date_utc) from gcp-staging.smoke_test_db.partition_test)\n",
+                "\n    select extract(month from date_utc) month, count(*) count, sum(revenue) gross from gcp-staging.smoke_test_db.partition_test\n    group by month\n    order by gross\n",
+                "\n    select revenue from gcp-staging.smoke_test_db.partition_test t\n    where cast(t.date_utc as DATE) = (select max(date_utc) from gcp-staging.smoke_test_db.partition_test)\n",
+                "select revenue, date_utc from gcp-staging.smoke_test_db.partition_test",
+                "select revenue from gcp-staging.smoke_test_db.partition_test"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 11
+                },
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 4
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "revenue",
+                    "count": 15
+                },
+                {
+                    "fieldPath": "date_utc",
+                    "count": 6
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:4bd08adca1e16a1e10673f736ae2c91e0ee68fd56b187bd507f360e429dbcb8c",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD),date_utc)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498929,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997280,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:b9c1cbdddc1018284bdfb113865f5dc95b5c5a106c8e1dad1297bc9ef70debf1"
+            },
+            "lastUpdatedTimestamp": 1721549574990
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997281,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997278,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:bb1e3c0fd1f6a26c2645cf4ba088a22ff346a9e323c6be451459ecfa7329a991"
+            },
+            "lastUpdatedTimestamp": 1721549588112
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997280,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 2,
+            "topSqlQueries": [
+                "select revenue, date_utc from gcp-staging.smoke_test_db.table_from_view",
+                "select revenue from gcp-staging.smoke_test_db.table_from_view"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                },
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "revenue",
+                    "count": 2
+                },
+                {
+                    "fieldPath": "date_utc",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178259,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.materialized_view_from_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 2,
+            "topSqlQueries": [
+                "select revenue from gcp-staging.smoke_test_db.materialized_view_from_table",
+                "select revenue, date_utc from gcp-staging.smoke_test_db.materialized_view_from_table"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                },
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "revenue",
+                    "count": 2
+                },
+                {
+                    "fieldPath": "date_utc",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178271,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_integer_range_partition,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 1,
+            "totalSqlQueries": 1,
+            "topSqlQueries": [
+                "\n    SELECT\n        customer_id,\n        date1\n    FROM\n        `gcp-staging-2.smoke_test_db_4.table_with_integer_range_partition`\n    WHERE\n        customer_id=1\n"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "customer_id",
+                    "count": 1
+                },
+                {
+                    "fieldPath": "date1",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178264,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:2957e74d80b00aef4f3dc7b0b323d1fa863c78fd882d858186579c0737df00e2",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "create or replace table smoke_test_db.lineage_from_tmp_table as (select * from _smoke_test_db_tmp_tables.tmp_table)",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549567376,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549567376,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498932,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997276,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:bb3d7f6685e1f71868d0821451e52bfcf1a3bdfeb34c739c0305386256c38f9b"
+            },
+            "lastUpdatedTimestamp": 1721549571609
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997278,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:2957e74d80b00aef4f3dc7b0b323d1fa863c78fd882d858186579c0737df00e2",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging._smoke_test_db_tmp_tables.tmp_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_tmp_table,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498933,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:2957e74d80b00aef4f3dc7b0b323d1fa863c78fd882d858186579c0737df00e2",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498933,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_ingestion_time_partition,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 1,
+            "totalSqlQueries": 1,
+            "topSqlQueries": [
+                "\n    select \n        transaction_id \n    from \n        `gcp-staging-2.smoke_test_db_4.table_with_ingestion_time_partition` \n    where \n        _PARTITIONDATE = CURRENT_DATE()\n"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "transaction_id",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178275,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_base,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997286,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:8f7bb4efb71d494b2bfe115937d6022db0ab9e6ea3d293839a457480e75430e1"
+            },
+            "lastUpdatedTimestamp": 1721549569547
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997288,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.external_table_us_states,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 1,
+            "totalSqlQueries": 2,
+            "topSqlQueries": [
+                "\n    select name, post_abbr from `gcp-staging-2.smoke_test_db_4.external_table_us_states`\n",
+                "\n            create or replace table `gcp-staging-2.smoke_test_db_4.derived_table_from_external_table` as (select * from `gcp-staging-2.smoke_test_db_4.external_table_us_states`);\n        "
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 2
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "name",
+                    "count": 1
+                },
+                {
+                    "fieldPath": "post_abbr",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178259,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997288,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:4bd08adca1e16a1e10673f736ae2c91e0ee68fd56b187bd507f360e429dbcb8c"
+            },
+            "lastUpdatedTimestamp": 1721549559855
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997290,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 8,
+            "topSqlQueries": [
+                "select revenue from `gcp-staging-2.smoke_test_db_4.sharded_table1_*`",
+                "select revenue, date_utc from gcp-staging-2.smoke_test_db_4.sharded_table1_20230101",
+                "\n            create or replace table `gcp-staging-2.smoke_test_db_4.derived_table_from_sharded_table` as (select * from `gcp-staging-2.smoke_test_db_4.sharded_table1_20230101`);\n        ",
+                "\n            create or replace table `gcp-staging-2.smoke_test_db_4.derived_table_from_wildcard_table` as (select * from `gcp-staging-2.smoke_test_db_4.sharded_table1_*`);\n        ",
+                "select revenue, date_utc from `gcp-staging-2.smoke_test_db_4.sharded_table1_*`",
+                "select revenue from gcp-staging-2.smoke_test_db_4.sharded_table1_20230101",
+                "select revenue, date_utc from gcp-staging-2.smoke_test_db_4.sharded_table1_20230201",
+                "select revenue from gcp-staging-2.smoke_test_db_4.sharded_table1_20230201"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 5
+                },
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 3
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "revenue",
+                    "count": 6
+                },
+                {
+                    "fieldPath": "date_utc",
+                    "count": 3
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178267,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_another_project,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 2,
+            "topSqlQueries": [
+                "select revenue, date_utc from gcp-staging.smoke_test_db.table_from_another_project",
+                "select revenue from gcp-staging.smoke_test_db.table_from_another_project"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                },
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "revenue",
+                    "count": 2
+                },
+                {
+                    "fieldPath": "date_utc",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178269,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997291,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "INSERT",
+            "customProperties": {
+                "query_urn": "urn:li:query:4f5fd82d4808115ef07900a543b7d6e3551899815d11a945870c607d2dbda56e"
+            },
+            "lastUpdatedTimestamp": 1721549560560
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997293,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.base_table_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 4,
+            "topSqlQueries": [
+                "select revenue from gcp-staging-2.smoke_test_db_3.base_table_2",
+                "\n            create or replace table `gcp-staging.smoke_test_db.table_from_another_project` as (select * from `gcp-staging-2.smoke_test_db_3.base_table_2`);\n        ",
+                "select revenue, date_utc from gcp-staging-2.smoke_test_db_3.base_table_2",
+                "\n            create or replace table `gcp-staging-2.smoke_test_db_3.derived_table` as (select * from `gcp-staging-2.smoke_test_db_3.base_table_2`);\n        "
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 3
+                },
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "revenue",
+                    "count": 2
+                },
+                {
+                    "fieldPath": "date_utc",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178263,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:2d4a0fdd933c8f9009a21f00b3b0213b025d97ff5e6a39cd031e9d5e5c31f832",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.destination_table_of_select_query,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724050800000,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:44c19e1fccfa56779f6958f62d3476819b48af701bbee43ccecf5c9e04d63fc4"
+            },
+            "lastUpdatedTimestamp": 1724322510656
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_nested_fields,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 1,
+            "totalSqlQueries": 1,
+            "topSqlQueries": [
+                "\n    SELECT\n        first_name,\n        last_name,\n        dob,\n        addresses[offset(0)].address,\n        addresses[offset(0)].city\n    FROM        \n    gcp-staging-2.smoke_test_db_4.table_with_nested_fields\n"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "addresses",
+                    "count": 1
+                },
+                {
+                    "fieldPath": "dob",
+                    "count": 1
+                },
+                {
+                    "fieldPath": "first_name",
+                    "count": 1
+                },
+                {
+                    "fieldPath": "last_name",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178276,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:53d20616e4dd30dfc16ccc5771998f5ed93c9afa9b846104a19d072ba364fb5c",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "create or replace table smoke_test_db.base_table (date_utc timestamp, revenue INTEGER)",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549562792,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549562792,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498936,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:53d20616e4dd30dfc16ccc5771998f5ed93c9afa9b846104a19d072ba364fb5c",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD),date_utc)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498936,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997294,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:cb345cc231c81ec7b871d6727437a87b5bc18a95ecf37e857f07096254c2d2c1"
+            },
+            "lastUpdatedTimestamp": 1721549557257
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997295,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:4bd08adca1e16a1e10673f736ae2c91e0ee68fd56b187bd507f360e429dbcb8c",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 11,
+            "topSqlQueries": [
+                "select * from gcp-staging.smoke_test_db.usage_test",
+                "select value from gcp-staging.smoke_test_db.usage_test",
+                "select key from gcp-staging.smoke_test_db.usage_test",
+                "\n    select extract(month from date_utc) month, count(*) count, sum(value) total from gcp-staging.smoke_test_db.usage_test\n    group by month\n    order by total\n    "
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 8
+                },
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 3
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "value",
+                    "count": 4
+                },
+                {
+                    "fieldPath": "key",
+                    "count": 3
+                },
+                {
+                    "fieldPath": "date_utc",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b66112fa9691aa02354115b5cef8356390b524fa67c6b06e018c362ac8d0b31d",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace table smoke_test_db.table_from_view\n            as (select * from smoke_test_db.view_from_table)\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549572814,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549572814,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498942,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:4f5fd82d4808115ef07900a543b7d6e3551899815d11a945870c607d2dbda56e",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b66112fa9691aa02354115b5cef8356390b524fa67c6b06e018c362ac8d0b31d",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498942,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:420cad6350235517b34e6e376414d89be0734f87fba6789754be420051d4901c",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997296,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "INSERT",
+            "customProperties": {
+                "query_urn": "urn:li:query:005ef53d98fe9ce2d807a16f00695367e6923b11729f2fba0db3e694bd2fe9c9"
+            },
+            "lastUpdatedTimestamp": 1721549557813
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997298,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:53d20616e4dd30dfc16ccc5771998f5ed93c9afa9b846104a19d072ba364fb5c",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498937,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_view_on_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 2,
+            "topSqlQueries": [
+                "select revenue from gcp-staging.smoke_test_db.view_from_view_on_table",
+                "select revenue, date_utc from gcp-staging.smoke_test_db.view_from_view_on_table"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                },
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "revenue",
+                    "count": 2
+                },
+                {
+                    "fieldPath": "date_utc",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178272,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b66112fa9691aa02354115b5cef8356390b524fa67c6b06e018c362ac8d0b31d",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498942,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:cb345cc231c81ec7b871d6727437a87b5bc18a95ecf37e857f07096254c2d2c1",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498953,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ebfe552aa0ddb538f3a6c4d444aff757e6df574f16a6dffc3ac146ce587fc491",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498953,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ebfe552aa0ddb538f3a6c4d444aff757e6df574f16a6dffc3ac146ce587fc491",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "insert into smoke_test_db.base_table values (CURRENT_TIMESTAMP(), 100), (TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 1 HOUR), 110)",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549563403,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549563403,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498935,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ebfe552aa0ddb538f3a6c4d444aff757e6df574f16a6dffc3ac146ce587fc491",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498936,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 2,
+            "topSqlQueries": [
+                "select revenue, date_utc from gcp-staging.smoke_test_db.view_from_multiple_tables",
+                "select revenue from gcp-staging.smoke_test_db.view_from_multiple_tables"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                },
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "revenue",
+                    "count": 2
+                },
+                {
+                    "fieldPath": "date_utc",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178268,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ebfe552aa0ddb538f3a6c4d444aff757e6df574f16a6dffc3ac146ce587fc491",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498935,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.customer_demo.purchase_event,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 1,
+            "totalSqlQueries": 79,
+            "topSqlQueries": [
+                "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+                "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+                "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+                "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE quantity < 0\n        ",
+                "SELECT\n  (SUM(CASE WHEN amount BETWEEN 0 AND 10 THEN 1 ELSE 0 END) * 100.0) / COUNT(*) AS percentage_in_range\nFROM\n  gcp-staging.customer_demo.purchase_event;"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 79
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "amount",
+                    "count": 24
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a4d62b3996203c5661d02d28c1908d209a56e9966cefc274600a76335bc75de0",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498951,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_tmp_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997307,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:2957e74d80b00aef4f3dc7b0b323d1fa863c78fd882d858186579c0737df00e2"
+            },
+            "lastUpdatedTimestamp": 1721549567376
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997309,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a4d62b3996203c5661d02d28c1908d209a56e9966cefc274600a76335bc75de0",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace table smoke_test_db.table_from_view_and_table\n            as (select b.date_utc, v.revenue from smoke_test_db.base_table b, smoke_test_db.view_from_table v)\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549578210,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549578210,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498947,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a4d62b3996203c5661d02d28c1908d209a56e9966cefc274600a76335bc75de0",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498947,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:cb345cc231c81ec7b871d6727437a87b5bc18a95ecf37e857f07096254c2d2c1",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.materialized_view_from_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997309,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "UNKNOWN",
+            "customProperties": {
+                "query_urn": "urn:li:query:a5b8ca0f0b97816db6ca440bdd7c6b11acc823fa70250396b902eb1d46835fbc"
+            },
+            "lastUpdatedTimestamp": 1721549580688
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997311,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view_and_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1721520000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 2,
+            "topSqlQueries": [
+                "select revenue from gcp-staging.smoke_test_db.table_from_view_and_table",
+                "select revenue, date_utc from gcp-staging.smoke_test_db.table_from_view_and_table"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                },
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "revenue",
+                    "count": 2
+                },
+                {
+                    "fieldPath": "date_utc",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178273,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_view_on_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997306,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:630f9169072a11dfd8d08a44479f2466acdf2dc2b078b946a739db437b74ad1d"
+            },
+            "lastUpdatedTimestamp": 1721549572202
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997308,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.materialized_view_from_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997312,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:e1769381f2d261efecb105f3ab6fc8a2fc6717a1509cc65ba125c03841b0923d"
+            },
+            "lastUpdatedTimestamp": 1721549581208
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997314,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724064997305,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:b66112fa9691aa02354115b5cef8356390b524fa67c6b06e018c362ac8d0b31d"
+            },
+            "lastUpdatedTimestamp": 1721549572814
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997307,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:005ef53d98fe9ce2d807a16f00695367e6923b11729f2fba0db3e694bd2fe9c9",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a4d62b3996203c5661d02d28c1908d209a56e9966cefc274600a76335bc75de0",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD),date_utc)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view_and_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view_and_table,PROD),date_utc)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view_and_table,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498947,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.materialized_view_from_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997316,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_tmp_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997315,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:8f7bb4efb71d494b2bfe115937d6022db0ab9e6ea3d293839a457480e75430e1",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498950,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724065178292,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:ccc4a40bb7abb852c9a97a2dc80c0928447bf28b91be0e41a80f691ca8e34e35"
+            },
+            "lastUpdatedTimestamp": 1721549588804
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178293,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_external_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724065178287,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:6e250c6966754a5e6532fbb444172dacf5813b0b7afceefbf7772a29878f48f8"
+            },
+            "lastUpdatedTimestamp": 1721549602653
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178288,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.base_table_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724065178288,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:f53151fa3d689ec865c53fa535479e3fc3cc5794be5daaa9a5a4f7f40a7c660f"
+            },
+            "lastUpdatedTimestamp": 1721549582803
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178289,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:005ef53d98fe9ce2d807a16f00695367e6923b11729f2fba0db3e694bd2fe9c9",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498947,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_integer_range_partition,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724065178299,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:6bbebdb71c5ef982b74fb6bbef58f7f33162566fd9b14385f2da971503317539"
+            },
+            "lastUpdatedTimestamp": 1721549596824
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178300,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724065178293,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "INSERT",
+            "customProperties": {
+                "query_urn": "urn:li:query:e4e43fe8e17490b4b360a704a5604dd8d55763afd40f10c335e340132a9fe178"
+            },
+            "lastUpdatedTimestamp": 1721549593090
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178295,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a5b8ca0f0b97816db6ca440bdd7c6b11acc823fa70250396b902eb1d46835fbc",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "drop MATERIALIZED VIEW if exists smoke_test_db.materialized_view_from_table",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549580688,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549580688,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498939,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a5b8ca0f0b97816db6ca440bdd7c6b11acc823fa70250396b902eb1d46835fbc",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.materialized_view_from_table,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498939,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_another_project,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724065178298,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:5efacf0ddad8fd852ba394b29e7a4654ea454915930fb8dd4882c6f294b95cf8"
+            },
+            "lastUpdatedTimestamp": 1721549583501
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178299,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6bbebdb71c5ef982b74fb6bbef58f7f33162566fd9b14385f2da971503317539",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_sharded_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724065178300,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:49b267d0cd050c6a45b4d26bcdc6d9ddceb51aa7ed29399c52ef967e8da2b58d"
+            },
+            "lastUpdatedTimestamp": 1721549598252
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178302,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_ingestion_time_partition,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724065178307,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:420cad6350235517b34e6e376414d89be0734f87fba6789754be420051d4901c"
+            },
+            "lastUpdatedTimestamp": 1721549596155
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178308,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:2d4a0fdd933c8f9009a21f00b3b0213b025d97ff5e6a39cd031e9d5e5c31f832",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n          CREATE OR REPLACE TABLE `gcp-staging-2.smoke_test_db_4.table_with_nested_fields` (\n            id STRING,\n            first_name STRING OPTIONS(description = \"First name\"),\n            last_name STRING OPTIONS(description = \"Last name\"),\n            dob DATE OPTIONS(description = \"Date of birth\"),\n            addresses\n              ARRAY<\n                STRUCT<\n                  status STRING,\n                  address STRING OPTIONS(description = \"Full Address\"),\n                  city STRING,\n                  state STRING,\n                  zip STRING,\n                  numberOfYears STRING>>\n          ) OPTIONS (\n              description = 'Example name and addresses table');\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549597638,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549597638,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178307,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:8f7bb4efb71d494b2bfe115937d6022db0ab9e6ea3d293839a457480e75430e1",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "create or replace table smoke_test_db.lineage_from_base as (select * from smoke_test_db.base_table)",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549569547,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549569547,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498937,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:2d4a0fdd933c8f9009a21f00b3b0213b025d97ff5e6a39cd031e9d5e5c31f832",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178308,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:2d4a0fdd933c8f9009a21f00b3b0213b025d97ff5e6a39cd031e9d5e5c31f832",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_nested_fields,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_nested_fields,PROD),id)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_nested_fields,PROD),first_name)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_nested_fields,PROD),last_name)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_nested_fields,PROD),dob)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_nested_fields,PROD),addresses)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178307,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e4e43fe8e17490b4b360a704a5604dd8d55763afd40f10c335e340132a9fe178",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724065178296,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:a049f27174fa88a7a7b1b7d5f60d2c353f3e9dd3d4994a8e35c91adb986eac4d"
+            },
+            "lastUpdatedTimestamp": 1721549591093
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178298,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.derived_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724065178302,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:88c4674d369ef49e881a5ea67ed3485e48f09b9a4924d5282c3ae25004737f95"
+            },
+            "lastUpdatedTimestamp": 1721549585813
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178303,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_nested_fields,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724065178304,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:2d4a0fdd933c8f9009a21f00b3b0213b025d97ff5e6a39cd031e9d5e5c31f832"
+            },
+            "lastUpdatedTimestamp": 1721549597638
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178306,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e4e43fe8e17490b4b360a704a5604dd8d55763afd40f10c335e340132a9fe178",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "insert into `gcp-staging-2.smoke_test_db_4.sharded_table1_20230201` values (CURRENT_TIMESTAMP(), 100)",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549593090,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549593090,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178296,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a5b8ca0f0b97816db6ca440bdd7c6b11acc823fa70250396b902eb1d46835fbc",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498939,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ccc4a40bb7abb852c9a97a2dc80c0928447bf28b91be0e41a80f691ca8e34e35",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e4e43fe8e17490b4b360a704a5604dd8d55763afd40f10c335e340132a9fe178",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178297,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:2957e74d80b00aef4f3dc7b0b323d1fa863c78fd882d858186579c0737df00e2",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a5b8ca0f0b97816db6ca440bdd7c6b11acc823fa70250396b902eb1d46835fbc",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e4e43fe8e17490b4b360a704a5604dd8d55763afd40f10c335e340132a9fe178",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178297,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:8f7bb4efb71d494b2bfe115937d6022db0ab9e6ea3d293839a457480e75430e1",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_base,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498937,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_wildcard_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724065178284,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:6684f16158660588d874f7ac46dbd7e56ad42acfb95b8a3d1f01292de8dcb930"
+            },
+            "lastUpdatedTimestamp": 1721549600590
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178285,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:8f7bb4efb71d494b2bfe115937d6022db0ab9e6ea3d293839a457480e75430e1",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498937,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.snapshot_from_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997317,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1dcc7521d850077c51d832bc4da7c90aa7f4ea89ede1039363082d8db5c23132",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "SELECT\n  (SUM(CASE WHEN amount BETWEEN 0 AND 10 THEN 1 ELSE 0 END) * 100.0) / COUNT(*) AS percentage_in_range\nFROM\n  gcp-staging.customer_demo.purchase_event;",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724323167170,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724323167170,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997317,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1dcc7521d850077c51d832bc4da7c90aa7f4ea89ede1039363082d8db5c23132",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1dcc7521d850077c51d832bc4da7c90aa7f4ea89ede1039363082d8db5c23132",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.customer_demo.purchase_event,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.customer_demo.purchase_event,PROD),amount)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_base,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997315,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_timetravelled_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724065178323,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "actor": "urn:li:corpuser:dh-bigquery-smoke-test",
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:2fa44cc9d306c7523477fad59ff43e2e580081ee770da69b9b9f66e119b4dcab"
+            },
+            "lastUpdatedTimestamp": 1721549605511
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178324,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bf9835d210e6e397beb91a558bdf36ecb21f3bca9a4789f1f98d617f0aaaf441",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:9e7801810f6e4012bcbe249a5b9e20a5b3582065c09a3563124703315170dce4",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging.smoke_test_db.view_from_table",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322528915,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322528915,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997316,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:9e7801810f6e4012bcbe249a5b9e20a5b3582065c09a3563124703315170dce4",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:741bb9b00959a800b366a27cd477f8f24292c3b3f0198213c5e06a79b0e00555",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging-2.smoke_test_db_4.sharded_table1_20230101",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322557063,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322557063,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:9e7801810f6e4012bcbe249a5b9e20a5b3582065c09a3563124703315170dce4",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:741bb9b00959a800b366a27cd477f8f24292c3b3f0198213c5e06a79b0e00555",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a1dd41eea989d820907358b594b3fb41e0d6812119f5ff657bb02e98dd4c6177",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n    SELECT\n        customer_id,\n        date1\n    FROM\n        `gcp-staging-2.smoke_test_db_4.table_with_integer_range_partition`\n    WHERE\n        customer_id=1\n",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322609673,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322609673,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:741bb9b00959a800b366a27cd477f8f24292c3b3f0198213c5e06a79b0e00555",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:53d20616e4dd30dfc16ccc5771998f5ed93c9afa9b846104a19d072ba364fb5c",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a1dd41eea989d820907358b594b3fb41e0d6812119f5ff657bb02e98dd4c6177",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a1dd41eea989d820907358b594b3fb41e0d6812119f5ff657bb02e98dd4c6177",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_integer_range_partition,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_integer_range_partition,PROD),date1)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_integer_range_partition,PROD),customer_id)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_view_on_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997320,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ccc4a40bb7abb852c9a97a2dc80c0928447bf28b91be0e41a80f691ca8e34e35",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace table `gcp-staging-2.smoke_test_db_4.sharded_table1_20230101` OPTIONS(description=\"Description of sharded table ending with _yyyyMMdd\") as (select * from `gcp-staging.smoke_test_db_2.table_from_other_db`) ;\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549588804,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549588804,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178294,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997318,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f23fd4d501b4de8c50e206db9d8c62f23f92016bab643a168231da54c4a64c88",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f53151fa3d689ec865c53fa535479e3fc3cc5794be5daaa9a5a4f7f40a7c660f",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ccc4a40bb7abb852c9a97a2dc80c0928447bf28b91be0e41a80f691ca8e34e35",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178295,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ebfe552aa0ddb538f3a6c4d444aff757e6df574f16a6dffc3ac146ce587fc491",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_timetravelled_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178326,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:577b11663e044d6b6cab9e2732b49f9ddbd4ad02fa4244c1d338c5d4167b3a9d",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:fdeaa6e036cca324d7f80811a5f3563986866007bfc7ab1b8bb69515cc38f5f6",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging-2.smoke_test_db_3.base_table_2",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322551240,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322551240,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ccc4a40bb7abb852c9a97a2dc80c0928447bf28b91be0e41a80f691ca8e34e35",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178294,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:fdeaa6e036cca324d7f80811a5f3563986866007bfc7ab1b8bb69515cc38f5f6",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:9b7b2966ae76644cacd808f503c9c5a9d2328e6526fd0b9f4d37fd70fbcf6553",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724323170390,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724323170390,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:70d19c139e7fa4f808045ce1b60c3d3a0d9284ae4acc00b5446c27fe1111a6a6",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 21,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 21
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e1b3aa8663b4502df2c6f2db4aaeea00df94105fcbe0519e224549c9d982987e",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:fdeaa6e036cca324d7f80811a5f3563986866007bfc7ab1b8bb69515cc38f5f6",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.base_table_2,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.base_table_2,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.base_table_2,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:9b7b2966ae76644cacd808f503c9c5a9d2328e6526fd0b9f4d37fd70fbcf6553",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:9b7b2966ae76644cacd808f503c9c5a9d2328e6526fd0b9f4d37fd70fbcf6553",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.customer_demo.purchase_event,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:2957e74d80b00aef4f3dc7b0b323d1fa863c78fd882d858186579c0737df00e2",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498948,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.destination_table_of_select_query,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:3ec450841af8056dd02a1f9f059b234119985c2780a30dc38dda726a8b4426dc",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging.smoke_test_db.lineage_from_tmp_table",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322522802,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322522802,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f53151fa3d689ec865c53fa535479e3fc3cc5794be5daaa9a5a4f7f40a7c660f",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            create or replace table `gcp-staging-2.smoke_test_db_3.base_table_2` (date_utc timestamp, revenue INTEGER);\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549582803,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549582803,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178290,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:8714510dd7dc19deccb3188a5e9896076244ff203155e5fa4b61b70121789153",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1796e9c3a125d6474ce2f1fbe1f498d028015b5d7bfd90549dcfcd026826a68f",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:3ec450841af8056dd02a1f9f059b234119985c2780a30dc38dda726a8b4426dc",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:3ec450841af8056dd02a1f9f059b234119985c2780a30dc38dda726a8b4426dc",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_tmp_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_tmp_table,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_tmp_table,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a5b8ca0f0b97816db6ca440bdd7c6b11acc823fa70250396b902eb1d46835fbc",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498951,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f53151fa3d689ec865c53fa535479e3fc3cc5794be5daaa9a5a4f7f40a7c660f",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178291,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c0552a77514094a5c86fc63041e11a30bcf8985511a85d086695db70939abcc0",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging.smoke_test_db.table_from_another_project",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322555601,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322555601,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f53151fa3d689ec865c53fa535479e3fc3cc5794be5daaa9a5a4f7f40a7c660f",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.base_table_2,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.base_table_2,PROD),date_utc)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.base_table_2,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178290,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c0552a77514094a5c86fc63041e11a30bcf8985511a85d086695db70939abcc0",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:039ed54536f1c5bb1ee61f6a6e1f67878c952190620ea30e48768cac208fbe57",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging.smoke_test_db.base_table",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322514004,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322514004,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:3989b79902a8974efeffb0c6e2fb5f5e935abd1ce2beb278a876286038a352d0",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging.smoke_test_db.lineage_from_base",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322525871,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322525871,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:039ed54536f1c5bb1ee61f6a6e1f67878c952190620ea30e48768cac208fbe57",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:039ed54536f1c5bb1ee61f6a6e1f67878c952190620ea30e48768cac208fbe57",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c0552a77514094a5c86fc63041e11a30bcf8985511a85d086695db70939abcc0",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_another_project,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_another_project,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:3989b79902a8974efeffb0c6e2fb5f5e935abd1ce2beb278a876286038a352d0",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:3989b79902a8974efeffb0c6e2fb5f5e935abd1ce2beb278a876286038a352d0",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_base,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_base,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_base,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:4f5fd82d4808115ef07900a543b7d6e3551899815d11a945870c607d2dbda56e",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498948,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:53d20616e4dd30dfc16ccc5771998f5ed93c9afa9b846104a19d072ba364fb5c",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498949,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c0182ee336ef4bb9c8e957bc621616573c9aea2a2c0ed08ddd04b1aab2e0ab39",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997314,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c1c334538a103cfd23352131c5de23677521e78bf74a16021d4877695074c63a",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bb1e3c0fd1f6a26c2645cf4ba088a22ff346a9e323c6be451459ecfa7329a991",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498952,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bb3d7f6685e1f71868d0821451e52bfcf1a3bdfeb34c739c0305386256c38f9b",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498952,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:34e3010e0e6a4b83d275086601e9ece3083e1ecc5dae3945bbd75631fa5d4126",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging.smoke_test_db.materialized_view_from_table",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322541401,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322541401,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_ingestion_time_partition,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178327,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:34e3010e0e6a4b83d275086601e9ece3083e1ecc5dae3945bbd75631fa5d4126",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:59c53a03b1fbf71b46518f56b26e7cc3cf03a726567e15cc9d37e6dd2f5c1f60",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:34e3010e0e6a4b83d275086601e9ece3083e1ecc5dae3945bbd75631fa5d4126",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.materialized_view_from_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.materialized_view_from_table,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.materialized_view_from_table,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b66112fa9691aa02354115b5cef8356390b524fa67c6b06e018c362ac8d0b31d",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064498952,
+        "runId": "bigquery-queries-2024_08_19-16_18_14",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view_and_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997317,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c45ca09d68c89c18308b4eb97b2497a1a7c40a21de17b6ea06beab10704a3e3e",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1796e9c3a125d6474ce2f1fbe1f498d028015b5d7bfd90549dcfcd026826a68f",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging.smoke_test_db.view_from_view_on_table",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322532005,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322532005,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:055def6c8c2745212afa56be1f58fbdc936cd7f37a420a7df6715416fddae4dc",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997318,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1796e9c3a125d6474ce2f1fbe1f498d028015b5d7bfd90549dcfcd026826a68f",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1796e9c3a125d6474ce2f1fbe1f498d028015b5d7bfd90549dcfcd026826a68f",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_view_on_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_view_on_table,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_view_on_table,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997320,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_snapshot_on_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997319,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c0182ee336ef4bb9c8e957bc621616573c9aea2a2c0ed08ddd04b1aab2e0ab39",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging.smoke_test_db.lineage_from_tmp_table",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322524291,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322524291,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:84a5f2c31752cc1a4e180c86da34c84f1a04df3b69aebe0d69222d0d8e07f8e0",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging-2.smoke_test_db_4.sharded_table1_20230201",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322561765,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322561765,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c0182ee336ef4bb9c8e957bc621616573c9aea2a2c0ed08ddd04b1aab2e0ab39",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:604fa496a50ed8bd340161bebdc475d68daffeaaed31ec649370a2ce392eed90",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging.smoke_test_db.lineage_from_base",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322527479,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322527479,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:95daf40bccda9fbc9dc15b1109fa105a3c19d83de58625b7265e81cbe8dae940",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n    select \n        transaction_id \n    from \n        `gcp-staging-2.smoke_test_db_4.table_with_ingestion_time_partition` \n    where \n        _PARTITIONDATE = CURRENT_DATE()\n",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322608186,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322608186,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:604fa496a50ed8bd340161bebdc475d68daffeaaed31ec649370a2ce392eed90",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:604fa496a50ed8bd340161bebdc475d68daffeaaed31ec649370a2ce392eed90",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_base,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_base,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:82edd8e24a1c289c4c7487b5a3c1b61e4ed6f1c89d5cd2fab5424b085ad0b7d6",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c0182ee336ef4bb9c8e957bc621616573c9aea2a2c0ed08ddd04b1aab2e0ab39",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_tmp_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.lineage_from_tmp_table,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:95daf40bccda9fbc9dc15b1109fa105a3c19d83de58625b7265e81cbe8dae940",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:577b11663e044d6b6cab9e2732b49f9ddbd4ad02fa4244c1d338c5d4167b3a9d",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging.smoke_test_db_2.table_from_other_db",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322549851,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322549851,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:95daf40bccda9fbc9dc15b1109fa105a3c19d83de58625b7265e81cbe8dae940",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_ingestion_time_partition,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_ingestion_time_partition,PROD),transaction_id)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:577b11663e044d6b6cab9e2732b49f9ddbd4ad02fa4244c1d338c5d4167b3a9d",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6264af081391592ea07c46c6aea5ec4359b4ac5ec695976469b461b9de5be3f2",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 36,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 36
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c0552a77514094a5c86fc63041e11a30bcf8985511a85d086695db70939abcc0",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:577b11663e044d6b6cab9e2732b49f9ddbd4ad02fa4244c1d338c5d4167b3a9d",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:32b43422c0184159f4f812fb8e698ed2423a421a7086864aeb11efc3c339246e",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997319,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:84a5f2c31752cc1a4e180c86da34c84f1a04df3b69aebe0d69222d0d8e07f8e0",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c45ca09d68c89c18308b4eb97b2497a1a7c40a21de17b6ea06beab10704a3e3e",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from `gcp-staging-2.smoke_test_db_4.sharded_table1_*`",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322565044,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322565044,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:84a5f2c31752cc1a4e180c86da34c84f1a04df3b69aebe0d69222d0d8e07f8e0",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c45ca09d68c89c18308b4eb97b2497a1a7c40a21de17b6ea06beab10704a3e3e",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f0faa4e0dbe3a28dc69369034ffde5f0cbba1f0a068a1db914bf143dc212aeb6",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c45ca09d68c89c18308b4eb97b2497a1a7c40a21de17b6ea06beab10704a3e3e",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:composite_0db44e02f671b69df68565346e9d2b68c7166fccf75bd494f34560bfa16c381b",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724064997332,
+        "runId": "bigquery-queries-2024_08_19-16_26_33",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6bbebdb71c5ef982b74fb6bbef58f7f33162566fd9b14385f2da971503317539",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_integer_range_partition,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_integer_range_partition,PROD),customer_id)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_integer_range_partition,PROD),date1)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178301,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:56740f3a3d46afdf0177aadf1dbf4937a4b83c0116aef2773a5de9b7e87895f2",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e0e0eb18099d8d8a8ef58c5c7cdaf0948774f0fe02ccd1c1c940b502b69c8483",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select key from gcp-staging.smoke_test_db.usage_test",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322595586,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322595586,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e0e0eb18099d8d8a8ef58c5c7cdaf0948774f0fe02ccd1c1c940b502b69c8483",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 3,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 3
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:95daf40bccda9fbc9dc15b1109fa105a3c19d83de58625b7265e81cbe8dae940",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6bbebdb71c5ef982b74fb6bbef58f7f33162566fd9b14385f2da971503317539",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n          CREATE or REPLACE TABLE `gcp-staging-2.smoke_test_db_4.table_with_integer_range_partition` (customer_id INT64, date1 DATE)\n          PARTITION BY\n            RANGE_BUCKET(customer_id, GENERATE_ARRAY(0, 100, 10))\n            OPTIONS (\n              description = \"Description of Integer Range partitioned table\",\n              require_partition_filter = TRUE);\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549596824,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549596824,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178301,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:34e3010e0e6a4b83d275086601e9ece3083e1ecc5dae3945bbd75631fa5d4126",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e0e0eb18099d8d8a8ef58c5c7cdaf0948774f0fe02ccd1c1c940b502b69c8483",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bf9835d210e6e397beb91a558bdf36ecb21f3bca9a4789f1f98d617f0aaaf441",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging.smoke_test_db.materialized_view_from_table",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322543069,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322543069,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e0e0eb18099d8d8a8ef58c5c7cdaf0948774f0fe02ccd1c1c940b502b69c8483",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD),key)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6422d5a3e23d0bfce3783edc019406cc6cc574044faa5c48edb97cf22294ba33",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bf9835d210e6e397beb91a558bdf36ecb21f3bca9a4789f1f98d617f0aaaf441",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:039ed54536f1c5bb1ee61f6a6e1f67878c952190620ea30e48768cac208fbe57",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bf9835d210e6e397beb91a558bdf36ecb21f3bca9a4789f1f98d617f0aaaf441",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.materialized_view_from_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.materialized_view_from_table,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6bbebdb71c5ef982b74fb6bbef58f7f33162566fd9b14385f2da971503317539",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178339,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_sharded_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178325,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:859633a51baed3d25e0fda695c858b9981f7f5a2f7a7073b251847704e184083",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging.smoke_test_db.table_from_another_project",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322554152,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322554152,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.derived_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178325,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:859633a51baed3d25e0fda695c858b9981f7f5a2f7a7073b251847704e184083",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:859633a51baed3d25e0fda695c858b9981f7f5a2f7a7073b251847704e184083",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_another_project,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_another_project,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_another_project,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6bbebdb71c5ef982b74fb6bbef58f7f33162566fd9b14385f2da971503317539",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178301,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_nested_fields,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178328,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:859633a51baed3d25e0fda695c858b9981f7f5a2f7a7073b251847704e184083",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ef372dc8ac2bd484b844e59ea85f81361950f4897a7382df59fb0d4584468fc6",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 4,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 4
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:dd46e45d678f4e7a2755637ac76b97a1d1c723602f767b2fa0f8653920bb8d99",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging.smoke_test_db.table_from_view_and_table",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322539969,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322539969,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:9f2cdfe3c23dd5eb43051d0b683a9e76cd40453f3cba44c750f98de294134e03",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging.smoke_test_db.base_table FOR SYSTEM_TIME AS OF TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 1 HOUR)",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322611320,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322611320,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:dd46e45d678f4e7a2755637ac76b97a1d1c723602f767b2fa0f8653920bb8d99",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:dd46e45d678f4e7a2755637ac76b97a1d1c723602f767b2fa0f8653920bb8d99",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view_and_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view_and_table,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:44c19e1fccfa56779f6958f62d3476819b48af701bbee43ccecf5c9e04d63fc4",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:9f2cdfe3c23dd5eb43051d0b683a9e76cd40453f3cba44c750f98de294134e03",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:9f2cdfe3c23dd5eb43051d0b683a9e76cd40453f3cba44c750f98de294134e03",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f53151fa3d689ec865c53fa535479e3fc3cc5794be5daaa9a5a4f7f40a7c660f",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178346,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_integer_range_partition,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178328,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:3b9dab2ff83d72565bd19daefcee18b938db280a5c030ccf36fb511f19f929c6",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging-2.smoke_test_db_3.base_table_2",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322552655,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322552655,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:101f80da8c082437fb8997d9fa1df63c1c65258e51d89516922e6b61b39c32dc",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging.smoke_test_db.view_from_table",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322530411,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322530411,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:3b9dab2ff83d72565bd19daefcee18b938db280a5c030ccf36fb511f19f929c6",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:276cc9d6fa5b1277b2de3d278060c5628f13907b0c1a748edd7595a7e38b1181",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging.smoke_test_db.base_table FOR SYSTEM_TIME AS OF TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 1 HOUR)",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322612787,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322612787,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:3b9dab2ff83d72565bd19daefcee18b938db280a5c030ccf36fb511f19f929c6",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.base_table_2,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.base_table_2,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:276cc9d6fa5b1277b2de3d278060c5628f13907b0c1a748edd7595a7e38b1181",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:276cc9d6fa5b1277b2de3d278060c5628f13907b0c1a748edd7595a7e38b1181",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:5efacf0ddad8fd852ba394b29e7a4654ea454915930fb8dd4882c6f294b95cf8",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178338,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:101f80da8c082437fb8997d9fa1df63c1c65258e51d89516922e6b61b39c32dc",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:101f80da8c082437fb8997d9fa1df63c1c65258e51d89516922e6b61b39c32dc",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_table,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_wildcard_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178326,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:420cad6350235517b34e6e376414d89be0734f87fba6789754be420051d4901c",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_ingestion_time_partition,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_ingestion_time_partition,PROD),transaction_id)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178310,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6422d5a3e23d0bfce3783edc019406cc6cc574044faa5c48edb97cf22294ba33",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n    select name, post_abbr from `gcp-staging-2.smoke_test_db_4.external_table_us_states`\n",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322605248,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322605248,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:276cc9d6fa5b1277b2de3d278060c5628f13907b0c1a748edd7595a7e38b1181",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:d326639002bca6c0fe8515dc1599fd1a81f35bbde61806f2fa19487201f7a79f",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:420cad6350235517b34e6e376414d89be0734f87fba6789754be420051d4901c",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n          CREATE  or REPLACE TABLE\n            `gcp-staging-2.smoke_test_db_4.table_with_ingestion_time_partition` (transaction_id INT64)\n          PARTITION BY\n            _PARTITIONDATE\n            OPTIONS (\n              description = \"Description of Ingestion time partitioned table\",\n              partition_expiration_days = 3,\n              require_partition_filter = TRUE);\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1721549596155,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1721549596155,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178309,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6422d5a3e23d0bfce3783edc019406cc6cc574044faa5c48edb97cf22294ba33",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a1dd41eea989d820907358b594b3fb41e0d6812119f5ff657bb02e98dd4c6177",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6422d5a3e23d0bfce3783edc019406cc6cc574044faa5c48edb97cf22294ba33",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.external_table_us_states,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.external_table_us_states,PROD),name)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.external_table_us_states,PROD),post_abbr)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:420cad6350235517b34e6e376414d89be0734f87fba6789754be420051d4901c",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178336,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:420cad6350235517b34e6e376414d89be0734f87fba6789754be420051d4901c",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178310,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:84a5f2c31752cc1a4e180c86da34c84f1a04df3b69aebe0d69222d0d8e07f8e0",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:aabff37598818c2571a6f1d31137c66ba2a19cae73cc65514a92e703a0b70511",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging.smoke_test_db.view_from_multiple_tables",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322546639,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322546639,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f5c935d2377600d41fa76c69b80586aaa0c373b527b9ae46ca62982c53193ad5",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 5,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 5
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.customer_demo.purchase_event,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178329,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:aabff37598818c2571a6f1d31137c66ba2a19cae73cc65514a92e703a0b70511",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1f994d5cfc676f126b1d43b02e1c2f6640e7375c9d8d50b3a5bad6ba057745ab",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 3,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 3
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:101f80da8c082437fb8997d9fa1df63c1c65258e51d89516922e6b61b39c32dc",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:991a14a8ed8d532c930c8dfd2ace42a7a5fafb76a7a505e14f373e62e8807e0b",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1f994d5cfc676f126b1d43b02e1c2f6640e7375c9d8d50b3a5bad6ba057745ab",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select value from gcp-staging.smoke_test_db.usage_test",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322594074,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322594074,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ef372dc8ac2bd484b844e59ea85f81361950f4897a7382df59fb0d4584468fc6",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select * from gcp-staging.smoke_test_db.usage_test",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322601431,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322601431,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:9b7b2966ae76644cacd808f503c9c5a9d2328e6526fd0b9f4d37fd70fbcf6553",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 14,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 14
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1f994d5cfc676f126b1d43b02e1c2f6640e7375c9d8d50b3a5bad6ba057745ab",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1f994d5cfc676f126b1d43b02e1c2f6640e7375c9d8d50b3a5bad6ba057745ab",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD),value)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:aabff37598818c2571a6f1d31137c66ba2a19cae73cc65514a92e703a0b70511",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ef372dc8ac2bd484b844e59ea85f81361950f4897a7382df59fb0d4584468fc6",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ef372dc8ac2bd484b844e59ea85f81361950f4897a7382df59fb0d4584468fc6",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:2fa44cc9d306c7523477fad59ff43e2e580081ee770da69b9b9f66e119b4dcab",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178336,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ccc4a40bb7abb852c9a97a2dc80c0928447bf28b91be0e41a80f691ca8e34e35",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178344,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b30be114c7808b5af8eb79c3ef07a96927372b12f7b03f23d786844ba0301882",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE quantity < 0\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724323108678,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724323108678,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6684f16158660588d874f7ac46dbd7e56ad42acfb95b8a3d1f01292de8dcb930",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178339,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b30be114c7808b5af8eb79c3ef07a96927372b12f7b03f23d786844ba0301882",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f0faa4e0dbe3a28dc69369034ffde5f0cbba1f0a068a1db914bf143dc212aeb6",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging.smoke_test_db.view_from_multiple_tables",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322544870,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322544870,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b30be114c7808b5af8eb79c3ef07a96927372b12f7b03f23d786844ba0301882",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.customer_demo.purchase_event,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f0faa4e0dbe3a28dc69369034ffde5f0cbba1f0a068a1db914bf143dc212aeb6",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b5f379bdbfa48c81469b0a5893bb649ba02ff71fcd4ff151675c8728472c9219",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from `gcp-staging-2.smoke_test_db_4.sharded_table1_*`",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322563212,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322563212,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f0faa4e0dbe3a28dc69369034ffde5f0cbba1f0a068a1db914bf143dc212aeb6",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_multiple_tables,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b5f379bdbfa48c81469b0a5893bb649ba02ff71fcd4ff151675c8728472c9219",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b5f379bdbfa48c81469b0a5893bb649ba02ff71fcd4ff151675c8728472c9219",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.external_table_us_states,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178327,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:2d4a0fdd933c8f9009a21f00b3b0213b025d97ff5e6a39cd031e9d5e5c31f832",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178335,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:4c01c67bbeca250453b9063e03964cc1bd358921ca0b650140515e79d1970db8",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 5,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 5
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:32b43422c0184159f4f812fb8e698ed2423a421a7086864aeb11efc3c339246e",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging.smoke_test_db.partition_test",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322518956,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322518956,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b30be114c7808b5af8eb79c3ef07a96927372b12f7b03f23d786844ba0301882",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 5,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 5
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:88c4674d369ef49e881a5ea67ed3485e48f09b9a4924d5282c3ae25004737f95",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178340,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b828588160530bade966b0dbe1c1d09fb3262f6b9137c0956a6f3ed4ef467a91",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 3,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 3
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:32b43422c0184159f4f812fb8e698ed2423a421a7086864aeb11efc3c339246e",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:32b43422c0184159f4f812fb8e698ed2423a421a7086864aeb11efc3c339246e",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178327,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.derived_table_from_external_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178325,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:82edd8e24a1c289c4c7487b5a3c1b61e4ed6f1c89d5cd2fab5424b085ad0b7d6",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n    SELECT\n        first_name,\n        last_name,\n        dob,\n        addresses[offset(0)].address,\n        addresses[offset(0)].city\n    FROM        \n    gcp-staging-2.smoke_test_db_4.table_with_nested_fields\n",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322606806,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322606806,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_3.base_table_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178324,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:82edd8e24a1c289c4c7487b5a3c1b61e4ed6f1c89d5cd2fab5424b085ad0b7d6",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:82edd8e24a1c289c4c7487b5a3c1b61e4ed6f1c89d5cd2fab5424b085ad0b7d6",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_nested_fields,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_nested_fields,PROD),last_name)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_nested_fields,PROD),first_name)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_nested_fields,PROD),addresses)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.table_with_nested_fields,PROD),dob)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:741bb9b00959a800b366a27cd477f8f24292c3b3f0198213c5e06a79b0e00555",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:fdeaa6e036cca324d7f80811a5f3563986866007bfc7ab1b8bb69515cc38f5f6",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:7a4b43ffafd0fb61a647ed56a9383a42fb902f5632a9608c72229ad9da5d4d1c",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:49b267d0cd050c6a45b4d26bcdc6d9ddceb51aa7ed29399c52ef967e8da2b58d",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178337,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e4e43fe8e17490b4b360a704a5604dd8d55763afd40f10c335e340132a9fe178",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178345,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_another_project,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178331,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a049f27174fa88a7a7b1b7d5f60d2c353f3e9dd3d4994a8e35c91adb986eac4d",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178341,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6e250c6966754a5e6532fbb444172dacf5813b0b7afceefbf7772a29878f48f8",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724065178339,
+        "runId": "bigquery-queries-2024_08_19-16_29_19",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b5f379bdbfa48c81469b0a5893bb649ba02ff71fcd4ff151675c8728472c9219",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1dcc7521d850077c51d832bc4da7c90aa7f4ea89ede1039363082d8db5c23132",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 3,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 3
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:3989b79902a8974efeffb0c6e2fb5f5e935abd1ce2beb278a876286038a352d0",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:4c01c67bbeca250453b9063e03964cc1bd358921ca0b650140515e79d1970db8",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:4c01c67bbeca250453b9063e03964cc1bd358921ca0b650140515e79d1970db8",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:4c01c67bbeca250453b9063e03964cc1bd358921ca0b650140515e79d1970db8",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n    select revenue from gcp-staging.smoke_test_db.partition_test t\n    where cast(t.date_utc as DATE) < (select max(date_utc) from gcp-staging.smoke_test_db.partition_test)\n",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322579451,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322579451,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b828588160530bade966b0dbe1c1d09fb3262f6b9137c0956a6f3ed4ef467a91",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n    select revenue from gcp-staging.smoke_test_db.partition_test t\n    where cast(t.date_utc as DATE) = (select max(date_utc) from gcp-staging.smoke_test_db.partition_test)\n",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322585961,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322585961,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:991a14a8ed8d532c930c8dfd2ace42a7a5fafb76a7a505e14f373e62e8807e0b",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging.smoke_test_db.partition_test",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322521153,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322521153,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b828588160530bade966b0dbe1c1d09fb3262f6b9137c0956a6f3ed4ef467a91",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b828588160530bade966b0dbe1c1d09fb3262f6b9137c0956a6f3ed4ef467a91",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:604fa496a50ed8bd340161bebdc475d68daffeaaed31ec649370a2ce392eed90",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:4c01c67bbeca250453b9063e03964cc1bd358921ca0b650140515e79d1970db8",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:991a14a8ed8d532c930c8dfd2ace42a7a5fafb76a7a505e14f373e62e8807e0b",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:991a14a8ed8d532c930c8dfd2ace42a7a5fafb76a7a505e14f373e62e8807e0b",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f23fd4d501b4de8c50e206db9d8c62f23f92016bab643a168231da54c4a64c88",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db_2.table_from_other_db,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f23fd4d501b4de8c50e206db9d8c62f23f92016bab643a168231da54c4a64c88",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f23fd4d501b4de8c50e206db9d8c62f23f92016bab643a168231da54c4a64c88",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging.smoke_test_db_2.table_from_other_db",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322548392,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322548392,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f23fd4d501b4de8c50e206db9d8c62f23f92016bab643a168231da54c4a64c88",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e8ab557dc3577da354c52bb0acf3363d444578aeceeeed82cd6bcaa50453fd40",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:3ec450841af8056dd02a1f9f059b234119985c2780a30dc38dda726a8b4426dc",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:9f2cdfe3c23dd5eb43051d0b683a9e76cd40453f3cba44c750f98de294134e03",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:56740f3a3d46afdf0177aadf1dbf4937a4b83c0116aef2773a5de9b7e87895f2",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging.smoke_test_db.base_table",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322517386,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322517386,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e8ab557dc3577da354c52bb0acf3363d444578aeceeeed82cd6bcaa50453fd40",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:56740f3a3d46afdf0177aadf1dbf4937a4b83c0116aef2773a5de9b7e87895f2",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:56740f3a3d46afdf0177aadf1dbf4937a4b83c0116aef2773a5de9b7e87895f2",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.base_table,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:3b9dab2ff83d72565bd19daefcee18b938db280a5c030ccf36fb511f19f929c6",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e8ab557dc3577da354c52bb0acf3363d444578aeceeeed82cd6bcaa50453fd40",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "create or replace table _smoke_test_db_tmp_tables.tmp_table as (select * from smoke_test_db.base_table)",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322455205,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322455205,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e8ab557dc3577da354c52bb0acf3363d444578aeceeeed82cd6bcaa50453fd40",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f5c935d2377600d41fa76c69b80586aaa0c373b527b9ae46ca62982c53193ad5",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n    select extract(month from date_utc) month, count(*) count, sum(revenue) gross from gcp-staging.smoke_test_db.partition_test\n    group by month\n    order by gross\n",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322581032,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322581032,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:8714510dd7dc19deccb3188a5e9896076244ff203155e5fa4b61b70121789153",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD),date_utc)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.usage_test,PROD),value)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f5c935d2377600d41fa76c69b80586aaa0c373b527b9ae46ca62982c53193ad5",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1f994d5cfc676f126b1d43b02e1c2f6640e7375c9d8d50b3a5bad6ba057745ab",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:aabff37598818c2571a6f1d31137c66ba2a19cae73cc65514a92e703a0b70511",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:70d19c139e7fa4f808045ce1b60c3d3a0d9284ae4acc00b5446c27fe1111a6a6",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724323320672,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724323320672,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f5c935d2377600d41fa76c69b80586aaa0c373b527b9ae46ca62982c53193ad5",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.partition_test,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:70d19c139e7fa4f808045ce1b60c3d3a0d9284ae4acc00b5446c27fe1111a6a6",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:70d19c139e7fa4f808045ce1b60c3d3a0d9284ae4acc00b5446c27fe1111a6a6",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.customer_demo.purchase_event,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.customer_demo.purchase_event,PROD),amount)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:8714510dd7dc19deccb3188a5e9896076244ff203155e5fa4b61b70121789153",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:8714510dd7dc19deccb3188a5e9896076244ff203155e5fa4b61b70121789153",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n    select extract(month from date_utc) month, count(*) count, sum(value) total from gcp-staging.smoke_test_db.usage_test\n    group by month\n    order by total\n    ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322602823,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322602823,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:8714510dd7dc19deccb3188a5e9896076244ff203155e5fa4b61b70121789153",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:34e3010e0e6a4b83d275086601e9ece3083e1ecc5dae3945bbd75631fa5d4126",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:84a5f2c31752cc1a4e180c86da34c84f1a04df3b69aebe0d69222d0d8e07f8e0",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:9f2cdfe3c23dd5eb43051d0b683a9e76cd40453f3cba44c750f98de294134e03",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b30be114c7808b5af8eb79c3ef07a96927372b12f7b03f23d786844ba0301882",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6264af081391592ea07c46c6aea5ec4359b4ac5ec695976469b461b9de5be3f2",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.customer_demo.purchase_event,PROD)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:dd46e45d678f4e7a2755637ac76b97a1d1c723602f767b2fa0f8653920bb8d99",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6264af081391592ea07c46c6aea5ec4359b4ac5ec695976469b461b9de5be3f2",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6264af081391592ea07c46c6aea5ec4359b4ac5ec695976469b461b9de5be3f2",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724323321938,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724323321938,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6264af081391592ea07c46c6aea5ec4359b4ac5ec695976469b461b9de5be3f2",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:101f80da8c082437fb8997d9fa1df63c1c65258e51d89516922e6b61b39c32dc",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e1b3aa8663b4502df2c6f2db4aaeea00df94105fcbe0519e224549c9d982987e",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view_and_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view_and_table,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view_and_table,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e1b3aa8663b4502df2c6f2db4aaeea00df94105fcbe0519e224549c9d982987e",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e1b3aa8663b4502df2c6f2db4aaeea00df94105fcbe0519e224549c9d982987e",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging.smoke_test_db.table_from_view_and_table",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322538350,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322538350,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:276cc9d6fa5b1277b2de3d278060c5628f13907b0c1a748edd7595a7e38b1181",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e8ab557dc3577da354c52bb0acf3363d444578aeceeeed82cd6bcaa50453fd40",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e1b3aa8663b4502df2c6f2db4aaeea00df94105fcbe0519e224549c9d982987e",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:577b11663e044d6b6cab9e2732b49f9ddbd4ad02fa4244c1d338c5d4167b3a9d",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:859633a51baed3d25e0fda695c858b9981f7f5a2f7a7073b251847704e184083",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c1c334538a103cfd23352131c5de23677521e78bf74a16021d4877695074c63a",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_view_on_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.view_from_view_on_table,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1796e9c3a125d6474ce2f1fbe1f498d028015b5d7bfd90549dcfcd026826a68f",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:9e7801810f6e4012bcbe249a5b9e20a5b3582065c09a3563124703315170dce4",
+    "changeType": "UPSERT",
+    "aspectName": "queryUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1724284800000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "queryCount": 1,
+            "uniqueUserCount": 1,
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+                    "count": 1
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c1c334538a103cfd23352131c5de23677521e78bf74a16021d4877695074c63a",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c1c334538a103cfd23352131c5de23677521e78bf74a16021d4877695074c63a",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging.smoke_test_db.view_from_view_on_table",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322533604,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322533604,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:055def6c8c2745212afa56be1f58fbdc936cd7f37a420a7df6715416fddae4dc",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging-2.smoke_test_db_4.sharded_table1_20230201",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322560058,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322560058,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c1c334538a103cfd23352131c5de23677521e78bf74a16021d4877695074c63a",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:055def6c8c2745212afa56be1f58fbdc936cd7f37a420a7df6715416fddae4dc",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:055def6c8c2745212afa56be1f58fbdc936cd7f37a420a7df6715416fddae4dc",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:d326639002bca6c0fe8515dc1599fd1a81f35bbde61806f2fa19487201f7a79f",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging-2.smoke_test_db_4.sharded_table1,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:d326639002bca6c0fe8515dc1599fd1a81f35bbde61806f2fa19487201f7a79f",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:d326639002bca6c0fe8515dc1599fd1a81f35bbde61806f2fa19487201f7a79f",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging-2.smoke_test_db_4.sharded_table1_20230101",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322558514,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322558514,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:d326639002bca6c0fe8515dc1599fd1a81f35bbde61806f2fa19487201f7a79f",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:7a4b43ffafd0fb61a647ed56a9383a42fb902f5632a9608c72229ad9da5d4d1c",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view,PROD),revenue)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:7a4b43ffafd0fb61a647ed56a9383a42fb902f5632a9608c72229ad9da5d4d1c",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:039ed54536f1c5bb1ee61f6a6e1f67878c952190620ea30e48768cac208fbe57",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:7a4b43ffafd0fb61a647ed56a9383a42fb902f5632a9608c72229ad9da5d4d1c",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue from gcp-staging.smoke_test_db.table_from_view",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322536837,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            },
+            "lastModified": {
+                "time": 1724322536837,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test-2"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:7a4b43ffafd0fb61a647ed56a9383a42fb902f5632a9608c72229ad9da5d4d1c",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f5c935d2377600d41fa76c69b80586aaa0c373b527b9ae46ca62982c53193ad5",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:59c53a03b1fbf71b46518f56b26e7cc3cf03a726567e15cc9d37e6dd2f5c1f60",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view,PROD),revenue)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,gcp-staging.smoke_test_db.table_from_view,PROD),date_utc)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:59c53a03b1fbf71b46518f56b26e7cc3cf03a726567e15cc9d37e6dd2f5c1f60",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:59c53a03b1fbf71b46518f56b26e7cc3cf03a726567e15cc9d37e6dd2f5c1f60",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "select revenue, date_utc from gcp-staging.smoke_test_db.table_from_view",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1724322535333,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            },
+            "lastModified": {
+                "time": 1724322535333,
+                "actor": "urn:li:corpuser:dh-bigquery-smoke-test"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:59c53a03b1fbf71b46518f56b26e7cc3cf03a726567e15cc9d37e6dd2f5c1f60",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c0552a77514094a5c86fc63041e11a30bcf8985511a85d086695db70939abcc0",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c0182ee336ef4bb9c8e957bc621616573c9aea2a2c0ed08ddd04b1aab2e0ab39",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:32b43422c0184159f4f812fb8e698ed2423a421a7086864aeb11efc3c339246e",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:055def6c8c2745212afa56be1f58fbdc936cd7f37a420a7df6715416fddae4dc",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:82edd8e24a1c289c4c7487b5a3c1b61e4ed6f1c89d5cd2fab5424b085ad0b7d6",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:fdeaa6e036cca324d7f80811a5f3563986866007bfc7ab1b8bb69515cc38f5f6",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:991a14a8ed8d532c930c8dfd2ace42a7a5fafb76a7a505e14f373e62e8807e0b",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:9e7801810f6e4012bcbe249a5b9e20a5b3582065c09a3563124703315170dce4",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b828588160530bade966b0dbe1c1d09fb3262f6b9137c0956a6f3ed4ef467a91",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:604fa496a50ed8bd340161bebdc475d68daffeaaed31ec649370a2ce392eed90",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1dcc7521d850077c51d832bc4da7c90aa7f4ea89ede1039363082d8db5c23132",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:3989b79902a8974efeffb0c6e2fb5f5e935abd1ce2beb278a876286038a352d0",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:56740f3a3d46afdf0177aadf1dbf4937a4b83c0116aef2773a5de9b7e87895f2",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:b5f379bdbfa48c81469b0a5893bb649ba02ff71fcd4ff151675c8728472c9219",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:70d19c139e7fa4f808045ce1b60c3d3a0d9284ae4acc00b5446c27fe1111a6a6",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a1dd41eea989d820907358b594b3fb41e0d6812119f5ff657bb02e98dd4c6177",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e0e0eb18099d8d8a8ef58c5c7cdaf0948774f0fe02ccd1c1c940b502b69c8483",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:3ec450841af8056dd02a1f9f059b234119985c2780a30dc38dda726a8b4426dc",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:6422d5a3e23d0bfce3783edc019406cc6cc574044faa5c48edb97cf22294ba33",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:95daf40bccda9fbc9dc15b1109fa105a3c19d83de58625b7265e81cbe8dae940",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:741bb9b00959a800b366a27cd477f8f24292c3b3f0198213c5e06a79b0e00555",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:3b9dab2ff83d72565bd19daefcee18b938db280a5c030ccf36fb511f19f929c6",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:dd46e45d678f4e7a2755637ac76b97a1d1c723602f767b2fa0f8653920bb8d99",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:9b7b2966ae76644cacd808f503c9c5a9d2328e6526fd0b9f4d37fd70fbcf6553",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:c45ca09d68c89c18308b4eb97b2497a1a7c40a21de17b6ea06beab10704a3e3e",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bf9835d210e6e397beb91a558bdf36ecb21f3bca9a4789f1f98d617f0aaaf441",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:aabff37598818c2571a6f1d31137c66ba2a19cae73cc65514a92e703a0b70511",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f0faa4e0dbe3a28dc69369034ffde5f0cbba1f0a068a1db914bf143dc212aeb6",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ef372dc8ac2bd484b844e59ea85f81361950f4897a7382df59fb0d4584468fc6",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1724050800000,
+        "runId": "bigquery-queries-2024_08_19-07_00_00",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/bigquery_v2/query_log.json b/metadata-ingestion/tests/integration/bigquery_v2/query_log.json
new file mode 100644
index 00000000000000..23513e46eb5fec
--- /dev/null
+++ b/metadata-ingestion/tests/integration/bigquery_v2/query_log.json
@@ -0,0 +1,5404 @@
+[
+  {
+    "query": "create or replace table smoke_test_db.usage_test (date_utc date, key STRING, value INTEGER)",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:23.887000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "714133dca6aefca9787e41860cac29c12fcf745ebc2022515aafa4a1ac275562",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "15e12d10-ecd2-49df-9265-15e1d13063f2",
+      "statement_type": "CREATE_TABLE",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "usage_test"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            insert into smoke_test_db.usage_test values\n              (\"2022-05-01\", \"seven\", 7),\n              (\"2022-05-02\", \"ten\", 10),\n              (\"2022-06-01\", \"four\", 4)\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:25.357000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "9a0a288a8fb978ca88c0bccb466e099eef0d9a18a2dd4c8b184319820047dd17",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "74e32b90-4099-463d-94c8-d7dee843cfa4",
+      "statement_type": "INSERT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "usage_test"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "usage_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            create or replace table smoke_test_db.partition_test (date_utc date, revenue INTEGER) \n            PARTITION BY date_utc\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:27.620000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "e5a917a8c68b133b30f7acf5c1a4d843cf00132d3785bf0320fba2ad579c519e",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "194dff44-329f-49e6-82f0-865c06c223ba",
+      "statement_type": "CREATE_TABLE",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "partition_test"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "insert into smoke_test_db.partition_test values (\"2022-05-24\", 20), (\"2022-06-24\", 30)",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:28.864000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "1442aa8170b7c0a8ae76695175a8a34c06c602aa116656ddd29746f348478c95",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "56e06ba7-a054-4100-a0e3-d7d5c7a32d7e",
+      "statement_type": "INSERT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "partition_test"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "create or replace table smoke_test_db.base_table (date_utc timestamp, revenue INTEGER)",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:31.326000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "48c41f9be14b4816933e27350f75d291a87194168b202c835d3fdb0e82e8cc1a",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "d7ef294f-8776-4d12-adc8-dd9de5acda16",
+      "statement_type": "CREATE_TABLE",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "base_table"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "insert into smoke_test_db.base_table values (CURRENT_TIMESTAMP(), 100), (TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 1 HOUR), 110)",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:32.660000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "73b3a547e874aa113a5623257fd0b174217521b34d1d8189e52bbb67bf38b494",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "027cb80d-d2f8-4ef7-931b-c2ba70d0acb1",
+      "statement_type": "INSERT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "base_table"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "create or replace table _smoke_test_db_tmp_tables.tmp_table as (select * from smoke_test_db.base_table)",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:35.205000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "ee37a62a711cf6cb094c22761f49fa81f62e9a623d6425274a549be1425e3d59",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "47449db3-409f-4518-95fb-bbe986ff82cc",
+      "statement_type": "CREATE_TABLE_AS_SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_smoke_test_db_tmp_tables",
+        "table_id": "tmp_table"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "create or replace table smoke_test_db.lineage_from_tmp_table as (select * from _smoke_test_db_tmp_tables.tmp_table)",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:37.731000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "3a15c1815163f7fc6696fbb4e8e2725246d7ac93a876bf4743a10b22775d3188",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "b583ade6-98f9-4323-909e-4b16678f7aaf",
+      "statement_type": "CREATE_TABLE_AS_SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "lineage_from_tmp_table"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "_smoke_test_db_tmp_tables",
+          "table_id": "tmp_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc2023\"\n                AND last_modified_time >= 1724236058040\n                AND last_modified_time <= 1724322458040\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:38.597000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "953e6ea0-99b4-43dc-b27a-5eefa8cfb1ca",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon77d4fd91_539c_4f4e_9fee_b78ad8c277ea"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:39.259000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "92088ca0-f8a7-416b-a6c9-dbfc734d59a6",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon60e011141b8e3c85fb386e55d995a8290fc3a0896c26ac6d5717f14f5f163947"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:39.633000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "ef29f16d-9db8-47fc-bc3a-fdc11fdbd138",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:40.178000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "c572ae0c-c77d-4f72-9284-be1b1fa8d401",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:40.256000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "0d12200c-aefe-42cf-92b9-c3e728cc5e2c",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon60e011141b8e3c85fb386e55d995a8290fc3a0896c26ac6d5717f14f5f163947"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "create or replace table smoke_test_db.lineage_from_base as (select * from smoke_test_db.base_table)",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:40.257000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "ea4879ec408f01bb2e055212f9e42e239a2ab9414230d4e471a41684924f9408",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "9ac780d2-ce9a-487e-b5b0-fa50c534600f",
+      "statement_type": "CREATE_TABLE_AS_SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "lineage_from_base"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc2023\"\n                AND last_modified_time >= 1724236060301\n                AND last_modified_time <= 1724322460301\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:40.824000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "60d848ac-1fcd-4def-a81b-c08b0166b5c5",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon5af5d332_c8eb_4525_a078_3c31668e4a6b"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:41.442000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "9eb7efff-67d8-48e4-a4dd-73e7a72e6ce5",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb22d0d582afd566e08144b196aec36622576fdf25b6e74a35e044a5b720ce191"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:41.535000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "78284ace-bd28-4a53-a476-cfc86db51919",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonbafa243d_7625_4485_a27d_6ca94e711867"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:42.038000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "29cb5356-e155-4f88-b79b-d9d7bb2ff47f",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:42.191000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "bf6998d0-0984-4d09-80c2-d6167f0bd5be",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:42.281000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "4274ea3c-97f4-46eb-95f7-57f801b9643f",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anona67fc478_bd01_4230_9fbd_ec017a318330"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            create or replace view smoke_test_db.view_from_table\n            as (select * from smoke_test_db.base_table)\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:42.741000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "bf437f8369258ddb78cc9d77370a07344d0910bfa7316c8d5d3237d8134021aa",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "3dee2d9b-8a0a-4f85-a953-19bb77d6e5bf",
+      "statement_type": "CREATE_VIEW",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "view_from_table"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:43.087000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "ba08fe4a-a50c-4485-a00a-37b6eba7e98a",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE quantity < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:43.178000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "3bba8392-5644-4565-a283-01b7ef199138",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon32e6bd0458339a10581928d131db191eaea3e29936a3454e7946ed8a12f17e38"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:43.300000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "b88614c8-d56f-42fd-8d33-0bbdf082e396",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc\"\n                AND last_modified_time >= 1724322061794\n                AND last_modified_time <= 1724322463023\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:43.523000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "cebf6f8d-bb13-41ef-816d-9292eac62cc5",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anondf074cd5_822f_45ff_aa5a_cb4d4d69b71b"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            create or replace view smoke_test_db.view_from_view_on_table\n            as (select * from smoke_test_db.view_from_table)\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:44.098000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "a3ad3488cc0978b7fad948192fdde83bf669a9fd49ab3c296181e115cbdba713",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "d398a69a-f4ba-4e81-b591-871152fb9a03",
+      "statement_type": "CREATE_VIEW",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "view_from_view_on_table"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:44.456000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "5bbb3cfd-a62c-4a36-b15f-a207d89e2c62",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:44.791000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "55dabfc7-a89e-47a6-a065-965c6dafb47e",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon60e011141b8e3c85fb386e55d995a8290fc3a0896c26ac6d5717f14f5f163947"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            create or replace table smoke_test_db.table_from_view\n            as (select * from smoke_test_db.view_from_table)\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:45.459000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "047ae44f589ae98693f8b355b284d052dcaac235ff30bdf8df5b89316ab1efd0",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "0b71e40e-fe16-4f70-8173-db68f89787e3",
+      "statement_type": "CREATE_TABLE_AS_SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "table_from_view"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:45.555000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "dcf62ed3-098b-4e8f-afd0-62297db76b05",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:46.821000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "56ee02b5-9e75-4acd-be96-19aee59af431",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon14ea5eb6_003f_40a7_ad6f_44dd1bad7026"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            create or replace table smoke_test_db_2.table_from_other_db\n            as (select * from smoke_test_db.base_table)\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:47.835000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c4b56402d62a63135c5f0e81e4f6391670485bd46d355fdb0a4ce31884a170c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "ea311635-bb0a-4216-a68d-81bc87ec6e89",
+      "statement_type": "CREATE_TABLE_AS_SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db_2",
+        "table_id": "table_from_other_db"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            create snapshot table if not exists smoke_test_db.snapshot_from_table\n            clone smoke_test_db.base_table\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:50.147000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "27ac78089e13c8ae1c71126ad4036cbba12a0656fe1453f23d55c49202a70a06",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "bd00bc76-81b9-4a1c-8bc9-f28e333cdae4",
+      "statement_type": "CREATE_SNAPSHOT_TABLE",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "snapshot_from_table"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            create or replace view smoke_test_db.view_from_snapshot_on_table\n            as (select * from smoke_test_db.snapshot_from_table)\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:51.500000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "d61201ebb9413c74be7a18d33ef712d7a5488bca765977cb311513faff92e4d7",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "12ed5ed0-38c6-428c-99d0-d230b140dd1f",
+      "statement_type": "CREATE_VIEW",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "view_from_snapshot_on_table"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "snapshot_from_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            create or replace table smoke_test_db.table_from_view_and_table\n            as (select b.date_utc, v.revenue from smoke_test_db.base_table b, smoke_test_db.view_from_table v)\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:52.836000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "dd07587f59ed3d65b092bfb66fe8079129f780a0d9c8b530d1ea8ae868ef7c3e",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "955a444b-e9ef-44e4-9cc6-2a93e16a8eb0",
+      "statement_type": "CREATE_TABLE_AS_SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "table_from_view_and_table"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "drop MATERIALIZED VIEW if exists smoke_test_db.materialized_view_from_table",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:55.572000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "246765bb1a63ff4a6550373a2dc1f31070f1247be8db662f42a6fcf27073e9da",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "script_job_7ca68f4489c9b94df86a90933cfa7886_0",
+      "statement_type": "DROP_MATERIALIZED_VIEW",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "materialized_view_from_table"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "create MATERIALIZED VIEW smoke_test_db.materialized_view_from_table as (select * from smoke_test_db.base_table where revenue>100)",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:56.091000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2184be1599060a6740d129b60172096d22107b42fc1634bf052db04b4d4f259b",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "script_job_034cd994c0ae9fb720f91dabfde3149b_1",
+      "statement_type": "CREATE_MATERIALIZED_VIEW",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "materialized_view_from_table"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            create or replace table `gcp-staging-2.smoke_test_db_3.base_table_2` (date_utc timestamp, revenue INTEGER);\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:57.705000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "0e636e8703fba1cb8b4bef2404e090c291e848a02324043c086a918264620640",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "dd349313-36b1-4607-914c-94df425773a2",
+      "statement_type": "CREATE_TABLE",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "smoke_test_db_3",
+        "table_id": "base_table_2"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            create or replace table `gcp-staging.smoke_test_db.table_from_another_project` as (select * from `gcp-staging-2.smoke_test_db_3.base_table_2`);\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:27:58.955000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "30362bb4bca3c47a23d588a26faddc8b276bb70e9f38685b4d91bffe0ad955d4",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "f4971ee8-f969-4d7c-8744-7b4ce66c29b4",
+      "statement_type": "CREATE_TABLE_AS_SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "table_from_another_project"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_3",
+          "table_id": "base_table_2"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            create or replace table `gcp-staging-2.smoke_test_db_3.derived_table` as (select * from `gcp-staging-2.smoke_test_db_3.base_table_2`);\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:01.569000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "fd4278ccffdd4f56c411be3c09ed78d09776f8985d2b450d1e724dca39869d33",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "5a335e2b-0a28-4ac6-9138-c103ad3193bc",
+      "statement_type": "CREATE_TABLE_AS_SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "smoke_test_db_3",
+        "table_id": "derived_table"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_3",
+          "table_id": "base_table_2"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            create or replace view smoke_test_db.view_from_multiple_tables\n            as \n            (\n                select a.date_utc, a.revenue, b.revenue as revenue2, c.revenue as revenue3 \n                from \n                    smoke_test_db.base_table a\n                left join \n                    smoke_test_db.lineage_from_base b \n                    on a.date_utc = b.date_utc \n                left join \n                    smoke_test_db_2.table_from_other_db c \n                    on b.date_utc = c.date_utc \n            );\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:04.293000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "fe631cb81007f8ae1cb9cc51e80a57cba7d21f876ebd8c3791708468d0497496",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "8fa83df5-e0ca-449e-a11e-4f5789e67e8e",
+      "statement_type": "CREATE_VIEW",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "smoke_test_db",
+        "table_id": "view_from_multiple_tables"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "materialized_view_from_table"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "lineage_from_base"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db_2",
+          "table_id": "table_from_other_db"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            create or replace table `gcp-staging-2.smoke_test_db_4.sharded_table1_20230101` OPTIONS(description=\"Description of sharded table ending with _yyyyMMdd\") as (select * from `gcp-staging.smoke_test_db_2.table_from_other_db`) ;\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:05.618000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "04834ed24134c3a61000b5df49c6b4a99db596b9f7535894922a06d050d4d084",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "def72ad2-7f1e-4d39-a2d9-e2e49984dd9a",
+      "statement_type": "CREATE_TABLE_AS_SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "smoke_test_db_4",
+        "table_id": "sharded_table1_20230101"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db_2",
+          "table_id": "table_from_other_db"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            create or replace table `gcp-staging-2.smoke_test_db_4.sharded_table1_20230201` OPTIONS(description=\"Description of sharded table ending with _yyyyMMdd\") as (select * from `gcp-staging.smoke_test_db_2.table_from_other_db`);\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:08.551000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "23d48cd9268ba14ba5274cc16188f5504efa64b022cc83c877f734b69c398d02",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "1647e16c-5a81-4b25-852f-ae08e25c18b4",
+      "statement_type": "CREATE_TABLE_AS_SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "smoke_test_db_4",
+        "table_id": "sharded_table1_20230201"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db_2",
+          "table_id": "table_from_other_db"
+        }
+      ]
+    }
+  },
+  {
+    "query": "insert into `gcp-staging-2.smoke_test_db_4.sharded_table1_20230201` values (CURRENT_TIMESTAMP(), 100)",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:11.425000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "0238bbbbabf55ab3543b48a129753ee1726ccce34ab30e79d1eb1278f75723dc",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "ede91fe9-615f-4877-86b6-65211b1c16d7",
+      "statement_type": "INSERT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "smoke_test_db_4",
+        "table_id": "sharded_table1_20230201"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_4",
+          "table_id": "sharded_table1_20230201"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n          CREATE  or REPLACE TABLE\n            `gcp-staging-2.smoke_test_db_4.table_with_ingestion_time_partition` (transaction_id INT64)\n          PARTITION BY\n            _PARTITIONDATE\n            OPTIONS (\n              description = \"Description of Ingestion time partitioned table\",\n              partition_expiration_days = 3,\n              require_partition_filter = TRUE);\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:15.660000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "3fe79bd659d7bb81ebc0f005eff68e9f3dc037c2383b3109369871192d708a40",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "07f61a59-999e-4cad-b5d2-e36f3efc3e1c",
+      "statement_type": "CREATE_TABLE",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "smoke_test_db_4",
+        "table_id": "table_with_ingestion_time_partition"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n          CREATE or REPLACE TABLE `gcp-staging-2.smoke_test_db_4.table_with_integer_range_partition` (customer_id INT64, date1 DATE)\n          PARTITION BY\n            RANGE_BUCKET(customer_id, GENERATE_ARRAY(0, 100, 10))\n            OPTIONS (\n              description = \"Description of Integer Range partitioned table\",\n              require_partition_filter = TRUE);\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:17.080000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "a8567cfec7bc0c2c17aae4266a7d8f01d5f2d3fa720a620ab5bafafc79fa2971",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "35c66a87-c24d-4a84-aaa7-02ad67c7924e",
+      "statement_type": "CREATE_TABLE",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "smoke_test_db_4",
+        "table_id": "table_with_integer_range_partition"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n          CREATE OR REPLACE TABLE `gcp-staging-2.smoke_test_db_4.table_with_nested_fields` (\n            id STRING,\n            first_name STRING OPTIONS(description = \"First name\"),\n            last_name STRING OPTIONS(description = \"Last name\"),\n            dob DATE OPTIONS(description = \"Date of birth\"),\n            addresses\n              ARRAY<\n                STRUCT<\n                  status STRING,\n                  address STRING OPTIONS(description = \"Full Address\"),\n                  city STRING,\n                  state STRING,\n                  zip STRING,\n                  numberOfYears STRING>>\n          ) OPTIONS (\n              description = 'Example name and addresses table');\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:18.418000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "590b097235695f628515f838f96c71e86b2d763bf480ab07a67700023885b250",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "6ce6ff3a-80e3-4766-84cf-d285a86ea704",
+      "statement_type": "CREATE_TABLE",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "smoke_test_db_4",
+        "table_id": "table_with_nested_fields"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc2023\"\n                AND last_modified_time >= 1724236098639\n                AND last_modified_time <= 1724322498639\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:19.276000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "24336324-7714-4ab2-95f4-243f5e54950f",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonf4cce75c_4c8c_4ef2_802e_0f6700b6f877"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            create or replace table `gcp-staging-2.smoke_test_db_4.derived_table_from_sharded_table` as (select * from `gcp-staging-2.smoke_test_db_4.sharded_table1_20230101`);\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:20.148000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "466ee2217419c64f1bdcf7d693317f73a6cbef15abb6424711b990a78d5e3273",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "0d6a54d2-102a-418f-a8fe-25cfac92abbe",
+      "statement_type": "CREATE_TABLE_AS_SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "smoke_test_db_4",
+        "table_id": "derived_table_from_sharded_table"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_4",
+          "table_id": "sharded_table1_20230101"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:21.530000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "89b073c2-bf2b-49b1-a983-9589de5ec524",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb22d0d582afd566e08144b196aec36622576fdf25b6e74a35e044a5b720ce191"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            create or replace table `gcp-staging-2.smoke_test_db_4.derived_table_from_wildcard_table` as (select * from `gcp-staging-2.smoke_test_db_4.sharded_table1_*`);\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:22.689000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "bb9db7b8cca0e55c5fcc8a5ced32d780886c6eb052b022731b33b42f852cc0c9",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "2b1929cc-ad64-44f6-9069-e9afbaa3ef2a",
+      "statement_type": "CREATE_TABLE_AS_SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "smoke_test_db_4",
+        "table_id": "derived_table_from_wildcard_table"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_4",
+          "table_id": "sharded_table1_*"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:23.898000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "0a7899cf-c0ac-4e67-8733-ed6374e7f920",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon2f4ead4a_d35d_445d_8819_ed92bc8748cf"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:24.028000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "4f04684e-202e-4afe-b4df-f813d0925999",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:25.181000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "e7014fff-ef9e-4008-88c2-41b5b15c96af",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:25.260000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "6266127d-3d3b-4393-97f6-0725079c9f0a",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonf31236fd_fb12_4e4d_9bdf_47983e7013f6"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            create or replace table `gcp-staging-2.smoke_test_db_4.derived_table_from_external_table` as (select * from `gcp-staging-2.smoke_test_db_4.external_table_us_states`);\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:25.477000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "bda343fa9d8839d698b5e4c92352f6a2e4f9788c6302a972e1177fe50f8be872",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "3f8a74d1-a74b-4757-a1ae-7ee12580be0f",
+      "statement_type": "CREATE_TABLE_AS_SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "smoke_test_db_4",
+        "table_id": "derived_table_from_external_table"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_4",
+          "table_id": "external_table_us_states"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc\"\n                AND last_modified_time >= 1724322464301\n                AND last_modified_time <= 1724322504931\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:25.508000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "b5fa72b4-4bf8-4ff2-86fc-0e6f762160a7",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon1d72692a_44df_4f8c_9b1c_6aae8a38a887"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE quantity < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:26.413000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "74775f70-cbaa-43b5-8136-a9185f5cec66",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon32e6bd0458339a10581928d131db191eaea3e29936a3454e7946ed8a12f17e38"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:26.413000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "dcd0881c-4027-4585-ae64-95e2efc891a1",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:26.850000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "64aadd1d-2596-4600-9452-f67af261c0ea",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb22d0d582afd566e08144b196aec36622576fdf25b6e74a35e044a5b720ce191"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:27.362000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "8dfe3671-cfac-4bbf-bf17-325bd9a13aa0",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc2023\"\n                AND last_modified_time >= 1724236106863\n                AND last_modified_time <= 1724322506863\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:27.443000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "9b8500cf-1c04-4c1e-8a13-e15577e67641",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonc9084373_367a_4390_af54_16f619797096"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:28.030000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "1c014139-8f13-46b9-b440-27259f3b7701",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:28.141000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "a8a83a53-e200-4205-8e30-73d11c149e44",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon60e011141b8e3c85fb386e55d995a8290fc3a0896c26ac6d5717f14f5f163947"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            create or replace table `gcp-staging-2.smoke_test_db_4.derived_table_from_timetravelled_table` as (\n                    SELECT *\n                    FROM `gcp-staging.smoke_test_db.base_table`\n                    FOR SYSTEM_TIME AS OF TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 1 HOUR)\n            );\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:28.214000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "d8fba9ffc7dad8c86eded34dcaf16829629501451411380ec17084a1e2d38432",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "e4aa2fb4-56b5-4515-a50d-75ec31794ff2",
+      "statement_type": "CREATE_TABLE_AS_SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "smoke_test_db_4",
+        "table_id": "derived_table_from_timetravelled_table"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table@1724318908218"
+        }
+      ]
+    }
+  },
+  {
+    "query": "CREATE TABLE `gcp-staging-2.smoke_test_db_4.destination_table_of_select_query` AS\n                (\n                    SELECT * FROM `gcp-staging.smoke_test_db.base_table`\n                )",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:30.656000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "e9226e326a20c90425b04cd42358663c8446312d0d8dadf78b177ab708d92343",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "6486765d-2753-477f-9e11-cfcfb6407c8c",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "smoke_test_db_4",
+        "table_id": "destination_table_of_select_query"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "materialized_view_from_table"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE quantity < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:31.305000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "d02b0ba9-0c04-47ce-82ae-dd2686458739",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon32e6bd0458339a10581928d131db191eaea3e29936a3454e7946ed8a12f17e38"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:32.614000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "a71ddace-2595-4b3f-a677-258b46409f65",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anone859c132_30c8_476f_8be3_8f7882e8c4d7"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:33.038000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "f78b5ce5-713b-4898-b13f-91b6304c2cce",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging.customer_demo.__TABLES__\n            WHERE table_id=\"purchase_event\"\n                AND last_modified_time >= 1692786512601\n                AND last_modified_time <= 1724322512601\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:33.155000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "c4076a26606e9f6d6b9fde2855758ba67b1155b110a65f72cf1999fa1facdfa4",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "87f27258-3890-47d3-97da-75151c67d647",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon6599dcd6_73ba_42e7_b0a3_d9a5985a4ddd"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "customer_demo",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging.smoke_test_db.base_table",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:34.004000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "376701d9b1677febe3189c534c475310e79dd893ac7759e42f59433240d3a83b",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "139c0fa9-cc67-4ec4-85cf-1b9a231f4179",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonac9eceea_3ec8_4740_905e_eeab3bc9b91d"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "materialized_view_from_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc2023\"\n                AND last_modified_time >= 1724236114344\n                AND last_modified_time <= 1724322514344\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:34.896000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "9f864017-5753-4a2e-b2cc-53ac789dd9ea",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonf6b6eab6_7da6_451b_923e_cd310a5df0eb"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:36.387000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "a915c600-d661-432c-9236-df37a7c65c1e",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb22d0d582afd566e08144b196aec36622576fdf25b6e74a35e044a5b720ce191"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging.customer_demo.__TABLES__\n            WHERE table_id='purchase_event';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:36.511000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "8aed7604ce6319236cca0b0f7d16614774821c2666f5cf6f5be2cec702026d64",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "8d362768-c6e9-42ee-bbaf-3b114a32d827",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon3c7a5401_2635_4e79_b452_21ede12dacf2"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "customer_demo",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:37.586000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "450d30ee-719e-43c2-b9f0-4ef252080b54",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon60e011141b8e3c85fb386e55d995a8290fc3a0896c26ac6d5717f14f5f163947"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT\n  (SUM(CASE WHEN amount BETWEEN 0 AND 10 THEN 1 ELSE 0 END) * 100.0) / COUNT(*) AS percentage_in_range\nFROM\n  gcp-staging.customer_demo.purchase_event;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:38.119000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "43486ae9-5d58-47a0-98e0-7a064aa634b5",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anondaaf8a98bb16f9b4fd4e7f6ada08bac86581b8e2a25e55399914c155fd8566b7"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging.smoke_test_db.partition_test",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:38.956000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "43b7b24e1b461dd151b2fa4f3e9ff9d4f03f831dfff20b1d7016686d9ac29e7c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "12049165-b270-4f94-9531-03542fc9f680",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anond6b394e5_9ab5_4d08_a48c_9826e78e05ef"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging.smoke_test_db.lineage_from_tmp_table",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:42.802000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "a5460497edcdd62d40807fd1810005e02b13b930fe560570e16a6a652854390b",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "477cc9dd-ffca-4352-a8ed-ebd1e7c54967",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon00c98d0b_6cbc_4752_8a0b_d0f5bff232fb"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "lineage_from_tmp_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging.smoke_test_db.lineage_from_base",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:45.871000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2a4f4d44119c98882739e7d1360a5544c0a4b95a45198f789ac1c6efdf3d7e10",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "6c29d65a-fb33-4805-bd32-4a9e00ceee68",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon37cb5eae_6fb4_4f80_a2b5_dcdf18293e5b"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "lineage_from_base"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging.smoke_test_db.view_from_table",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:48.915000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "c039e0e092bcd3150010cddee2a172af283951c43db68caf513593e4f552be28",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "6f142a0e-d71c-40f7-9b76-70080d55638f",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon0026b3be_d07b_4302_b7ca_fe6c2b3ce150"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "materialized_view_from_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging.smoke_test_db.view_from_view_on_table",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:52.005000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "3dd24342ec0b26c692285908192e7eb6ad5e38f25816bce80405c57acc109c0f",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "6b9755dd-e5e4-4c06-b850-72b02a0c583d",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon264bee95_5a2e_411d_971d_3b15c65475c0"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "materialized_view_from_table"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging.smoke_test_db.table_from_view",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:55.333000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "4c08bebf0f438dcb4fda1eb2cb02e41ff216ee613eb9ffcc8a9e01dffd1f5d85",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "978ee15e-fc5f-4464-a288-4a588d10a72b",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon57c90059_bdfe_4f67_a482_8423f135abd5"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "table_from_view"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging.smoke_test_db.table_from_view_and_table",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:58.350000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "fc92290f2da155cba009370357576469c7262cff1fd4b521399e8b555fb9457e",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "762a642a-9d71-4ffd-a0af-f1a6f0843643",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon32470674_7f5e_4d81_875c_08afdc7ee994"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "table_from_view_and_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:00.852000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "0ce60fad-0590-4b9d-a333-c0651033c162",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:01.249000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "9e9dcf86-6712-4981-a7a8-7abff832a52b",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4765d310_ebab_49c6_8edb_2a8b5610bc41"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging.smoke_test_db.materialized_view_from_table",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:01.401000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "24ffb91f53691b2b9082fc4582d5836ec8501613821b7de7dda75b0b7b918881",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "cd5b5b95-41ad-4451-b9c8-f7eedc134b22",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon2173da01_0669_4d20_9814_155ccaf243a7"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "materialized_view_from_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:01.448000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "ed85e89b-173a-4acc-8e38-56ac85b501a9",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging.smoke_test_db.view_from_multiple_tables",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:04.870000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "58cdaed9da9d3cd837048b70d7d48fa485483cb5e85755803feb28c30aefc800",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "cb16a84f-23e3-48f1-9cbd-cd6c1ae2ccdb",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anone6b9ea5f_d7b2_4d88_bce8_67813e1297be"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db_2",
+          "table_id": "table_from_other_db"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "lineage_from_base"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "materialized_view_from_table"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging.smoke_test_db_2.table_from_other_db",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:08.392000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "8073f5c704e675d8c4383a750c2c88da65437a38e28a1f7f06f1162531d544a9",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "13b0be99-04e9-40e9-80fb-3ca54815bcc0",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon02c064af_8ff6_41f5_9a59_ad6b45254529"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db_2",
+          "table_id": "table_from_other_db"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging-2.smoke_test_db_3.base_table_2",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:11.240000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "cad2086113da8705258cfb5e0531e75d26aeccc85ddbf774c18121bb8716af7a",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "ab261d82-f178-44bc-8f16-135a2b7698f0",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon0bf48c7f_6413_4559_9fdd_dc4f0be48c47"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_3",
+          "table_id": "base_table_2"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:11.898000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "107b0124-7754-4d72-8e50-3ed562afdeb7",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb22d0d582afd566e08144b196aec36622576fdf25b6e74a35e044a5b720ce191"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:13.829000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "be2fc0f0-13be-44ad-a77c-2d81391f206c",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon60e011141b8e3c85fb386e55d995a8290fc3a0896c26ac6d5717f14f5f163947"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging.smoke_test_db.table_from_another_project",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:14.152000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "22c18f1bdf759bab7dcd2f26b3b66cc62ce9a7aa861237a5a790437958bf5316",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "573cbacd-aee3-4655-a44c-1d721bcb49ed",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonc7614baf_c661_4d17_aba2_f7b43763a7e2"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "table_from_another_project"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc2023\"\n                AND last_modified_time >= 1724236154390\n                AND last_modified_time <= 1724322554390\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:14.876000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "7a627727-a4da-45fa-b504-147ea8f7fcf8",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonf45b3a81_0bc1_413b_b39f_04a62fdf41b7"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging-2.smoke_test_db_4.sharded_table1_20230101",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:17.063000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "691a01378badc5f66308c9cd67305ff487ab5b1208c9cef4fd0e7b0d12401e72",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "a2089528-786c-4cde-b87b-61a88a17d7fa",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anone3b99b14_5cf1_4a38_97a5_b435d004fcc8"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_4",
+          "table_id": "sharded_table1_20230101"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:17.577000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "9f167fab-f7db-4cce-82d7-8e97c890d9ec",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon60e011141b8e3c85fb386e55d995a8290fc3a0896c26ac6d5717f14f5f163947"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE quantity < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:18.636000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "3098ddd6-b6a3-45a2-9905-8521bea14486",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon32e6bd0458339a10581928d131db191eaea3e29936a3454e7946ed8a12f17e38"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc2023\"\n                AND last_modified_time >= 1724236157888\n                AND last_modified_time <= 1724322557888\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:18.676000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "91631d91-6208-4f60-9ba7-8cfe67cb4185",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anoncaea99c4_c2ca_465a_984a_07a359657b86"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:18.692000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "f93e3148-9c20-4ccb-b7a5-f5608a39a877",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb22d0d582afd566e08144b196aec36622576fdf25b6e74a35e044a5b720ce191"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging-2.smoke_test_db_4.sharded_table1_20230201",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:20.058000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "f1d54aed9c1d03837b735a53385cb93c1eabff91aa33fa99dfa8d9e7e5ec1ff7",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "8e1d105a-52f3-46f9-a4b5-4baa374e4daf",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon01dc59e0_2426_4a26_aa38_abe2a1c214ec"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_4",
+          "table_id": "sharded_table1_20230201"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc2023\"\n                AND last_modified_time >= 1724236161244\n                AND last_modified_time <= 1724322561244\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:21.866000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "6177dad2-5bb9-4512-84da-5a606a8ecde0",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anona85c4226_4415_4833_bd70_f3509f3b647d"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:22.992000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "f7eac38f-48ec-4f63-8879-1a0ce02e9474",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon60e011141b8e3c85fb386e55d995a8290fc3a0896c26ac6d5717f14f5f163947"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "select revenue, date_utc from `gcp-staging-2.smoke_test_db_4.sharded_table1_*`",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:23.212000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "a394d7e82168ab8dd90e6ff402fa06f3a3043be775803f3831477534a444e421",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "a5707bee-8e81-46a3-a714-9c65347f2258",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonf0916716_a817_4feb_9357_09b7219c0890"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_4",
+          "table_id": "sharded_table1_*"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select revenue from gcp-staging.smoke_test_db.partition_test t\n    where cast(t.date_utc as DATE) < (select max(date_utc) from gcp-staging.smoke_test_db.partition_test)\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:26.682000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "3a774cee689b0b7d4d3d1268ec5a7ea5c32f5ae16be5b452786b82b528599e74",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "0b0ac8b9-c9a8-461a-99b1-4408c2468e3d",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon128ef087_3e96_433e_a49c_7c3dbeda89f9"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select extract(month from date_utc) month, count(*) count, sum(revenue) gross from gcp-staging.smoke_test_db.partition_test\n    group by month\n    order by gross\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:28.369000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "9b6d48846141019d32c4c9f2660f49c8ea9659ef1c530fa14e3e1b831553d100",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "e7455bfd-9fea-409c-82a0-259088e942a4",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon441d7e56_e71e_4184_b282_50122f28ab8f"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select revenue from gcp-staging.smoke_test_db.partition_test t\n    where cast(t.date_utc as DATE) < (select max(date_utc) from gcp-staging.smoke_test_db.partition_test)\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:29.856000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "3a774cee689b0b7d4d3d1268ec5a7ea5c32f5ae16be5b452786b82b528599e74",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "032ad33c-8d21-4fe0-8013-e7f4bfef7b91",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anona0ecfb8a_d416_41c5_92c7_ddeb71cc3872"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select extract(month from date_utc) month, count(*) count, sum(revenue) gross from gcp-staging.smoke_test_db.partition_test\n    group by month\n    order by gross\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:31.415000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "9b6d48846141019d32c4c9f2660f49c8ea9659ef1c530fa14e3e1b831553d100",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "b7eab270-0938-40f2-b2c7-9608feb71219",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon1f7efd21_bc80_4a18_b307_46415df75599"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select revenue from gcp-staging.smoke_test_db.partition_test t\n    where cast(t.date_utc as DATE) < (select max(date_utc) from gcp-staging.smoke_test_db.partition_test)\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:33.082000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "3a774cee689b0b7d4d3d1268ec5a7ea5c32f5ae16be5b452786b82b528599e74",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "68f63699-3ed3-4b36-b956-a38f9f72d721",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon2a405ce1_4a34_45c2_b741_eb862f9bd688"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select extract(month from date_utc) month, count(*) count, sum(revenue) gross from gcp-staging.smoke_test_db.partition_test\n    group by month\n    order by gross\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:34.811000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "9b6d48846141019d32c4c9f2660f49c8ea9659ef1c530fa14e3e1b831553d100",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "83e0e55f-be23-422c-a741-88253937e178",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anona86a38fe_7ba8_4625_bd80_08b83836dc74"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select revenue from gcp-staging.smoke_test_db.partition_test t\n    where cast(t.date_utc as DATE) < (select max(date_utc) from gcp-staging.smoke_test_db.partition_test)\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:36.374000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "3a774cee689b0b7d4d3d1268ec5a7ea5c32f5ae16be5b452786b82b528599e74",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "98c3b073-7686-4c4e-9f12-fb18d9d084f5",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonced0b673_cde3_4a7e_85fb_b14a3f15729d"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select extract(month from date_utc) month, count(*) count, sum(revenue) gross from gcp-staging.smoke_test_db.partition_test\n    group by month\n    order by gross\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:37.890000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "9b6d48846141019d32c4c9f2660f49c8ea9659ef1c530fa14e3e1b831553d100",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "aa89ab39-11e7-45ce-b9fd-181e8f16843d",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon551db81a_c63c_40b3_b8d5_4ecceabe1c68"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select revenue from gcp-staging.smoke_test_db.partition_test t\n    where cast(t.date_utc as DATE) < (select max(date_utc) from gcp-staging.smoke_test_db.partition_test)\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:39.451000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "3a774cee689b0b7d4d3d1268ec5a7ea5c32f5ae16be5b452786b82b528599e74",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "c955f68d-7d2e-4c8d-978b-1b51496390d2",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anone845e07d_3c57_4dad_930c_c9c2eb4e27ad"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select extract(month from date_utc) month, count(*) count, sum(revenue) gross from gcp-staging.smoke_test_db.partition_test\n    group by month\n    order by gross\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:41.032000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "9b6d48846141019d32c4c9f2660f49c8ea9659ef1c530fa14e3e1b831553d100",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "4d279f45-7b97-45f8-a263-88e2d8f31bf0",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon6b4e215f_b542_4941_9274_3ba107aa4955"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select value from gcp-staging.smoke_test_db.usage_test",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:47.575000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "18deb4c7e128343b7ecc2cf59b9c9a06f96d2ce4e66b33bcd2b5c26899d6b9b5",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "1bea24f3-644e-4dd4-98d4-5f74d3d3e6d3",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon91770d44_60b5_4727_8f2c_1a4f7ab92866"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "usage_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select value from gcp-staging.smoke_test_db.usage_test",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:50.777000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "18deb4c7e128343b7ecc2cf59b9c9a06f96d2ce4e66b33bcd2b5c26899d6b9b5",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "1d670ea7-1e10-4952-8beb-5fe77bb8f22e",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb0bc3965_5bee_4284_92f8_32e838db3f2a"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "usage_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select value from gcp-staging.smoke_test_db.usage_test",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:54.074000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "18deb4c7e128343b7ecc2cf59b9c9a06f96d2ce4e66b33bcd2b5c26899d6b9b5",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "3eb125df-feca-44c0-9896-326b6c34a3bf",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anone59747e9_b4ff_4ccc_b8ba_f3f92eb85f44"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "usage_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select * from gcp-staging.smoke_test_db.usage_test",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:57.066000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "553f645d24478a4dd699b8deba3a900f3a8907f53105a104f543d08aaef22930",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "13e496a2-3160-4bb2-b5d6-b81d61303d8a",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon411f6440_ee8b_4fbe_83f1_e4c99b930da7"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "usage_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:58.963000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "19af6f98-b709-47dc-8358-14e2dcc91894",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb22d0d582afd566e08144b196aec36622576fdf25b6e74a35e044a5b720ce191"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "select * from gcp-staging.smoke_test_db.usage_test",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:00.076000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "553f645d24478a4dd699b8deba3a900f3a8907f53105a104f543d08aaef22930",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "aa6811f2-bfea-4ec3-a7b5-9d70f0475706",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon42e59724_9567_47eb_aa95_c1ec7418902b"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "usage_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:01.034000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "152ed309-796b-4177-b082-82010a4f7e08",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb22d0d582afd566e08144b196aec36622576fdf25b6e74a35e044a5b720ce191"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:02.137000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "a1a22c15-873b-453f-80d0-b82b6391d360",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonc5692ab6_b9b1_4294_adaf_9bc23e242801"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:02.168000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "4e603b0a-2c6d-4c32-acde-0646f680a84f",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:02.202000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "8c807377-da03-4a71-bb46-a191792ff0bf",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc\"\n                AND last_modified_time >= 1724322506419\n                AND last_modified_time <= 1724322600205\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:02.282000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "0502a1a5-bb81-4926-96ca-c6dbf496f3d7",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon02406632_13ec_4bb5_8272_9241dc8485cf"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select extract(month from date_utc) month, count(*) count, sum(value) total from gcp-staging.smoke_test_db.usage_test\n    group by month\n    order by total\n    ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:02.823000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2619b42bcfd850c2f6df3a72e3b4e53a635a7169d09facdfa4269366f3a48280",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "2f1c758f-62a5-45ba-9d2e-769bed74a333",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon8af21009_09ce_4944_a5ad_6a57c73352f1"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "usage_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select name, post_abbr from `gcp-staging-2.smoke_test_db_4.external_table_us_states`\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:05.248000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "508134047ff2cc6a25ed279ebf1541b1681e0cb7eb22e1cfacd9fd5a51c8efd6",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "2e204e78-a2a1-4b5f-90f2-a0a6662cd4b1",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon28991a9f_ae0c_4016_b1b7_7d9346528fb8"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_4",
+          "table_id": "external_table_us_states"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    SELECT\n        first_name,\n        last_name,\n        dob,\n        addresses[offset(0)].address,\n        addresses[offset(0)].city\n    FROM        \n    gcp-staging-2.smoke_test_db_4.table_with_nested_fields\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:06.806000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "71b4e0082e4005e45c1e32199147cc5d02491a45c225065c8bbdc6576f4724ea",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "3305dfa5-708c-4955-b240-0657bcddaa04",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonfcea9c21_50a4_41c2_82bc_31e8d23874bd"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_4",
+          "table_id": "table_with_nested_fields"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select \n        transaction_id \n    from \n        `gcp-staging-2.smoke_test_db_4.table_with_ingestion_time_partition` \n    where \n        _PARTITIONDATE = CURRENT_DATE()\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:08.186000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "6711368fa67682497ba5ff5dbbce9302950b990da8951d52f83a59385e22e9ca",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "878f73b2-9ff7-4d40-b8c4-81c72de46922",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon385fe8ae_2321_4782_ac22_9be1ec64a4a2"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_4",
+          "table_id": "table_with_ingestion_time_partition"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    SELECT\n        customer_id,\n        date1\n    FROM\n        `gcp-staging-2.smoke_test_db_4.table_with_integer_range_partition`\n    WHERE\n        customer_id=1\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:09.673000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "6690a922f76f680ab004c39b375979b610546bb4fd20d498bb4a83c94ce2d476",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "cf03003b-4142-461f-b199-2edb45cda9bf",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anondcc3a621_6750_4415_95c6_7af5662e95cb"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_4",
+          "table_id": "table_with_integer_range_partition"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue, date_utc from gcp-staging.smoke_test_db.base_table FOR SYSTEM_TIME AS OF TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 1 HOUR)",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:11.320000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "1a20947e51269d384a3e3e8e33c755633f158543f56881c7906d27a3df5a99b8",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "771f3da2-a218-456e-a0a1-f22e15410442",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonc39cfdd0_cf93_4e71_98a8_1ecdad5bdad9"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table@1724319011327"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue, date_utc from [gcp-staging-2.smoke_test_db_3.base_table_2@0]",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:14.269000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "c24065c5-8f8e-4aad-a2fa-c856f517a906",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon12a7e0e3_25d3_4121_82ba_8700fa152525"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_3",
+          "table_id": "base_table_2@0"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:31:01.120000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "66e0e6f8-a780-4755-9f65-c3b51107ef96",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon471d3729_9b83_47b1_80f9_a5a41453441e"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:31:01.179000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "279851a7-44ce-477a-8200-3c52dc5d9b1a",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:31:01.192000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "98febd5c-417d-4d5b-91aa-58ebbccfa2c0",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:32:01.120000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "ecaf762e-2b22-4abb-9e67-ff6aee05c046",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:32:01.234000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "9c99e087-c5fb-4a93-bb72-852573578dbe",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anond4824d79_f127_4f96_b17f_17f67aa2859b"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:32:01.252000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "ad3a2684-c680-4509-b849-3bcc4f9a7231",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:33:00.571000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "df8f9856-3809-4b55-afc1-76087191c772",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:33:01.712000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "b8f9703c-bb4e-43f1-b701-638bacf79f50",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon3bd064cd_a083_47dc_8af1_5794e160f59a"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc2023\"\n                AND last_modified_time >= 1724236667305\n                AND last_modified_time <= 1724323067305\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:37:48.146000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "d04d3fb8-bb99-4028-b596-c951ede50ca6",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anone16d436b_d361_45f5_8b54_7f859d609acd"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:37:48.300000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "96f20c34-3956-4c47-a13b-c669fc4c7f63",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon60e011141b8e3c85fb386e55d995a8290fc3a0896c26ac6d5717f14f5f163947"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging.customer_demo.__TABLES__\n            WHERE table_id='purchase_event';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:37:48.793000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "8aed7604ce6319236cca0b0f7d16614774821c2666f5cf6f5be2cec702026d64",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "6b73759c-3f08-455b-8df2-dd1bc7dc0902",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon08572e99_180f_4e41_9323_7186634593fe"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "customer_demo",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:37:49.520000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "01a6c13e-cb18-45f4-b40a-38315a2c6430",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT\n  (SUM(CASE WHEN amount BETWEEN 0 AND 10 THEN 1 ELSE 0 END) * 100.0) / COUNT(*) AS percentage_in_range\nFROM\n  gcp-staging.customer_demo.purchase_event;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:37:49.785000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "4fad02be-37dd-4252-89f3-b4d98b674f29",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anondaaf8a98bb16f9b4fd4e7f6ada08bac86581b8e2a25e55399914c155fd8566b7"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc\"\n                AND last_modified_time >= 1724322603618\n                AND last_modified_time <= 1724323070196\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:37:50.757000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "55c62d69-99af-4040-bff8-e97fadd3cc90",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon10c6bd04_a9f1_4c8d_bcb1_a1b1f2f80a58"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:37:51.009000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "14b1ce0b-61c7-4fe9-8d9b-839ef1c3ee06",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb22d0d582afd566e08144b196aec36622576fdf25b6e74a35e044a5b720ce191"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:37:51.359000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "2e5fc864-fc67-416c-9244-448da4e82a78",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:37:51.944000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "68babe3d-54f6-45ff-8b0b-9da7911dae59",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anoncb8a32f3_1aa6_4da8_9d78_eeb08eb16661"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:37:52.220000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "b6c7bb75-35cd-4715-8773-a6abc2f300dc",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:37:53.407000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "fa4425f7-1d80-42fc-8f90-97a00df580e8",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:37:53.503000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "b23c1455-ddfa-4064-8323-d39aafb2694e",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:37:53.512000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "02810b1a-a070-4ab3-b49a-fe0be8bc99ba",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon60e011141b8e3c85fb386e55d995a8290fc3a0896c26ac6d5717f14f5f163947"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:37:53.605000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "dfa85a7f-0ff1-4e28-87a1-800574a32c61",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4f90bad8_7754_4a8e_a9f6_4b468ac7fb4d"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:37:54.799000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "7229d1dc-e6e9-4cf4-81b8-8df0152379d8",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging.customer_demo.__TABLES__\n            WHERE table_id=\"purchase_event\"\n                AND last_modified_time >= 1692787100665\n                AND last_modified_time <= 1724323100665\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:21.339000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "c4076a26606e9f6d6b9fde2855758ba67b1155b110a65f72cf1999fa1facdfa4",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "08be753d-4377-43a9-86ec-b6dd147b18a9",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb802196a_56ec_43df_9453_dc27b67fc1ee"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "customer_demo",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc2023\"\n                AND last_modified_time >= 1724236704226\n                AND last_modified_time <= 1724323104226\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:24.871000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "361a3095-dfdc-4d2d-af0b-44852398caba",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4cfceddf_4d07_43d7_8e73_61dc558b48b6"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:26.351000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "33f0ba19-1925-4063-bb6c-fea0d299f76b",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon60e011141b8e3c85fb386e55d995a8290fc3a0896c26ac6d5717f14f5f163947"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:27.315000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "f489b9ab-aa90-4ba3-8de8-2e6e2482a15a",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb22d0d582afd566e08144b196aec36622576fdf25b6e74a35e044a5b720ce191"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc2023\"\n                AND last_modified_time >= 1724236707152\n                AND last_modified_time <= 1724323107152\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:27.719000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "b5571b2d-602d-4d66-a6cd-77772f72656f",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb6690e00_3f56_44ac_8ab9_03b7c3c34bbe"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:28.175000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "c768ca60-e0cb-41dc-8bab-8117d2a8dd54",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon8cc6e9e7_16fd_490b_86e4_dc8c4b60cc22"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE quantity < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:28.678000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "327849f9-eea0-4428-89ef-7188bafafbc0",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon32e6bd0458339a10581928d131db191eaea3e29936a3454e7946ed8a12f17e38"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc\"\n                AND last_modified_time >= 1724323071874\n                AND last_modified_time <= 1724323108983\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:29.577000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "19e77df4-43aa-4ab5-85d2-e3be1621832b",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon12e0faf9_b2b4_4b8e_acd5_5bda7dc52803"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:31.050000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "4f21cc35-0ad1-451f-b087-e11e8c469a9c",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:34.897000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "886c3952-b0b6-452e-b7f1-c45ff2c24e67",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonfe55e7f9_741d_441e_a27b_47696d24ccaf"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:35.783000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "15855ee2-041f-4ab8-9b19-03b080fc884d",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:37.358000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "c88d7780-92b6-4596-8a40-cfa3db95f058",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:37.485000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "3d6d5760-9b9e-4e73-a638-17779d88233b",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:38.698000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "28199aa8-c5cb-445f-939c-73bb7f49fed7",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:38.831000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "3733cf41-b202-4a72-822d-04298d9fff57",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon8da3cafa_0dc9_4a37_a70a_d066a541b880"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:41.103000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "9ad989d5-81f0-4a2d-baaf-97064f36dde8",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb22d0d582afd566e08144b196aec36622576fdf25b6e74a35e044a5b720ce191"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:43.435000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "68aa5358-09cc-4d2f-a6a5-488c729fbbd3",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon60e011141b8e3c85fb386e55d995a8290fc3a0896c26ac6d5717f14f5f163947"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc2023\"\n                AND last_modified_time >= 1724236723957\n                AND last_modified_time <= 1724323123957\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:38:44.473000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "cae21ce5-5c2d-4151-9d35-bcdb799c9cdd",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon2fb5c10b_43b3_40e8_a854_03b63c1b3502"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:39:00.857000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "e728c245-07a0-4b19-809b-e44d173b5135",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc\"\n                AND last_modified_time >= 1724323110374\n                AND last_modified_time <= 1724323140076\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:39:00.970000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "cd4e6023-5a4c-4445-99b9-6f7aef393ff1",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anond5cc46f2_7658_4061_8aeb_b2a2dd6688a8"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:39:01.969000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "0787f7d7-a643-439b-9442-baa914362c87",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb22d0d582afd566e08144b196aec36622576fdf25b6e74a35e044a5b720ce191"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:39:02.760000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "b31aacd0-b9d7-4ef6-979a-e825fb106c96",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonaaf15c74_96c6_4bb6_91dc_e85b02790c73"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:39:02.862000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "9c823051-2be3-4c62-b393-4876ef5af734",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:39:03.200000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "03321ba7-908e-4acf-b858-648654da4249",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon60e011141b8e3c85fb386e55d995a8290fc3a0896c26ac6d5717f14f5f163947"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc2023\"\n                AND last_modified_time >= 1724236746653\n                AND last_modified_time <= 1724323146653\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:39:07.316000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "b7a3bcf4-e5da-4c8b-b61c-b7324e37823c",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon11845a49_abe5_4720_a257_1af0548c3a71"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:39:09.494000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "7ef7f8e0-f8c2-4a47-a6b5-e8ebe3fc69b2",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon60e011141b8e3c85fb386e55d995a8290fc3a0896c26ac6d5717f14f5f163947"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:39:15.149000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "cd265738-ae52-4e75-a241-682e601b7408",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb22d0d582afd566e08144b196aec36622576fdf25b6e74a35e044a5b720ce191"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc2023\"\n                AND last_modified_time >= 1724236758284\n                AND last_modified_time <= 1724323158284\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:39:18.899000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "709d978b-c616-4ccf-b0bc-46015c7ea201",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon5e97dfab_c9b9_4fb8_bf50_acb06ce77edc"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT\n  (SUM(CASE WHEN amount BETWEEN 0 AND 10 THEN 1 ELSE 0 END) * 100.0) / COUNT(*) AS percentage_in_range\nFROM\n  gcp-staging.customer_demo.purchase_event;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:39:27.170000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "5ef872bb-d3c3-4e6e-87b5-9e1838f38563",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anondaaf8a98bb16f9b4fd4e7f6ada08bac86581b8e2a25e55399914c155fd8566b7"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT COUNT(*)\n            FROM gcp-staging.customer_demo.purchase_event\n            WHERE amount < 0\n        ",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:39:28.388000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "fb84efb3-c71d-4b80-b717-863b22a0bceb",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon60e011141b8e3c85fb386e55d995a8290fc3a0896c26ac6d5717f14f5f163947"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) FROM gcp-staging.customer_demo.purchase_event WHERE user_id IS NULL",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:39:30.390000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "de5f59b1-0249-421d-90eb-5103a43b49fd",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb22d0d582afd566e08144b196aec36622576fdf25b6e74a35e044a5b720ce191"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging.customer_demo.__TABLES__\n            WHERE table_id='purchase_event';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:39:31.842000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "8aed7604ce6319236cca0b0f7d16614774821c2666f5cf6f5be2cec702026d64",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "438c4b01-ec53-421a-bc5f-d61ed1edaf7f",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon2c5c1f70_9bc9_41c4_a096_93b8bda0a0e9"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "customer_demo",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:40:01.278000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "6ee9b8d0-7767-447f-b333-55d5265d4388",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:40:01.332000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "b2ffdb5b-52cd-44b9-a2d9-38067e9cd9a4",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:40:01.488000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "bd6599fe-13b0-4fe8-8981-c307ccd4448d",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon2072d2c5_e133_4b5a_8945_5254588340a3"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc2023\"\n                AND last_modified_time >= 1724236803602\n                AND last_modified_time <= 1724323203602\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:40:04.214000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "9c6f7727-ca89-4ad3-b29f-f4cc21b195e2",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anonb0ef55ef_0e63_4138_b8c0_49b113c4ea78"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging.customer_demo.__TABLES__\n            WHERE table_id=\"purchase_event\"\n                AND last_modified_time >= 1692787205076\n                AND last_modified_time <= 1724323205076\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:40:05.684000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "c4076a26606e9f6d6b9fde2855758ba67b1155b110a65f72cf1999fa1facdfa4",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "12ffdab3-f7ce-4260-9437-80aacfb42e08",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon2ba3f5b8_331b_4fed_9985_0559a69e5bf5"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "customer_demo",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:41:00.943000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "31c7e5fd-c5d3-477b-89b8-74c57c1b0fb9",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:41:00.951000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "cfb45092-68bb-4be3-8111-dc9533c9bbe2",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon08499120_ac59_47f0_9d7a_5d3b9e2d95c2"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:41:02.520000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "e6882b25-dc5e-4d49-a916-ee09d2e4bcc6",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT AVG(amount) FROM gcp-staging.customer_demo.purchase_event",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:42:00.672000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "d916df78-aca9-4365-aa7e-32cc56929771",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4db3da963edf09d1d3e6b8dddc9f22960bb56016490ef27620acc390fcf18a27"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "SELECT COUNT(*) \nFROM gcp-staging.customer_demo.purchase_event \nWHERE amount < 0",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:42:01.938000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "08737edb-28ad-4dde-887e-c6c4054d94ef",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon84323ce6f50f99cfc5d2e8ad640f3923743cb41a6a759f18a7fce13c7a358d28"
+      },
+      "referenced_tables": []
+    }
+  },
+  {
+    "query": "\n            SELECT last_modified_time\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id=\"abc\"\n                AND last_modified_time >= 1724323141731\n                AND last_modified_time <= 1724323322589\n            LIMIT 5\n        ;",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:42:03.231000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "2c44fb03f02e7c6777499bbd1a0e15b075d39b85c2bb544223f01a9e5ce4656d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "914aafd8-5543-42d5-b21b-92df47c28268",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon4cd2e7fe_9f6f_4a6c_9c92_ff521c7caa99"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n            SELECT row_count\n            FROM gcp-staging-2.dataset_as_sharded_table.__TABLES__\n            WHERE table_id='abc';",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:42:04.926000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test",
+    "default_db": "gcp-staging",
+    "default_schema": "_SESSION",
+    "query_hash": "81bcba1019e933b2de506faf0f6549b8602519495edc855c0a9267b8d5bb976c",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "177a3d11-f04f-4819-9b67-555b3190af6a",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging",
+        "dataset_id": "_283d0dc3d7613bc3d88b6692661164402822056f",
+        "table_id": "anon2f5817f8_15ba_4df7_83c9_412d70c62fce"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "dataset_as_sharded_table",
+          "table_id": "__TABLES__"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging.smoke_test_db.base_table",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:37.386000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "39323692dfca0074ed7ac63c27830a64ce68742109e09033015b854d46be7dde",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "1b9741fb-0693-4371-acd0-e7c77a775aa0",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anona358818e_bfc6_4373_b610_778f49467cef"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "materialized_view_from_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging.smoke_test_db.partition_test",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:41.153000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "6e1d1e89de700713d87b8de79d43da4d437ca0d98a5589385104ee7b4142f922",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "c2cec833-2d60-42b0-994b-604ec92a88ae",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anonbcd279fa_10aa_422d_a999_2383b3e8c932"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging.smoke_test_db.lineage_from_tmp_table",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:44.291000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "8d3f968d2fbae03772fedb7e2dd43c2ba66ae90aa35e4824d40fd66997d51681",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "ac0b567c-b711-489e-93ea-1a4696055163",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anonc046b2fa_61f1_48da_9df1_5e517b6b1901"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "lineage_from_tmp_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging.smoke_test_db.lineage_from_base",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:47.479000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "1f52fe6a0e09ab08bb65356947420bc85f0cc1bb38557fcdc7e33a049e6b113f",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "8ea9e3a5-4ef2-4665-8ad2-c5aeaf4ce063",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anone04f0dcf_9a17_4be8_92c4_92b31811d167"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "lineage_from_base"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging.smoke_test_db.view_from_table",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:50.411000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "d0726cb4d89262a037a6d3208dfa36439952b1fa95bcb6ea35fa6c46e46d5b5a",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "1bf06f7f-1d21-413e-b26a-ca4569586cb4",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anon59fa6fb5_e019_4328_8f23_01f38f7b5e3a"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "materialized_view_from_table"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging.smoke_test_db.view_from_view_on_table",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:53.604000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "5a8d7c9836a318c4be63fcc8f38e460b12c2b070a5daa98dc2c004ff53b29c87",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "3e577d7c-7ccc-4be8-a19e-e1399fabee69",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anon6d70c7aa_a77d_402a_96e0_414de3d1c7fb"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "materialized_view_from_table"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging.smoke_test_db.table_from_view",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:56.837000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "827d388f24f2f2a7961260884a76d0e6449ba200efd12d2500ae95350c63c53f",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "35d712b5-ce79-43db-98bb-52b6363a5ef3",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anonb6ff5e62_e4b7_4f9a_8fa7_7e86d3a6a7e4"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "table_from_view"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging.smoke_test_db.table_from_view_and_table",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:28:59.969000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "e0f5980f7d9741829dc2b3183b1ea065e9f5f6e8cb7650c10eeb3398c10d4d19",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "cb805273-1313-45d0-af6d-fa6d9b3d8b56",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anon50fed9a7_008c_4405_b22f_f93efccda484"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "table_from_view_and_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging.smoke_test_db.materialized_view_from_table",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:03.069000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "59fa2d6828221cc2962cc609935bc4c94a6f3a846e94439f7ff3374bcc439b4e",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "32825ee8-28b7-4670-9296-1b67d8978bf6",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anona7c9b810_373e_4102_8b6c_74622dbddb92"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "materialized_view_from_table"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging.smoke_test_db.view_from_multiple_tables",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:06.639000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "d6239d9f32f5ddd664255bb3629824c5a099e9a0213a484174fa6af613a3bc16",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "1d8c6501-d09c-4540-b62c-0960c6ce4461",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anone4cf1322_c0a3_4178_85fe_ed3d25a86cf5"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "lineage_from_base"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db_2",
+          "table_id": "table_from_other_db"
+        },
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "materialized_view_from_table"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging.smoke_test_db_2.table_from_other_db",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:09.851000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "a5c10c32c0b05d5248e6d337d9fe607998473778b0680e392f7a93ecc7869b1b",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "95c21bb0-9a17-4dde-8198-bde46c52d98e",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anone376867c_5467_4841_803a_4a547f3ba08b"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db_2",
+          "table_id": "table_from_other_db"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging-2.smoke_test_db_3.base_table_2",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:12.655000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "180575b59ab828f1bb56a49c25da862144fdf1a484773533a5363df180f81919",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "cf9d8407-934c-4b98-8fcf-be51bd5fc4b2",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anone0788f93_2e16_4300_b94c_f86eee9758c2"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_3",
+          "table_id": "base_table_2"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging.smoke_test_db.table_from_another_project",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:15.601000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "69c8f6b58948d2bafceffb46708bb041e1b46830a052530567fc054c752d43b1",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "72249ae6-3035-4698-ad2f-54f0f6f58976",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anon2608c050_7916_471e_8ba3_c9e004e22daa"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "table_from_another_project"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging-2.smoke_test_db_4.sharded_table1_20230101",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:18.514000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "cd3ceb2068c7b0691a03fb47183df1d55b07bd102781ede467de375a68736a51",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "7ad97142-5030-4723-ae8c-e48f0dc74d34",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anon118ffa8c_5d72_4f8d_b022_b7d7d5e679e2"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_4",
+          "table_id": "sharded_table1_20230101"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging-2.smoke_test_db_4.sharded_table1_20230201",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:21.765000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "a3fe1801fa4d68d8413b4b90c4704bcb6c629d8976c84355b7875b10655c9582",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "1a903e95-526f-4f2a-b7bb-cf85559557cd",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anon5e1130d1_930c_4a12_9c21_7c00388ee11f"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_4",
+          "table_id": "sharded_table1_20230201"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from `gcp-staging-2.smoke_test_db_4.sharded_table1_*`",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:25.044000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "8e8d1f83b2d56f70fff7ea7879290c0b26663d185a80a872902ebf2da23bc3b1",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "1489ced3-a8db-42f0-b6c1-0b23c2e042e7",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anon89622e5a_c0f9_469b_9a9a_2379cac465b6"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_4",
+          "table_id": "sharded_table1_*"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select revenue from gcp-staging.smoke_test_db.partition_test t\n    where cast(t.date_utc as DATE) = (select max(date_utc) from gcp-staging.smoke_test_db.partition_test)\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:42.590000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "9776768f462eef58c2dbc091f9548e020cf7addc1628cf83a2ea506aa81ece86",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "d6479b3a-694b-4271-aa3c-3be5e8b8f7c6",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anon9717e692_a817_40f3_8f8c_d2af76a4eed9"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select revenue from gcp-staging.smoke_test_db.partition_test t\n    where cast(t.date_utc as DATE) = (select max(date_utc) from gcp-staging.smoke_test_db.partition_test)\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:44.320000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "9776768f462eef58c2dbc091f9548e020cf7addc1628cf83a2ea506aa81ece86",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "0e5a166c-4018-4585-a341-a40585343818",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anon3453f1d1_c634_4273_b472_c72fac89f718"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "\n    select revenue from gcp-staging.smoke_test_db.partition_test t\n    where cast(t.date_utc as DATE) = (select max(date_utc) from gcp-staging.smoke_test_db.partition_test)\n",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:45.961000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "9776768f462eef58c2dbc091f9548e020cf7addc1628cf83a2ea506aa81ece86",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "a36c8702-c796-4173-a19a-6b072c5064aa",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anond9168686_8f61_47f7_9546_d97b9daf573b"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "partition_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select key from gcp-staging.smoke_test_db.usage_test",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:49.238000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "dbd21e2e4c5f9fe397c76585acdf3b84f72525d0d951d79e8057b05dc8d7c49d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "2360b8ad-4e69-45ac-9294-a528634219b3",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anon0bff271e_f2e5_4dd8_ba72_3996ab9a4fbf"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "usage_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select key from gcp-staging.smoke_test_db.usage_test",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:52.280000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "dbd21e2e4c5f9fe397c76585acdf3b84f72525d0d951d79e8057b05dc8d7c49d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "68464689-cf31-4cee-87cc-9cf96db96285",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anonced1fae9_3dcb_40ba_a69c_ae6d75133e97"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "usage_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select key from gcp-staging.smoke_test_db.usage_test",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:55.586000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "dbd21e2e4c5f9fe397c76585acdf3b84f72525d0d951d79e8057b05dc8d7c49d",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "277b376a-186b-40aa-a64b-34940ed9d5e1",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anon27185a25_2daf_481f_8c43_20fbac91241b"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "usage_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select * from gcp-staging.smoke_test_db.usage_test",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:29:58.466000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "553f645d24478a4dd699b8deba3a900f3a8907f53105a104f543d08aaef22930",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "f7010dd4-4fd8-42eb-a973-844a161d73ac",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anon1fd96c89_d1e8_44f4_b714_bdf425f3920a"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "usage_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select * from gcp-staging.smoke_test_db.usage_test",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:01.431000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "553f645d24478a4dd699b8deba3a900f3a8907f53105a104f543d08aaef22930",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "8bd62522-3803-431d-8970-caf0c9f64726",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anon026ba4a8_61fe_40e0_bbac_c2745e7e989b"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "usage_test"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from gcp-staging.smoke_test_db.base_table FOR SYSTEM_TIME AS OF TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 1 HOUR)",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:12.787000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": "e55a9654f8c04ebea7d9b153b53cd5e0763b9a15fd68b219eb07719ee0214726",
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "51df8223-866e-4322-9c1c-a91c808a37b0",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anoncbdc907d_def4_4170_a5e2_537bc2cadcfc"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging",
+          "dataset_id": "smoke_test_db",
+          "table_id": "base_table@1724319012792"
+        }
+      ]
+    }
+  },
+  {
+    "query": "select revenue from [gcp-staging-2.smoke_test_db_3.base_table_2@0]",
+    "session_id": null,
+    "timestamp": "2024-08-22 10:30:15.755000+00:00",
+    "user": "urn:li:corpuser:dh-bigquery-smoke-test-2",
+    "default_db": "gcp-staging-2",
+    "default_schema": "_SESSION",
+    "query_hash": null,
+    "usage_multiplier": 1,
+    "extra_info": {
+      "job_id": "58a71429-22f4-4251-a4a0-f5370f1caadd",
+      "statement_type": "SELECT",
+      "destination_table": {
+        "project_id": "gcp-staging-2",
+        "dataset_id": "_9b92e769ee331eccc38faf408e659980e15ac5cb",
+        "table_id": "anon5be4a9ee_7236_4a08_8e69_62eee0161075"
+      },
+      "referenced_tables": [
+        {
+          "project_id": "gcp-staging-2",
+          "dataset_id": "smoke_test_db_3",
+          "table_id": "base_table_2@0"
+        }
+      ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/bigquery_v2/test_bigquery.py b/metadata-ingestion/tests/integration/bigquery_v2/test_bigquery.py
index 762c73d2a55c60..1934e135457afa 100644
--- a/metadata-ingestion/tests/integration/bigquery_v2/test_bigquery.py
+++ b/metadata-ingestion/tests/integration/bigquery_v2/test_bigquery.py
@@ -1,7 +1,8 @@
 import random
 import string
+from datetime import datetime, timezone
 from typing import Any, Dict
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
 
 from freezegun import freeze_time
 from google.cloud.bigquery.table import TableListItem
@@ -11,15 +12,20 @@
     DynamicTypedClassifierConfig,
 )
 from datahub.ingestion.glossary.datahub_classifier import DataHubClassifierConfig
+from datahub.ingestion.source.bigquery_v2.bigquery_audit import BigqueryTableIdentifier
 from datahub.ingestion.source.bigquery_v2.bigquery_data_reader import BigQueryDataReader
 from datahub.ingestion.source.bigquery_v2.bigquery_schema import (
     BigqueryColumn,
     BigqueryDataset,
+    BigqueryProject,
     BigQuerySchemaApi,
     BigqueryTable,
+    BigqueryTableSnapshot,
+    BigqueryView,
 )
 from datahub.ingestion.source.bigquery_v2.bigquery_schema_gen import (
     BigQuerySchemaGenerator,
+    BigQueryV2Config,
 )
 from tests.test_helpers import mce_helpers
 from tests.test_helpers.state_helpers import run_and_get_pipeline
@@ -39,7 +45,37 @@ def random_email():
     )
 
 
+def recipe(mcp_output_path: str, source_config_override: dict = {}) -> dict:
+    return {
+        "source": {
+            "type": "bigquery",
+            "config": {
+                "project_ids": ["project-id-1"],
+                "include_usage_statistics": False,
+                "include_table_lineage": True,
+                "include_data_platform_instance": True,
+                "classification": ClassificationConfig(
+                    enabled=True,
+                    classifiers=[
+                        DynamicTypedClassifierConfig(
+                            type="datahub",
+                            config=DataHubClassifierConfig(
+                                minimum_values_threshold=1,
+                            ),
+                        )
+                    ],
+                    max_workers=1,
+                ).dict(),
+                **source_config_override,
+            },
+        },
+        "sink": {"type": "file", "config": {"filename": mcp_output_path}},
+    }
+
+
 @freeze_time(FROZEN_TIME)
+@patch.object(BigQuerySchemaApi, "get_snapshots_for_dataset")
+@patch.object(BigQuerySchemaApi, "get_views_for_dataset")
 @patch.object(BigQuerySchemaApi, "get_tables_for_dataset")
 @patch.object(BigQuerySchemaGenerator, "get_core_table_details")
 @patch.object(BigQuerySchemaApi, "get_datasets_for_project_id")
@@ -47,14 +83,18 @@ def random_email():
 @patch.object(BigQueryDataReader, "get_sample_data_for_table")
 @patch("google.cloud.bigquery.Client")
 @patch("google.cloud.datacatalog_v1.PolicyTagManagerClient")
+@patch("google.cloud.resourcemanager_v3.ProjectsClient")
 def test_bigquery_v2_ingest(
     client,
     policy_tag_manager_client,
+    projects_client,
     get_sample_data_for_table,
     get_columns_for_dataset,
     get_datasets_for_project_id,
     get_core_table_details,
     get_tables_for_dataset,
+    get_views_for_dataset,
+    get_snapshots_for_dataset,
     pytestconfig,
     tmp_path,
 ):
@@ -62,10 +102,133 @@ def test_bigquery_v2_ingest(
     mcp_golden_path = f"{test_resources_dir}/bigquery_mcp_golden.json"
     mcp_output_path = "{}/{}".format(tmp_path, "bigquery_mcp_output.json")
 
+    dataset_name = "bigquery-dataset-1"
+    get_datasets_for_project_id.return_value = [BigqueryDataset(name=dataset_name)]
+
+    table_list_item = TableListItem(
+        {"tableReference": {"projectId": "", "datasetId": "", "tableId": ""}}
+    )
+    table_name = "table-1"
+    snapshot_table_name = "snapshot-table-1"
+    view_name = "view-1"
+    get_core_table_details.return_value = {table_name: table_list_item}
+    columns = [
+        BigqueryColumn(
+            name="age",
+            ordinal_position=1,
+            is_nullable=False,
+            field_path="col_1",
+            data_type="INT",
+            comment="comment",
+            is_partition_column=False,
+            cluster_column_position=None,
+            policy_tags=["Test Policy Tag"],
+        ),
+        BigqueryColumn(
+            name="email",
+            ordinal_position=1,
+            is_nullable=False,
+            field_path="col_2",
+            data_type="STRING",
+            comment="comment",
+            is_partition_column=False,
+            cluster_column_position=None,
+        ),
+    ]
+
+    get_columns_for_dataset.return_value = {
+        table_name: columns,
+        snapshot_table_name: columns,
+        view_name: columns,
+    }
+    get_sample_data_for_table.return_value = {
+        "age": [random.randint(1, 80) for i in range(20)],
+        "email": [random_email() for i in range(20)],
+    }
+
+    bigquery_table = BigqueryTable(
+        name=table_name,
+        comment=None,
+        created=None,
+        last_altered=None,
+        size_in_bytes=None,
+        rows_count=None,
+    )
+    get_tables_for_dataset.return_value = iter([bigquery_table])
+    snapshot_table = BigqueryTableSnapshot(
+        name=snapshot_table_name,
+        comment=None,
+        created=None,
+        last_altered=None,
+        size_in_bytes=None,
+        rows_count=None,
+        base_table_identifier=BigqueryTableIdentifier(
+            project_id="project-id-1",
+            dataset="bigquery-dataset-1",
+            table="table-1",
+        ),
+    )
+    get_snapshots_for_dataset.return_value = iter([snapshot_table])
+
+    bigquery_view = BigqueryView(
+        name=view_name,
+        comment=None,
+        created=None,
+        view_definition=f"create view `{dataset_name}.view-1` as select email from `{dataset_name}.table-1`",
+        last_altered=None,
+        size_in_bytes=None,
+        rows_count=None,
+        materialized=False,
+    )
+
+    get_views_for_dataset.return_value = iter([bigquery_view])
+
+    pipeline_config_dict: Dict[str, Any] = recipe(mcp_output_path=mcp_output_path)
+
+    run_and_get_pipeline(pipeline_config_dict)
+
+    mce_helpers.check_golden_file(
+        pytestconfig,
+        output_path=mcp_output_path,
+        golden_path=mcp_golden_path,
+    )
+
+
+@freeze_time(FROZEN_TIME)
+@patch.object(BigQuerySchemaApi, attribute="get_projects_with_labels")
+@patch.object(BigQuerySchemaApi, "get_tables_for_dataset")
+@patch.object(BigQuerySchemaGenerator, "get_core_table_details")
+@patch.object(BigQuerySchemaApi, "get_datasets_for_project_id")
+@patch.object(BigQuerySchemaApi, "get_columns_for_dataset")
+@patch.object(BigQueryDataReader, "get_sample_data_for_table")
+@patch("google.cloud.bigquery.Client")
+@patch("google.cloud.datacatalog_v1.PolicyTagManagerClient")
+@patch("google.cloud.resourcemanager_v3.ProjectsClient")
+def test_bigquery_v2_project_labels_ingest(
+    client,
+    policy_tag_manager_client,
+    projects_client,
+    get_sample_data_for_table,
+    get_columns_for_dataset,
+    get_datasets_for_project_id,
+    get_core_table_details,
+    get_tables_for_dataset,
+    get_projects_with_labels,
+    pytestconfig,
+    tmp_path,
+):
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/bigquery_v2"
+    mcp_golden_path = f"{test_resources_dir}/bigquery_project_label_mcp_golden.json"
+    mcp_output_path = "{}/{}".format(tmp_path, "bigquery_project_label_mcp_output.json")
+
     get_datasets_for_project_id.return_value = [
         BigqueryDataset(name="bigquery-dataset-1")
     ]
 
+    get_projects_with_labels.return_value = [
+        BigqueryProject(id="dev", name="development")
+    ]
+
     table_list_item = TableListItem(
         {"tableReference": {"projectId": "", "datasetId": "", "tableId": ""}}
     )
@@ -111,32 +274,251 @@ def test_bigquery_v2_ingest(
     )
     get_tables_for_dataset.return_value = iter([bigquery_table])
 
-    source_config_dict: Dict[str, Any] = {
-        "project_ids": ["project-id-1"],
-        "include_usage_statistics": False,
-        "include_table_lineage": False,
-        "include_data_platform_instance": True,
-        "classification": ClassificationConfig(
-            enabled=True,
-            classifiers=[
-                DynamicTypedClassifierConfig(
-                    type="datahub",
-                    config=DataHubClassifierConfig(
-                        minimum_values_threshold=1,
-                    ),
-                )
-            ],
-            max_workers=1,
-        ).dict(),
+    pipeline_config_dict: Dict[str, Any] = recipe(mcp_output_path=mcp_output_path)
+
+    del pipeline_config_dict["source"]["config"]["project_ids"]
+
+    pipeline_config_dict["source"]["config"]["project_labels"] = [
+        "environment:development"
+    ]
+
+    run_and_get_pipeline(pipeline_config_dict)
+
+    mce_helpers.check_golden_file(
+        pytestconfig,
+        output_path=mcp_output_path,
+        golden_path=mcp_golden_path,
+    )
+
+
+@freeze_time(FROZEN_TIME)
+@patch.object(BigQuerySchemaApi, "get_snapshots_for_dataset")
+@patch.object(BigQuerySchemaApi, "get_views_for_dataset")
+@patch.object(BigQuerySchemaApi, "get_tables_for_dataset")
+@patch.object(BigQuerySchemaGenerator, "get_core_table_details")
+@patch.object(BigQuerySchemaApi, "get_datasets_for_project_id")
+@patch.object(BigQuerySchemaApi, "get_columns_for_dataset")
+@patch.object(BigQueryDataReader, "get_sample_data_for_table")
+@patch("google.cloud.bigquery.Client")
+@patch("google.cloud.datacatalog_v1.PolicyTagManagerClient")
+@patch("google.cloud.resourcemanager_v3.ProjectsClient")
+def test_bigquery_queries_v2_ingest(
+    client,
+    policy_tag_manager_client,
+    projects_client,
+    get_sample_data_for_table,
+    get_columns_for_dataset,
+    get_datasets_for_project_id,
+    get_core_table_details,
+    get_tables_for_dataset,
+    get_views_for_dataset,
+    get_snapshots_for_dataset,
+    pytestconfig,
+    tmp_path,
+):
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/bigquery_v2"
+    mcp_golden_path = f"{test_resources_dir}/bigquery_mcp_golden.json"
+    mcp_output_path = "{}/{}".format(tmp_path, "bigquery_mcp_output.json")
+
+    dataset_name = "bigquery-dataset-1"
+    get_datasets_for_project_id.return_value = [BigqueryDataset(name=dataset_name)]
+
+    table_list_item = TableListItem(
+        {"tableReference": {"projectId": "", "datasetId": "", "tableId": ""}}
+    )
+    table_name = "table-1"
+    snapshot_table_name = "snapshot-table-1"
+    view_name = "view-1"
+    get_core_table_details.return_value = {table_name: table_list_item}
+    columns = [
+        BigqueryColumn(
+            name="age",
+            ordinal_position=1,
+            is_nullable=False,
+            field_path="col_1",
+            data_type="INT",
+            comment="comment",
+            is_partition_column=False,
+            cluster_column_position=None,
+            policy_tags=["Test Policy Tag"],
+        ),
+        BigqueryColumn(
+            name="email",
+            ordinal_position=1,
+            is_nullable=False,
+            field_path="col_2",
+            data_type="STRING",
+            comment="comment",
+            is_partition_column=False,
+            cluster_column_position=None,
+        ),
+    ]
+
+    get_columns_for_dataset.return_value = {
+        table_name: columns,
+        snapshot_table_name: columns,
+        view_name: columns,
+    }
+    get_sample_data_for_table.return_value = {
+        "age": [random.randint(1, 80) for i in range(20)],
+        "email": [random_email() for i in range(20)],
     }
 
-    pipeline_config_dict: Dict[str, Any] = {
-        "source": {
-            "type": "bigquery",
-            "config": source_config_dict,
+    bigquery_table = BigqueryTable(
+        name=table_name,
+        comment=None,
+        created=None,
+        last_altered=None,
+        size_in_bytes=None,
+        rows_count=None,
+    )
+    get_tables_for_dataset.return_value = iter([bigquery_table])
+
+    bigquery_view = BigqueryView(
+        name=view_name,
+        comment=None,
+        created=None,
+        view_definition=f"create view `{dataset_name}.view-1` as select email from `{dataset_name}.table-1`",
+        last_altered=None,
+        size_in_bytes=None,
+        rows_count=None,
+        materialized=False,
+    )
+
+    get_views_for_dataset.return_value = iter([bigquery_view])
+    snapshot_table = BigqueryTableSnapshot(
+        name=snapshot_table_name,
+        comment=None,
+        created=None,
+        last_altered=None,
+        size_in_bytes=None,
+        rows_count=None,
+        base_table_identifier=BigqueryTableIdentifier(
+            project_id="project-id-1",
+            dataset="bigquery-dataset-1",
+            table="table-1",
+        ),
+    )
+    get_snapshots_for_dataset.return_value = iter([snapshot_table])
+
+    # Even if `include_table_lineage` is disabled, we still ingest view and snapshot lineage
+    # if use_queries_v2 is set.
+    pipeline_config_dict: Dict[str, Any] = recipe(
+        mcp_output_path=mcp_output_path,
+        source_config_override={"use_queries_v2": True, "include_table_lineage": False},
+    )
+
+    run_and_get_pipeline(pipeline_config_dict)
+
+    mce_helpers.check_golden_file(
+        pytestconfig,
+        output_path=mcp_output_path,
+        golden_path=mcp_golden_path,
+    )
+
+
+@freeze_time(FROZEN_TIME)
+@patch.object(BigQuerySchemaApi, "get_datasets_for_project_id")
+@patch.object(BigQueryV2Config, "get_bigquery_client")
+@patch("google.cloud.datacatalog_v1.PolicyTagManagerClient")
+@patch("google.cloud.resourcemanager_v3.ProjectsClient")
+def test_bigquery_queries_v2_lineage_usage_ingest(
+    projects_client,
+    policy_tag_manager_client,
+    get_bigquery_client,
+    get_datasets_for_project_id,
+    pytestconfig,
+    tmp_path,
+):
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/bigquery_v2"
+    mcp_golden_path = f"{test_resources_dir}/bigquery_lineage_usage_golden.json"
+    mcp_output_path = "{}/{}".format(tmp_path, "bigquery_lineage_usage_output.json")
+
+    dataset_name = "bigquery-dataset-1"
+    get_datasets_for_project_id.return_value = [BigqueryDataset(name=dataset_name)]
+
+    client = MagicMock()
+    get_bigquery_client.return_value = client
+    client.list_tables.return_value = [
+        TableListItem(
+            {"tableReference": {"projectId": "", "datasetId": "", "tableId": "table-1"}}
+        ),
+        TableListItem(
+            {"tableReference": {"projectId": "", "datasetId": "", "tableId": "view-1"}}
+        ),
+    ]
+
+    # mocking the query results for fetching audit log
+    # note that this is called twice, once for each region
+    client.query.return_value = [
+        {
+            "job_id": "1",
+            "project_id": "project-id-1",
+            "creation_time": datetime.now(timezone.utc),
+            "user_email": "foo@xyz.com",
+            "query": "select * from `bigquery-dataset-1`.`table-1`",
+            "session_id": None,
+            "query_hash": None,
+            "statement_type": "SELECT",
+            "destination_table": None,
+            "referenced_tables": None,
         },
-        "sink": {"type": "file", "config": {"filename": mcp_output_path}},
-    }
+        {
+            "job_id": "2",
+            "project_id": "project-id-1",
+            "creation_time": datetime.now(timezone.utc),
+            "user_email": "foo@xyz.com",
+            "query": "create view `bigquery-dataset-1`.`view-1` as select * from `bigquery-dataset-1`.`table-1`",
+            "session_id": None,
+            "query_hash": None,
+            "statement_type": "CREATE",
+            "destination_table": None,
+            "referenced_tables": None,
+        },
+        {
+            "job_id": "3",
+            "project_id": "project-id-1",
+            "creation_time": datetime.now(timezone.utc),
+            "user_email": "service_account@xyz.com",
+            "query": """\
+select * from `bigquery-dataset-1`.`view-1`
+LIMIT 100
+-- {"user":"@bar","email":"bar@xyz.com","url":"https://modeanalytics.com/acryltest/reports/6234ff78bc7d/runs/662b21949629/queries/f0aad24d5b37","scheduled":false}
+""",
+            "session_id": None,
+            "query_hash": None,
+            "statement_type": "SELECT",
+            "destination_table": None,
+            "referenced_tables": None,
+        },
+        {
+            "job_id": "4",
+            "project_id": "project-id-1",
+            "creation_time": datetime.now(timezone.utc),
+            "user_email": "service_account@xyz.com",
+            "query": """\
+select * from `bigquery-dataset-1`.`view-1`
+LIMIT 100
+-- {"user":"@foo","email":"foo@xyz.com","url":"https://modeanalytics.com/acryltest/reports/6234ff78bc7d/runs/662b21949629/queries/f0aad24d5b37","scheduled":false}
+""",
+            "session_id": None,
+            "query_hash": None,
+            "statement_type": "SELECT",
+            "destination_table": None,
+            "referenced_tables": None,
+        },
+    ]
+
+    pipeline_config_dict: Dict[str, Any] = recipe(
+        mcp_output_path=mcp_output_path,
+        source_config_override={
+            "use_queries_v2": True,
+            "include_schema_metadata": False,
+            "include_table_lineage": True,
+            "include_usage_statistics": True,
+            "classification": {"enabled": False},
+        },
+    )
 
     run_and_get_pipeline(pipeline_config_dict)
 
diff --git a/metadata-ingestion/tests/integration/bigquery_v2/test_bigquery_queries.py b/metadata-ingestion/tests/integration/bigquery_v2/test_bigquery_queries.py
new file mode 100644
index 00000000000000..9290100b0c521c
--- /dev/null
+++ b/metadata-ingestion/tests/integration/bigquery_v2/test_bigquery_queries.py
@@ -0,0 +1,95 @@
+import json
+from datetime import datetime
+from pathlib import Path
+from unittest.mock import patch
+
+import pytest
+from freezegun import freeze_time
+
+from datahub.ingestion.source.bigquery_v2.bigquery_queries import (
+    BigQueryQueriesSourceReport,
+)
+from datahub.metadata.urns import CorpUserUrn
+from datahub.sql_parsing.sql_parsing_aggregator import ObservedQuery
+from datahub.utilities.file_backed_collections import ConnectionWrapper, FileBackedList
+from tests.test_helpers import mce_helpers
+from tests.test_helpers.state_helpers import run_and_get_pipeline
+
+FROZEN_TIME = "2024-08-19 07:00:00"
+WINDOW_END_TIME = "2024-09-01 00:00:00Z"
+
+
+def _generate_queries_cached_file(tmp_path: Path, queries_json_path: Path) -> None:
+    # We choose to generate Cached audit log (FileBackedList backed by sqlite) at runtime
+    # instead of using pre-existing sqlite file here as default serializer for FileBackedList
+    # uses pickle which may not work well across python versions.
+
+    shared_connection = ConnectionWrapper(tmp_path / "audit_log.sqlite")
+    query_cache: FileBackedList[ObservedQuery] = FileBackedList(shared_connection)
+    with open(queries_json_path, "r") as f:
+        queries = json.load(f)
+        assert isinstance(queries, list)
+        for query in queries:
+            query["timestamp"] = datetime.fromisoformat(query["timestamp"])
+            query["user"] = (
+                CorpUserUrn.from_string(query["user"]) if query["user"] else None
+            )
+            query_cache.append(ObservedQuery(**query))
+
+        query_cache.close()
+        shared_connection.close()
+
+
+@freeze_time(FROZEN_TIME)
+@patch("google.cloud.bigquery.Client")
+@patch("google.cloud.resourcemanager_v3.ProjectsClient")
+def test_queries_ingestion(project_client, client, pytestconfig, monkeypatch, tmp_path):
+
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/bigquery_v2"
+    mcp_golden_path = f"{test_resources_dir}/bigquery_queries_mcps_golden.json"
+    mcp_output_path = tmp_path / "bigquery_queries_mcps.json"
+
+    try:
+        # query_log.json is originally created by using queries dump generated by
+        # acryl bigquery connector smoke test and using `datahub check extract-sql-agg-log`
+        # command with tablename="data" to convert cached audit log to queries json followed by
+        # a simple `acryl-staging`->`gcp-staging` replacement.
+
+        _generate_queries_cached_file(tmp_path, test_resources_dir / "query_log.json")
+    except Exception as e:
+        pytest.fail(f"Failed to generate queries sqlite cache: {e}")
+
+    pipeline_config_dict: dict = {
+        "source": {
+            "type": "bigquery-queries",
+            "config": {
+                "project_ids": ["gcp-staging", "gcp-staging-2"],
+                "local_temp_path": tmp_path,
+                "top_n_queries": 20,
+                "window": {
+                    "start_time": "-30d",
+                    "end_time": WINDOW_END_TIME,
+                },
+            },
+        },
+        "sink": {"type": "file", "config": {"filename": str(mcp_output_path)}},
+    }
+
+    pipeline = run_and_get_pipeline(pipeline_config_dict)
+    pipeline.pretty_print_summary()
+
+    report = pipeline.source.get_report()
+    assert isinstance(report, BigQueryQueriesSourceReport)
+    assert report.queries_extractor is not None
+    assert report.queries_extractor.sql_aggregator is not None
+    assert report.queries_extractor.sql_aggregator.num_query_usage_stats_generated > 0
+    assert (
+        report.queries_extractor.sql_aggregator.num_query_usage_stats_outside_window
+        == 0
+    )
+
+    mce_helpers.check_golden_file(
+        pytestconfig,
+        output_path=mcp_output_path,
+        golden_path=mcp_golden_path,
+    )
diff --git a/metadata-ingestion/tests/integration/dbt/dbt_enabled_with_schemas_mces_golden.json b/metadata-ingestion/tests/integration/dbt/dbt_enabled_with_schemas_mces_golden.json
index aacb7093e5b4ea..dc8c400b291574 100644
--- a/metadata-ingestion/tests/integration/dbt/dbt_enabled_with_schemas_mces_golden.json
+++ b/metadata-ingestion/tests/integration/dbt/dbt_enabled_with_schemas_mces_golden.json
@@ -271,7 +271,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),customer_id)"
                                 ],
@@ -283,7 +283,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),first_name)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),last_name)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),full_name)"
                                 ],
@@ -294,7 +294,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),email)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),email)"
                                 ],
@@ -305,7 +305,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),address)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),address)"
                                 ],
@@ -316,7 +316,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.city,PROD),city)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),city)"
                                 ],
@@ -327,7 +327,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),postal_code)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),postal_code)"
                                 ],
@@ -338,7 +338,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),phone)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),phone)"
                                 ],
@@ -549,7 +549,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.payments_by_customer_by_month,PROD),billing_month)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-monthly-billing,PROD),billing_month)"
                                 ],
@@ -560,7 +560,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.payments_by_customer_by_month,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-monthly-billing,PROD),customer_id)"
                                 ],
@@ -571,7 +571,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.payments_by_customer_by_month,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-monthly-billing,PROD),amount)"
                                 ],
@@ -828,7 +828,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),amount)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),amount)"
                                 ],
@@ -844,7 +844,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),customer_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),customer_id)"
                                 ],
@@ -860,7 +860,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),payment_date)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),payment_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),payment_date)"
                                 ],
@@ -876,7 +876,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),payment_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),payment_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),payment_id)"
                                 ],
@@ -892,7 +892,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),rental_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),rental_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),rental_id)"
                                 ],
@@ -908,7 +908,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),staff_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),staff_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),staff_id)"
                                 ],
@@ -1076,7 +1076,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),payment_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.payments_by_customer_by_month,PROD),billing_month)"
                                 ],
@@ -1087,7 +1087,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.payments_by_customer_by_month,PROD),customer_id)"
                                 ],
@@ -1098,7 +1098,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.payments_by_customer_by_month,PROD),amount)"
                                 ],
diff --git a/metadata-ingestion/tests/integration/dbt/dbt_test_column_meta_mapping_golden.json b/metadata-ingestion/tests/integration/dbt/dbt_test_column_meta_mapping_golden.json
index 5a35b4763af06f..60f5bf4fbca9a1 100644
--- a/metadata-ingestion/tests/integration/dbt/dbt_test_column_meta_mapping_golden.json
+++ b/metadata-ingestion/tests/integration/dbt/dbt_test_column_meta_mapping_golden.json
@@ -224,7 +224,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),customer_id)"
                                 ],
@@ -236,7 +236,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),first_name)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),last_name)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),full_name)"
                                 ],
@@ -248,7 +248,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),first_name)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),last_name)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),initial_full_name)"
                                 ],
@@ -259,7 +259,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),email)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),email)"
                                 ],
@@ -270,7 +270,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),address)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),address)"
                                 ],
@@ -281,7 +281,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.city,PROD),city)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),city)"
                                 ],
@@ -292,7 +292,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),postal_code)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),postal_code)"
                                 ],
@@ -303,7 +303,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),phone)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),phone)"
                                 ],
@@ -491,7 +491,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payments_by_customer_by_month,PROD),billing_month)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),billing_month)"
                                 ],
@@ -502,7 +502,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payments_by_customer_by_month,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),customer_id)"
                                 ],
@@ -513,7 +513,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payments_by_customer_by_month,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),amount)"
                                 ],
@@ -524,7 +524,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),email)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),email)"
                                 ],
@@ -773,7 +773,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),amount)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),amount)"
                                 ],
@@ -789,7 +789,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),customer_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),customer_id)"
                                 ],
@@ -805,7 +805,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),payment_date)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),payment_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),payment_date)"
                                 ],
@@ -821,7 +821,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),payment_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),payment_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),payment_id)"
                                 ],
@@ -837,7 +837,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),rental_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),rental_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),rental_id)"
                                 ],
@@ -853,7 +853,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),staff_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),staff_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),staff_id)"
                                 ],
@@ -1049,7 +1049,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD),payment_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD),billing_month)"
                                 ],
@@ -1060,7 +1060,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD),customer_id)"
                                 ],
@@ -1071,7 +1071,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD),amount)"
                                 ],
@@ -1371,7 +1371,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),active)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),active)"
                                 ],
@@ -1382,7 +1382,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),activebool)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),activebool)"
                                 ],
@@ -1393,7 +1393,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),address_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),address_id)"
                                 ],
@@ -1404,7 +1404,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),create_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),create_date)"
                                 ],
@@ -1415,7 +1415,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),customer_id)"
                                 ],
@@ -1426,7 +1426,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),email)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),email)"
                                 ],
@@ -1437,7 +1437,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),first_name)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),first_name)"
                                 ],
@@ -1448,7 +1448,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),last_name)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),last_name)"
                                 ],
@@ -1459,7 +1459,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),last_update)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),last_update)"
                                 ],
@@ -1470,7 +1470,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),store_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),store_id)"
                                 ],
diff --git a/metadata-ingestion/tests/integration/dbt/dbt_test_prefer_sql_parser_lineage_golden.json b/metadata-ingestion/tests/integration/dbt/dbt_test_prefer_sql_parser_lineage_golden.json
new file mode 100644
index 00000000000000..d2c71659706818
--- /dev/null
+++ b/metadata-ingestion/tests/integration/dbt/dbt_test_prefer_sql_parser_lineage_golden.json
@@ -0,0 +1,5321 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Model"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "node_type": "model",
+                            "materialization": "ephemeral",
+                            "dbt_file_path": "models/transform/customer_details.sql",
+                            "language": "sql",
+                            "dbt_unique_id": "model.sample_dbt.customer_details",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "customer_details",
+                        "description": "",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "model.sample_dbt.customer_details",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "INT",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "full_name",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "TEXT",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "initial_full_name",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NullType": {}
+                                    }
+                                },
+                                "nativeDataType": "",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "email",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "TEXT",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "address",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "TEXT",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "city",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "TEXT",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "postal_code",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "TEXT",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "phone",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "TEXT",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.address,PROD)",
+                                "type": "TRANSFORMED"
+                            },
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.city,PROD)",
+                                "type": "TRANSFORMED"
+                            },
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD)",
+                                "type": "TRANSFORMED"
+                            },
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD)",
+                                "type": "TRANSFORMED"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD),customer_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),customer_id)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD),first_name)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD),last_name)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),full_name)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),first_name)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),last_name)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),initial_full_name)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD),email)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),email)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.address,PROD),address)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),address)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.city,PROD),city)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),city)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.address,PROD),postal_code)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),postal_code)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.address,PROD),phone)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),phone)"
+                                ],
+                                "confidenceScore": 0.9
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.ViewProperties": {
+                        "materialized": false,
+                        "viewLogic": "{{ config(\n    materialized = \"ephemeral\",\n) }}\n\nSELECT\n    c.customer_id,\n    c.first_name || ' ' || c.last_name as \"full_name\",\n    (\n        select cs.first_name || ' ' || cs.last_name\n        from {{ ref('customer_snapshot') }} cs where cs.customer_id = c.customer_id\n        order by dbt_valid_from desc\n        limit 1\n    ) as \"initial_full_name\",\n    c.email,\n    a.address,\n    m.city,\n    a.postal_code,\n    a.phone\nFROM\n    {{ source('pagila', 'customer')}} c\n    left outer join {{ source('pagila', 'address')}} a on c.address_id = a.address_id\n    left outer join {{ source('pagila', 'city') }} m on a.city_id = m.city_id",
+                        "formattedViewLogic": "SELECT\n  c.customer_id,\n  c.first_name || ' ' || c.last_name AS \"full_name\",\n  (\n    SELECT\n      cs.first_name || ' ' || cs.last_name\n    FROM \"pagila\".\"public\".\"customer_snapshot\" AS cs\n    WHERE\n      cs.customer_id = c.customer_id\n    ORDER BY\n      dbt_valid_from DESC\n    LIMIT 1\n  ) AS \"initial_full_name\",\n  c.email,\n  a.address,\n  m.city,\n  a.postal_code,\n  a.phone\nFROM \"pagila\".\"public\".\"customer\" AS c\nLEFT OUTER JOIN \"pagila\".\"public\".\"address\" AS a\n  ON c.address_id = a.address_id\nLEFT OUTER JOIN \"pagila\".\"public\".\"city\" AS m\n  ON a.city_id = m.city_id",
+                        "viewLanguage": "SQL"
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Model"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "node_type": "model",
+                            "materialization": "table",
+                            "dbt_file_path": "models/billing/monthly_billing_with_cust.sql",
+                            "catalog_type": "BASE TABLE",
+                            "language": "sql",
+                            "dbt_unique_id": "model.sample_dbt.monthly_billing_with_cust",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "an-aliased-view-for-monthly-billing",
+                        "description": "",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "model.sample_dbt.monthly_billing_with_cust",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "amount",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "numeric",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "billing_month",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "email",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD)",
+                                "type": "TRANSFORMED"
+                            },
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payments_by_customer_by_month,PROD)",
+                                "type": "TRANSFORMED"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payments_by_customer_by_month,PROD),BillingMonth)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),billing_month)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payments_by_customer_by_month,PROD),customer_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),customer_id)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payments_by_customer_by_month,PROD),amount)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),amount)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),email)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),email)"
+                                ],
+                                "confidenceScore": 0.9
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.ViewProperties": {
+                        "materialized": true,
+                        "viewLogic": "{{ config(\n    materialized = \"table\",\n    alias='an-aliased-view-for-monthly-billing'\n) }}\n\nSELECT \n    pbc.\"BillingMonth\" as billing_month,\n    pbc.customer_id,\n    pbc.amount,\n    cust.email\nFROM\n    {{ ref('payments_by_customer_by_month')}} pbc\n    left outer join {{ ref('customer_details')}} cust on pbc.customer_id = cust.customer_id\nORDER BY\n    pbc.\"BillingMonth\"",
+                        "formattedViewLogic": "WITH __dbt__cte__customer_details AS (\n  SELECT\n    c.customer_id,\n    c.first_name || ' ' || c.last_name AS \"full_name\",\n    (\n      SELECT\n        cs.first_name || ' ' || cs.last_name\n      FROM \"pagila\".\"public\".\"customer_snapshot\" AS cs\n      WHERE\n        cs.customer_id = c.customer_id\n      ORDER BY\n        dbt_valid_from DESC\n      LIMIT 1\n    ) AS \"initial_full_name\",\n    c.email,\n    a.address,\n    m.city,\n    a.postal_code,\n    a.phone\n  FROM \"pagila\".\"public\".\"customer\" AS c\n  LEFT OUTER JOIN \"pagila\".\"public\".\"address\" AS a\n    ON c.address_id = a.address_id\n  LEFT OUTER JOIN \"pagila\".\"public\".\"city\" AS m\n    ON a.city_id = m.city_id\n)\nSELECT\n  pbc.\"BillingMonth\" AS billing_month,\n  pbc.customer_id,\n  pbc.amount,\n  cust.email\nFROM \"pagila\".\"public\".\"payments_by_customer_by_month\" AS pbc\nLEFT OUTER JOIN __dbt__cte__customer_details AS cust\n  ON pbc.customer_id = cust.customer_id\nORDER BY\n  pbc.\"BillingMonth\"",
+                        "viewLanguage": "SQL"
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:a42a5b1bee156e45972e12d4156fb7a2",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "dbt_name": "model.sample_dbt.monthly_billing_with_cust",
+                "dbt_urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)"
+            },
+            "name": "just-some-random-id_urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+            "type": "BATCH_SCHEDULED",
+            "created": {
+                "time": 1663355198240,
+                "actor": "urn:li:corpuser:datahub"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:a42a5b1bee156e45972e12d4156fb7a2",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRelationships",
+    "aspect": {
+        "json": {
+            "parentTemplate": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+            "upstreamInstances": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:a42a5b1bee156e45972e12d4156fb7a2",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceInput",
+    "aspect": {
+        "json": {
+            "inputs": [
+                "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD)",
+                "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payments_by_customer_by_month,PROD)"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:a42a5b1bee156e45972e12d4156fb7a2",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceOutput",
+    "aspect": {
+        "json": {
+            "outputs": [
+                "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:a42a5b1bee156e45972e12d4156fb7a2",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198240,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "STARTED"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:a42a5b1bee156e45972e12d4156fb7a2",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198242,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResultType": "success"
+            },
+            "durationMillis": 2
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Model"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "node_type": "model",
+                            "materialization": "view",
+                            "dbt_file_path": "models/base/payments_base.sql",
+                            "catalog_type": "VIEW",
+                            "language": "sql",
+                            "dbt_unique_id": "model.sample_dbt.payments_base",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "an_aliased_view_for_payments",
+                        "description": "",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "model.sample_dbt.payments_base",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "amount",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "numeric(5,2)",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "payment_date",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "payment_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "rental_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "staff_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_01,PROD)",
+                                "type": "TRANSFORMED"
+                            },
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_02,PROD)",
+                                "type": "TRANSFORMED"
+                            },
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_03,PROD)",
+                                "type": "TRANSFORMED"
+                            },
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_04,PROD)",
+                                "type": "TRANSFORMED"
+                            },
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_05,PROD)",
+                                "type": "TRANSFORMED"
+                            },
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_06,PROD)",
+                                "type": "TRANSFORMED"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_01,PROD),amount)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_02,PROD),amount)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_03,PROD),amount)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_04,PROD),amount)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_05,PROD),amount)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_06,PROD),amount)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),amount)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_01,PROD),customer_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_02,PROD),customer_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_03,PROD),customer_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_04,PROD),customer_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_05,PROD),customer_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_06,PROD),customer_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),customer_id)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_01,PROD),payment_date)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_02,PROD),payment_date)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_03,PROD),payment_date)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_04,PROD),payment_date)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_05,PROD),payment_date)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_06,PROD),payment_date)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),payment_date)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_01,PROD),payment_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_02,PROD),payment_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_03,PROD),payment_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_04,PROD),payment_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_05,PROD),payment_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_06,PROD),payment_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),payment_id)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_01,PROD),rental_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_02,PROD),rental_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_03,PROD),rental_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_04,PROD),rental_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_05,PROD),rental_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_06,PROD),rental_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),rental_id)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_01,PROD),staff_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_02,PROD),staff_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_03,PROD),staff_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_04,PROD),staff_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_05,PROD),staff_id)",
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_06,PROD),staff_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),staff_id)"
+                                ],
+                                "confidenceScore": 0.9
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.ViewProperties": {
+                        "materialized": false,
+                        "viewLogic": "{{ config(\n    materialized=\"view\",\n    alias='an_aliased_view_for_payments'\n) }}\n\nwith payments as (\n\n    select \n        *\n    from \n        {{ source('pagila', 'payment_p2020_01')}}\n    UNION ALL\n    select \n        *\n    from \n        {{ source('pagila', 'payment_p2020_02')}}\n    UNION ALL\n    select \n        *\n    from \n        {{ source('pagila', 'payment_p2020_02')}}\n    UNION ALL\n    select \n        *\n    from \n        {{ source('pagila', 'payment_p2020_03')}}\n    UNION ALL\n    select \n        *\n    from \n        {{ source('pagila', 'payment_p2020_04')}}\n    UNION ALL\n    select \n        *\n    from \n        {{ source('pagila', 'payment_p2020_05')}}\n    UNION ALL\n    select \n        *\n    from \n        {{ source('pagila', 'payment_p2020_06')}}\n)\n\nselect *\nfrom payments",
+                        "formattedViewLogic": "WITH payments AS (\n  SELECT\n    *\n  FROM \"pagila\".\"public\".\"payment_p2020_01\"\n  UNION ALL\n  SELECT\n    *\n  FROM \"pagila\".\"public\".\"payment_p2020_02\"\n  UNION ALL\n  SELECT\n    *\n  FROM \"pagila\".\"public\".\"payment_p2020_02\"\n  UNION ALL\n  SELECT\n    *\n  FROM \"pagila\".\"public\".\"payment_p2020_03\"\n  UNION ALL\n  SELECT\n    *\n  FROM \"pagila\".\"public\".\"payment_p2020_04\"\n  UNION ALL\n  SELECT\n    *\n  FROM \"pagila\".\"public\".\"payment_p2020_05\"\n  UNION ALL\n  SELECT\n    *\n  FROM \"pagila\".\"public\".\"payment_p2020_06\"\n)\nSELECT\n  *\nFROM payments",
+                        "viewLanguage": "SQL"
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:fc6268f0be68fd04c310705b65efd6fe",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "dbt_name": "model.sample_dbt.payments_base",
+                "dbt_urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD)"
+            },
+            "name": "just-some-random-id_urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD)",
+            "type": "BATCH_SCHEDULED",
+            "created": {
+                "time": 1663355198240,
+                "actor": "urn:li:corpuser:datahub"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:fc6268f0be68fd04c310705b65efd6fe",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRelationships",
+    "aspect": {
+        "json": {
+            "parentTemplate": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD)",
+            "upstreamInstances": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:fc6268f0be68fd04c310705b65efd6fe",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceInput",
+    "aspect": {
+        "json": {
+            "inputs": [
+                "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_01,PROD)",
+                "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_02,PROD)",
+                "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_03,PROD)",
+                "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_04,PROD)",
+                "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_05,PROD)",
+                "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_06,PROD)"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:fc6268f0be68fd04c310705b65efd6fe",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceOutput",
+    "aspect": {
+        "json": {
+            "outputs": [
+                "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD)"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:fc6268f0be68fd04c310705b65efd6fe",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198240,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "STARTED"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:fc6268f0be68fd04c310705b65efd6fe",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198242,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResultType": "success"
+            },
+            "durationMillis": 2
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Model"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "node_type": "model",
+                            "materialization": "table",
+                            "dbt_file_path": "models/transform/payments_by_customer_by_month.sql",
+                            "catalog_type": "BASE TABLE",
+                            "language": "sql",
+                            "dbt_unique_id": "model.sample_dbt.payments_by_customer_by_month",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "payments_by_customer_by_month",
+                        "description": "",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "model.sample_dbt.payments_by_customer_by_month",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "BillingMonth",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "amount",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "numeric",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "description": "description for customer_id from dbt",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:dbt:tag_from_dbt"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD)",
+                                "type": "TRANSFORMED"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD),payment_date)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD),BillingMonth)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD),customer_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD),customer_id)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD),amount)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD),amount)"
+                                ],
+                                "confidenceScore": 0.9
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.ViewProperties": {
+                        "materialized": true,
+                        "viewLogic": "{{ config(\n    materialized = \"table\",\n) }}\n\nSELECT\n    date_trunc('month', payment_date) as \"BillingMonth\",\n    customer_id,\n    sum(amount) as \"amount\"\nFROM\n    {{ ref('payments_base')}}\nGROUP BY\n    \"BillingMonth\",\n    customer_id",
+                        "formattedViewLogic": "SELECT\n  DATE_TRUNC('MONTH', payment_date) AS \"BillingMonth\",\n  customer_id,\n  SUM(amount) AS \"amount\"\nFROM \"pagila\".\"public\".\"an_aliased_view_for_payments\"\nGROUP BY\n  \"BillingMonth\",\n  customer_id",
+                        "viewLanguage": "SQL"
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:57aa623f096cf3a28af70fe94b713907",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "dbt_name": "model.sample_dbt.payments_by_customer_by_month",
+                "dbt_urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD)"
+            },
+            "name": "just-some-random-id_urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD)",
+            "type": "BATCH_SCHEDULED",
+            "created": {
+                "time": 1663355198240,
+                "actor": "urn:li:corpuser:datahub"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:57aa623f096cf3a28af70fe94b713907",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRelationships",
+    "aspect": {
+        "json": {
+            "parentTemplate": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD)",
+            "upstreamInstances": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:57aa623f096cf3a28af70fe94b713907",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceInput",
+    "aspect": {
+        "json": {
+            "inputs": [
+                "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD)"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:57aa623f096cf3a28af70fe94b713907",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceOutput",
+    "aspect": {
+        "json": {
+            "outputs": [
+                "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD)"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:57aa623f096cf3a28af70fe94b713907",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198240,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "STARTED"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:57aa623f096cf3a28af70fe94b713907",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198242,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResultType": "success"
+            },
+            "durationMillis": 2
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Snapshot"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "node_type": "snapshot",
+                            "materialization": "snapshot",
+                            "dbt_file_path": "snapshots/customer_snapshot.sql",
+                            "catalog_type": "BASE TABLE",
+                            "language": "sql",
+                            "dbt_unique_id": "snapshot.sample_dbt.customer_snapshot",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "customer_snapshot",
+                        "description": "",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "snapshot.sample_dbt.customer_snapshot",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "active",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "activebool",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.BooleanType": {}
+                                    }
+                                },
+                                "nativeDataType": "boolean",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "address_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "create_date",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.DateType": {}
+                                    }
+                                },
+                                "nativeDataType": "date",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "dbt_scd_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "dbt_updated_at",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "dbt_valid_from",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "dbt_valid_to",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "email",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "first_name",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "last_name",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "last_update",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "store_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD)",
+                                "type": "TRANSFORMED"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD),active)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),active)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD),activebool)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),activebool)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD),address_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),address_id)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD),create_date)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),create_date)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD),customer_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),customer_id)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD),email)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),email)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD),first_name)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),first_name)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD),last_name)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),last_name)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD),last_update)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),last_update)"
+                                ],
+                                "confidenceScore": 0.9
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD),store_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),store_id)"
+                                ],
+                                "confidenceScore": 0.9
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.ViewProperties": {
+                        "materialized": true,
+                        "viewLogic": "\n\n{{\n    config(\n      target_database='pagila',\n      target_schema='public',\n      unique_key='customer_id',\n\n      strategy='timestamp',\n      updated_at='last_update',\n    )\n}}\n\nselect * from {{ source('pagila', 'customer') }}\n\n",
+                        "formattedViewLogic": "SELECT\n  *\nFROM \"pagila\".\"public\".\"customer\"",
+                        "viewLanguage": "SQL"
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:36225e795a4597b2376996774a803b0d",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "dbt_name": "snapshot.sample_dbt.customer_snapshot",
+                "dbt_urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD)"
+            },
+            "name": "just-some-random-id_urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD)",
+            "type": "BATCH_SCHEDULED",
+            "created": {
+                "time": 1663355198240,
+                "actor": "urn:li:corpuser:datahub"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:36225e795a4597b2376996774a803b0d",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRelationships",
+    "aspect": {
+        "json": {
+            "parentTemplate": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD)",
+            "upstreamInstances": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:36225e795a4597b2376996774a803b0d",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceInput",
+    "aspect": {
+        "json": {
+            "inputs": [
+                "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD)"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:36225e795a4597b2376996774a803b0d",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceOutput",
+    "aspect": {
+        "json": {
+            "outputs": [
+                "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD)"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:36225e795a4597b2376996774a803b0d",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198240,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "STARTED"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:36225e795a4597b2376996774a803b0d",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198242,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResultType": "success"
+            },
+            "durationMillis": 2
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.actor,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Source"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.actor,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.actor,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "model_maturity": "in dev",
+                            "owner": "@alice",
+                            "some_other_property": "test 1",
+                            "node_type": "source",
+                            "dbt_file_path": "models/base.yml",
+                            "catalog_type": "BASE TABLE",
+                            "language": "sql",
+                            "dbt_unique_id": "source.sample_dbt.pagila.actor",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "actor",
+                        "description": "description for actor table from dbt",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpuser:@alice",
+                                "type": "DATAOWNER"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "source.sample_dbt.pagila.actor",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 1581759273000,
+                            "actor": "urn:li:corpuser:dbt_executor"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "actor_id",
+                                "nullable": false,
+                                "description": "description for actor_id column from dbt",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "first_name",
+                                "nullable": false,
+                                "description": "dbt comment: Actors column \u2013 from postgres\n\ndbt model description: description for first_name from dbt",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "last_name",
+                                "nullable": false,
+                                "description": "description for last_name from dbt",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "last_update",
+                                "nullable": false,
+                                "description": "description for last_update from dbt",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.actor,PROD)",
+                                "type": "COPY"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Source"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "node_type": "source",
+                            "dbt_file_path": "models/base.yml",
+                            "catalog_type": "BASE TABLE",
+                            "language": "sql",
+                            "dbt_unique_id": "source.sample_dbt.pagila.address",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "address",
+                        "description": "a user's address",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "source.sample_dbt.pagila.address",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 1581759930000,
+                            "actor": "urn:li:corpuser:dbt_executor"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "address",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "address2",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "address_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "city_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "district",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "last_update",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "phone",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "postal_code",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.address,PROD)",
+                                "type": "COPY"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.category,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Source"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.category,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.category,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "node_type": "source",
+                            "dbt_file_path": "models/base.yml",
+                            "catalog_type": "BASE TABLE",
+                            "language": "sql",
+                            "dbt_unique_id": "source.sample_dbt.pagila.category",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "category",
+                        "description": "a user's category",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "source.sample_dbt.pagila.category",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 1581759987000,
+                            "actor": "urn:li:corpuser:dbt_executor"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "category_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "last_update",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "name",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.category,PROD)",
+                                "type": "COPY"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.city,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Source"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.city,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.city,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "node_type": "source",
+                            "dbt_file_path": "models/base.yml",
+                            "catalog_type": "BASE TABLE",
+                            "language": "sql",
+                            "dbt_unique_id": "source.sample_dbt.pagila.city",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "city",
+                        "description": "",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "source.sample_dbt.pagila.city",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 1581759925000,
+                            "actor": "urn:li:corpuser:dbt_executor"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "city",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "city_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "country_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "last_update",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.city,PROD)",
+                                "type": "COPY"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.country,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Source"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.country,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.country,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "model_maturity": "in prod",
+                            "owner": "@bob",
+                            "some_other_property": "test 2",
+                            "node_type": "source",
+                            "dbt_file_path": "models/base.yml",
+                            "catalog_type": "BASE TABLE",
+                            "language": "sql",
+                            "dbt_unique_id": "source.sample_dbt.pagila.country",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "country",
+                        "description": "",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpuser:@bob",
+                                "type": "DATAOWNER"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "source.sample_dbt.pagila.country",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 1581759840000,
+                            "actor": "urn:li:corpuser:dbt_executor"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "country",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "country_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "last_update",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.country,PROD)",
+                                "type": "COPY"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Source"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "node_type": "source",
+                            "dbt_file_path": "models/base.yml",
+                            "catalog_type": "BASE TABLE",
+                            "language": "sql",
+                            "dbt_unique_id": "source.sample_dbt.pagila.customer",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "customer",
+                        "description": "description for customer table from dbt",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "source.sample_dbt.pagila.customer",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 1581760640000,
+                            "actor": "urn:li:corpuser:dbt_executor"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "active",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "activebool",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.BooleanType": {}
+                                    }
+                                },
+                                "nativeDataType": "boolean",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "address_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "create_date",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.DateType": {}
+                                    }
+                                },
+                                "nativeDataType": "date",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "email",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "first_name",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "last_name",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "text",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "last_update",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "store_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer,PROD)",
+                                "type": "COPY"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_01,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Source"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_01,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_01,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "node_type": "source",
+                            "dbt_file_path": "models/base.yml",
+                            "catalog_type": "BASE TABLE",
+                            "language": "sql",
+                            "dbt_unique_id": "source.sample_dbt.pagila.payment_p2020_01",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "payment_p2020_01",
+                        "description": "",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "source.sample_dbt.pagila.payment_p2020_01",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 1580505371997,
+                            "actor": "urn:li:corpuser:dbt_executor"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "amount",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "numeric(5,2)",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "payment_date",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "payment_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "rental_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "staff_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_01,PROD)",
+                                "type": "COPY"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_02,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Source"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_02,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_02,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "an_array_property": "['alpha', 'beta', 'charlie']",
+                            "model_maturity": "in prod",
+                            "owner": "@charles",
+                            "some_other_property": "test 3",
+                            "node_type": "source",
+                            "dbt_file_path": "models/base.yml",
+                            "catalog_type": "BASE TABLE",
+                            "language": "sql",
+                            "dbt_unique_id": "source.sample_dbt.pagila.payment_p2020_02",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "payment_p2020_02",
+                        "description": "",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpuser:@charles",
+                                "type": "DATAOWNER"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "source.sample_dbt.pagila.payment_p2020_02",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 1582319845997,
+                            "actor": "urn:li:corpuser:dbt_executor"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "amount",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "numeric(5,2)",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "payment_date",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "payment_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "rental_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "staff_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_02,PROD)",
+                                "type": "COPY"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_03,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Source"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_03,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_03,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "node_type": "source",
+                            "dbt_file_path": "models/base.yml",
+                            "catalog_type": "BASE TABLE",
+                            "language": "sql",
+                            "dbt_unique_id": "source.sample_dbt.pagila.payment_p2020_03",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "payment_p2020_03",
+                        "description": "",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "source.sample_dbt.pagila.payment_p2020_03",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 1584998318997,
+                            "actor": "urn:li:corpuser:dbt_executor"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "amount",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "numeric(5,2)",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "payment_date",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "payment_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "rental_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "staff_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_03,PROD)",
+                                "type": "COPY"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_04,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Source"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_04,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_04,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "node_type": "source",
+                            "dbt_file_path": "models/base.yml",
+                            "catalog_type": "BASE TABLE",
+                            "language": "sql",
+                            "dbt_unique_id": "source.sample_dbt.pagila.payment_p2020_04",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "payment_p2020_04",
+                        "description": "",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "source.sample_dbt.pagila.payment_p2020_04",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 1588287228997,
+                            "actor": "urn:li:corpuser:dbt_executor"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "amount",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "numeric(5,2)",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "payment_date",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "payment_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "rental_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "staff_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_04,PROD)",
+                                "type": "COPY"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Source"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "node_type": "source",
+                            "dbt_file_path": "models/base.yml",
+                            "catalog_type": "BASE TABLE",
+                            "language": "sql",
+                            "dbt_unique_id": "source.sample_dbt.pagila.payment_p2020_05",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "payment_p2020_05",
+                        "description": "a payment",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "source.sample_dbt.pagila.payment_p2020_05",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 1589460269997,
+                            "actor": "urn:li:corpuser:dbt_executor"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "amount",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "numeric(5,2)",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "payment_date",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "payment_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "rental_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "staff_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_05,PROD)",
+                                "type": "COPY"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Source"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "node_type": "source",
+                            "dbt_file_path": "models/base.yml",
+                            "catalog_type": "BASE TABLE",
+                            "language": "sql",
+                            "dbt_unique_id": "source.sample_dbt.pagila.payment_p2020_06",
+                            "dbt_package_name": "sample_dbt",
+                            "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                            "manifest_version": "1.7.3",
+                            "manifest_adapter": "postgres",
+                            "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                            "catalog_version": "1.7.3"
+                        },
+                        "name": "payment_p2020_06",
+                        "description": "",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "source.sample_dbt.pagila.payment_p2020_06",
+                        "platform": "urn:li:dataPlatform:dbt",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": -62135596800000,
+                            "actor": "urn:li:corpuser:dbt_executor"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "amount",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "numeric(5,2)",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "payment_date",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.TimeType": {}
+                                    }
+                                },
+                                "nativeDataType": "timestamp with time zone",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "payment_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "rental_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "staff_id",
+                                "nullable": false,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1643871600000,
+                                    "actor": "urn:li:corpuser:unknown"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payment_p2020_06,PROD)",
+                                "type": "COPY"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+    "changeType": "PATCH",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": [
+            {
+                "op": "add",
+                "path": "/upstreams/urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+                "value": {
+                    "auditStamp": {
+                        "time": 1643871600000,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+                    "type": "COPY"
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an-aliased-view-for-monthly-billing,PROD),amount)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),amount)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an-aliased-view-for-monthly-billing,PROD),billing_month)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),billing_month)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an-aliased-view-for-monthly-billing,PROD),customer_id)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),customer_id)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an-aliased-view-for-monthly-billing,PROD),email)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),email)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            }
+        ]
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD)",
+    "changeType": "PATCH",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": [
+            {
+                "op": "add",
+                "path": "/upstreams/urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD)",
+                "value": {
+                    "auditStamp": {
+                        "time": 1643871600000,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD)",
+                    "type": "COPY"
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD),amount)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),amount)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD),customer_id)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),customer_id)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD),payment_date)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),payment_date)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD),payment_id)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),payment_id)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD),rental_id)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),rental_id)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD),staff_id)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),staff_id)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            }
+        ]
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payments_by_customer_by_month,PROD)",
+    "changeType": "PATCH",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": [
+            {
+                "op": "add",
+                "path": "/upstreams/urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD)",
+                "value": {
+                    "auditStamp": {
+                        "time": 1643871600000,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD)",
+                    "type": "COPY"
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payments_by_customer_by_month,PROD),BillingMonth)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD),BillingMonth)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payments_by_customer_by_month,PROD),amount)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD),amount)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payments_by_customer_by_month,PROD),customer_id)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD),customer_id)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            }
+        ]
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD)",
+    "changeType": "PATCH",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": [
+            {
+                "op": "add",
+                "path": "/upstreams/urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD)",
+                "value": {
+                    "auditStamp": {
+                        "time": 1643871600000,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD)",
+                    "type": "COPY"
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),active)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),active)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),activebool)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),activebool)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),address_id)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),address_id)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),create_date)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),create_date)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),customer_id)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),customer_id)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),dbt_scd_id)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),dbt_scd_id)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),dbt_updated_at)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),dbt_updated_at)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),dbt_valid_from)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),dbt_valid_from)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),dbt_valid_to)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),dbt_valid_to)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),email)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),email)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),first_name)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),first_name)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),last_name)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),last_name)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),last_update)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),last_update)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            },
+            {
+                "op": "add",
+                "path": "/fineGrainedLineages/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),store_id)/NONE/urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),store_id)",
+                "value": {
+                    "confidenceScore": 1.0
+                }
+            }
+        ]
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:ba2c6ba830d407d539452f4cf46c92a6",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:ba2c6ba830d407d539452f4cf46c92a6",
+    "changeType": "UPSERT",
+    "aspectName": "assertionInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                "manifest_version": "1.7.3",
+                "manifest_adapter": "postgres",
+                "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                "catalog_version": "1.7.3"
+            },
+            "type": "DATASET",
+            "datasetAssertion": {
+                "dataset": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.actor,PROD)",
+                "scope": "DATASET_ROWS",
+                "aggregation": "_NATIVE_",
+                "operator": "_NATIVE_",
+                "nativeType": "assert_source_actor_last_update_is_recent",
+                "nativeParameters": {},
+                "logic": "select\n    *\nfrom \"pagila\".\"public\".\"actor\"\nwhere last_update < (now() - interval '100 years')"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:ba2c6ba830d407d539452f4cf46c92a6",
+    "changeType": "UPSERT",
+    "aspectName": "assertionRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198239,
+            "runId": "just-some-random-id",
+            "asserteeUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.actor,PROD)",
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResults": {}
+            },
+            "assertionUrn": "urn:li:assertion:ba2c6ba830d407d539452f4cf46c92a6",
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:10f2a119dedcaab43afc47ff13d9cb5b",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:10f2a119dedcaab43afc47ff13d9cb5b",
+    "changeType": "UPSERT",
+    "aspectName": "assertionInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                "manifest_version": "1.7.3",
+                "manifest_adapter": "postgres",
+                "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                "catalog_version": "1.7.3"
+            },
+            "type": "DATASET",
+            "datasetAssertion": {
+                "dataset": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+                "scope": "DATASET_COLUMN",
+                "fields": [
+                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),email)"
+                ],
+                "aggregation": "_NATIVE_",
+                "operator": "_NATIVE_",
+                "nativeType": "is_email_monthly_billing_with_cust_email",
+                "nativeParameters": {
+                    "column_name": "email",
+                    "model": "{{ get_where_subquery(ref('monthly_billing_with_cust')) }}"
+                },
+                "logic": "\n\n    select *\n    from \"pagila\".\"public\".\"an-aliased-view-for-monthly-billing\"\n    where email not like '%@%'\n\n"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:10f2a119dedcaab43afc47ff13d9cb5b",
+    "changeType": "UPSERT",
+    "aspectName": "assertionRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198239,
+            "runId": "just-some-random-id",
+            "asserteeUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResults": {}
+            },
+            "assertionUrn": "urn:li:assertion:10f2a119dedcaab43afc47ff13d9cb5b",
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:c456eccf6440c6e3388c584689a74d91",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:c456eccf6440c6e3388c584689a74d91",
+    "changeType": "UPSERT",
+    "aspectName": "assertionInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                "manifest_version": "1.7.3",
+                "manifest_adapter": "postgres",
+                "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                "catalog_version": "1.7.3"
+            },
+            "type": "DATASET",
+            "datasetAssertion": {
+                "dataset": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+                "scope": "DATASET_COLUMN",
+                "fields": [
+                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),billing_month)"
+                ],
+                "aggregation": "IDENTITY",
+                "operator": "NOT_NULL",
+                "nativeType": "not_null_monthly_billing_with_cust_billing_month",
+                "nativeParameters": {
+                    "column_name": "billing_month",
+                    "model": "{{ get_where_subquery(ref('monthly_billing_with_cust')) }}"
+                }
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:c456eccf6440c6e3388c584689a74d91",
+    "changeType": "UPSERT",
+    "aspectName": "assertionRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198239,
+            "runId": "just-some-random-id",
+            "asserteeUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResults": {}
+            },
+            "assertionUrn": "urn:li:assertion:c456eccf6440c6e3388c584689a74d91",
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:f812b73477d81e6af283d918cb59e7bf",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:f812b73477d81e6af283d918cb59e7bf",
+    "changeType": "UPSERT",
+    "aspectName": "assertionInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                "manifest_version": "1.7.3",
+                "manifest_adapter": "postgres",
+                "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                "catalog_version": "1.7.3"
+            },
+            "type": "DATASET",
+            "datasetAssertion": {
+                "dataset": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+                "scope": "DATASET_COLUMN",
+                "fields": [
+                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),email)"
+                ],
+                "aggregation": "IDENTITY",
+                "operator": "NOT_NULL",
+                "nativeType": "not_null_monthly_billing_with_cust_email",
+                "nativeParameters": {
+                    "column_name": "email",
+                    "model": "{{ get_where_subquery(ref('monthly_billing_with_cust')) }}"
+                }
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:f812b73477d81e6af283d918cb59e7bf",
+    "changeType": "UPSERT",
+    "aspectName": "assertionRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198239,
+            "runId": "just-some-random-id",
+            "asserteeUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResults": {}
+            },
+            "assertionUrn": "urn:li:assertion:f812b73477d81e6af283d918cb59e7bf",
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:08c35a6481d3c37c93eaf9e424faa6d5",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:08c35a6481d3c37c93eaf9e424faa6d5",
+    "changeType": "UPSERT",
+    "aspectName": "assertionInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                "manifest_version": "1.7.3",
+                "manifest_adapter": "postgres",
+                "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                "catalog_version": "1.7.3"
+            },
+            "type": "DATASET",
+            "datasetAssertion": {
+                "dataset": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+                "scope": "DATASET_COLUMN",
+                "fields": [
+                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),customer_id)"
+                ],
+                "aggregation": "IDENTITY",
+                "operator": "_NATIVE_",
+                "parameters": {
+                    "value": {
+                        "value": "null",
+                        "type": "SET"
+                    }
+                },
+                "nativeType": "relationships_monthly_billing_with_cust_customer_id__customer_id__ref_customer_details_",
+                "nativeParameters": {
+                    "column_name": "customer_id",
+                    "field": "customer_id",
+                    "model": "{{ get_where_subquery(ref('monthly_billing_with_cust')) }}",
+                    "to": "ref('customer_details')"
+                },
+                "logic": "monthly_billing_with_cust.customer_id referential integrity to customer_details.customer_id"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:08c35a6481d3c37c93eaf9e424faa6d5",
+    "changeType": "UPSERT",
+    "aspectName": "assertionRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198239,
+            "runId": "just-some-random-id",
+            "asserteeUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD)",
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResults": {}
+            },
+            "assertionUrn": "urn:li:assertion:08c35a6481d3c37c93eaf9e424faa6d5",
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:08c35a6481d3c37c93eaf9e424faa6d5",
+    "changeType": "UPSERT",
+    "aspectName": "assertionInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                "manifest_version": "1.7.3",
+                "manifest_adapter": "postgres",
+                "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                "catalog_version": "1.7.3"
+            },
+            "type": "DATASET",
+            "datasetAssertion": {
+                "dataset": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD)",
+                "scope": "DATASET_COLUMN",
+                "fields": [
+                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),customer_id)"
+                ],
+                "aggregation": "IDENTITY",
+                "operator": "_NATIVE_",
+                "parameters": {
+                    "value": {
+                        "value": "null",
+                        "type": "SET"
+                    }
+                },
+                "nativeType": "relationships_monthly_billing_with_cust_customer_id__customer_id__ref_customer_details_",
+                "nativeParameters": {
+                    "column_name": "customer_id",
+                    "field": "customer_id",
+                    "model": "{{ get_where_subquery(ref('monthly_billing_with_cust')) }}",
+                    "to": "ref('customer_details')"
+                },
+                "logic": "monthly_billing_with_cust.customer_id referential integrity to customer_details.customer_id"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:08c35a6481d3c37c93eaf9e424faa6d5",
+    "changeType": "UPSERT",
+    "aspectName": "assertionRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198239,
+            "runId": "just-some-random-id",
+            "asserteeUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD)",
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResults": {}
+            },
+            "assertionUrn": "urn:li:assertion:08c35a6481d3c37c93eaf9e424faa6d5",
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:f6a1fde3ab4919abcc04bdee93144958",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:f6a1fde3ab4919abcc04bdee93144958",
+    "changeType": "UPSERT",
+    "aspectName": "assertionInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                "manifest_version": "1.7.3",
+                "manifest_adapter": "postgres",
+                "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                "catalog_version": "1.7.3"
+            },
+            "type": "DATASET",
+            "datasetAssertion": {
+                "dataset": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.actor,PROD)",
+                "scope": "DATASET_COLUMN",
+                "fields": [
+                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.actor,PROD),actor_id)"
+                ],
+                "aggregation": "IDENTITY",
+                "operator": "NOT_NULL",
+                "nativeType": "source_not_null_pagila_actor_actor_id",
+                "nativeParameters": {
+                    "column_name": "actor_id",
+                    "model": "{{ get_where_subquery(source('pagila', 'actor')) }}"
+                }
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:f6a1fde3ab4919abcc04bdee93144958",
+    "changeType": "UPSERT",
+    "aspectName": "assertionRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198239,
+            "runId": "just-some-random-id",
+            "asserteeUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.actor,PROD)",
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResults": {}
+            },
+            "assertionUrn": "urn:li:assertion:f6a1fde3ab4919abcc04bdee93144958",
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:60ce4aad7ff6dbff7004da0f2258c9df",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:60ce4aad7ff6dbff7004da0f2258c9df",
+    "changeType": "UPSERT",
+    "aspectName": "assertionInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "manifest_schema": "https://schemas.getdbt.com/dbt/manifest/v11.json",
+                "manifest_version": "1.7.3",
+                "manifest_adapter": "postgres",
+                "catalog_schema": "https://schemas.getdbt.com/dbt/catalog/v1.json",
+                "catalog_version": "1.7.3"
+            },
+            "type": "DATASET",
+            "datasetAssertion": {
+                "dataset": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.actor,PROD)",
+                "scope": "DATASET_COLUMN",
+                "fields": [
+                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.actor,PROD),actor_id)"
+                ],
+                "aggregation": "UNIQUE_PROPOTION",
+                "operator": "EQUAL_TO",
+                "parameters": {
+                    "value": {
+                        "value": "1.0",
+                        "type": "NUMBER"
+                    }
+                },
+                "nativeType": "source_unique_pagila_actor_actor_id",
+                "nativeParameters": {
+                    "column_name": "actor_id",
+                    "model": "{{ get_where_subquery(source('pagila', 'actor')) }}"
+                }
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:60ce4aad7ff6dbff7004da0f2258c9df",
+    "changeType": "UPSERT",
+    "aspectName": "assertionRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1663355198239,
+            "runId": "just-some-random-id",
+            "asserteeUrn": "urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.actor,PROD)",
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResults": {}
+            },
+            "assertionUrn": "urn:li:assertion:60ce4aad7ff6dbff7004da0f2258c9df",
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:08c35a6481d3c37c93eaf9e424faa6d5",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:10f2a119dedcaab43afc47ff13d9cb5b",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:60ce4aad7ff6dbff7004da0f2258c9df",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:ba2c6ba830d407d539452f4cf46c92a6",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:c456eccf6440c6e3388c584689a74d91",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:f6a1fde3ab4919abcc04bdee93144958",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:f812b73477d81e6af283d918cb59e7bf",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:36225e795a4597b2376996774a803b0d",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:57aa623f096cf3a28af70fe94b713907",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:a42a5b1bee156e45972e12d4156fb7a2",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:fc6268f0be68fd04c310705b65efd6fe",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:dbt:tag_from_dbt",
+    "changeType": "UPSERT",
+    "aspectName": "tagKey",
+    "aspect": {
+        "json": {
+            "name": "dbt:tag_from_dbt"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "dbt-prefer-sql-parser-lineage",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/dbt/dbt_test_test_model_performance_golden.json b/metadata-ingestion/tests/integration/dbt/dbt_test_test_model_performance_golden.json
index a9b7df7c2b2a1e..bec42f460e0b55 100644
--- a/metadata-ingestion/tests/integration/dbt/dbt_test_test_model_performance_golden.json
+++ b/metadata-ingestion/tests/integration/dbt/dbt_test_test_model_performance_golden.json
@@ -224,7 +224,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),customer_id)"
                                 ],
@@ -236,7 +236,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),first_name)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),last_name)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),full_name)"
                                 ],
@@ -248,7 +248,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),first_name)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.customer_snapshot,PROD),last_name)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),initial_full_name)"
                                 ],
@@ -259,7 +259,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),email)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),email)"
                                 ],
@@ -270,7 +270,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),address)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),address)"
                                 ],
@@ -281,7 +281,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.city,PROD),city)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),city)"
                                 ],
@@ -292,7 +292,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),postal_code)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),postal_code)"
                                 ],
@@ -303,7 +303,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),phone)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),phone)"
                                 ],
@@ -491,7 +491,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payments_by_customer_by_month,PROD),BillingMonth)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),billing_month)"
                                 ],
@@ -502,7 +502,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payments_by_customer_by_month,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),customer_id)"
                                 ],
@@ -513,7 +513,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.payments_by_customer_by_month,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),amount)"
                                 ],
@@ -524,7 +524,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_details,PROD),email)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an-aliased-view-for-monthly-billing,PROD),email)"
                                 ],
@@ -899,7 +899,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),amount)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),amount)"
                                 ],
@@ -915,7 +915,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),customer_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),customer_id)"
                                 ],
@@ -931,7 +931,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),payment_date)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),payment_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),payment_date)"
                                 ],
@@ -947,7 +947,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),payment_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),payment_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),payment_id)"
                                 ],
@@ -963,7 +963,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),rental_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),rental_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),rental_id)"
                                 ],
@@ -979,7 +979,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),staff_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),staff_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.an_aliased_view_for_payments,PROD),staff_id)"
                                 ],
@@ -1285,7 +1285,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD),payment_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD),BillingMonth)"
                                 ],
@@ -1296,7 +1296,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD),customer_id)"
                                 ],
@@ -1307,7 +1307,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.public.an_aliased_view_for_payments,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payments_by_customer_by_month,PROD),amount)"
                                 ],
@@ -1732,7 +1732,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),active)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),active)"
                                 ],
@@ -1743,7 +1743,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),activebool)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),activebool)"
                                 ],
@@ -1754,7 +1754,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),address_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),address_id)"
                                 ],
@@ -1765,7 +1765,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),create_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),create_date)"
                                 ],
@@ -1776,7 +1776,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),customer_id)"
                                 ],
@@ -1787,7 +1787,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),email)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),email)"
                                 ],
@@ -1798,7 +1798,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),first_name)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),first_name)"
                                 ],
@@ -1809,7 +1809,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),last_name)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),last_name)"
                                 ],
@@ -1820,7 +1820,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),last_update)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),last_update)"
                                 ],
@@ -1831,7 +1831,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),store_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer_snapshot,PROD),store_id)"
                                 ],
diff --git a/metadata-ingestion/tests/integration/dbt/dbt_test_with_complex_owner_patterns_mces_golden.json b/metadata-ingestion/tests/integration/dbt/dbt_test_with_complex_owner_patterns_mces_golden.json
index 4863a1e4f73983..495fa32569f569 100644
--- a/metadata-ingestion/tests/integration/dbt/dbt_test_with_complex_owner_patterns_mces_golden.json
+++ b/metadata-ingestion/tests/integration/dbt/dbt_test_with_complex_owner_patterns_mces_golden.json
@@ -235,7 +235,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),customer_id)"
                                 ],
@@ -247,7 +247,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),first_name)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),last_name)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),full_name)"
                                 ],
@@ -258,7 +258,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),email)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),email)"
                                 ],
@@ -269,7 +269,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),address)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),address)"
                                 ],
@@ -280,7 +280,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.city,PROD),city)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),city)"
                                 ],
@@ -291,7 +291,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),postal_code)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),postal_code)"
                                 ],
@@ -302,7 +302,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),phone)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),phone)"
                                 ],
@@ -495,7 +495,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.payments_by_customer_by_month,PROD),billing_month)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-monthly-billing,PROD),billing_month)"
                                 ],
@@ -506,7 +506,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.payments_by_customer_by_month,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-monthly-billing,PROD),customer_id)"
                                 ],
@@ -517,7 +517,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.payments_by_customer_by_month,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-monthly-billing,PROD),amount)"
                                 ],
@@ -774,7 +774,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),amount)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),amount)"
                                 ],
@@ -790,7 +790,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),customer_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),customer_id)"
                                 ],
@@ -806,7 +806,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),payment_date)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),payment_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),payment_date)"
                                 ],
@@ -822,7 +822,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),payment_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),payment_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),payment_id)"
                                 ],
@@ -838,7 +838,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),rental_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),rental_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),rental_id)"
                                 ],
@@ -854,7 +854,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),staff_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),staff_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),staff_id)"
                                 ],
@@ -1022,7 +1022,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),payment_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.payments_by_customer_by_month,PROD),billing_month)"
                                 ],
@@ -1033,7 +1033,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.payments_by_customer_by_month,PROD),customer_id)"
                                 ],
@@ -1044,7 +1044,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.payments_by_customer_by_month,PROD),amount)"
                                 ],
diff --git a/metadata-ingestion/tests/integration/dbt/dbt_test_with_data_platform_instance_mces_golden.json b/metadata-ingestion/tests/integration/dbt/dbt_test_with_data_platform_instance_mces_golden.json
index 7c61e9fcd0e3a1..20b7cf4a1c26ca 100644
--- a/metadata-ingestion/tests/integration/dbt/dbt_test_with_data_platform_instance_mces_golden.json
+++ b/metadata-ingestion/tests/integration/dbt/dbt_test_with_data_platform_instance_mces_golden.json
@@ -237,7 +237,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.customer,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.customer_details,PROD),customer_id)"
                                 ],
@@ -249,7 +249,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.customer,PROD),first_name)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.customer,PROD),last_name)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.customer_details,PROD),full_name)"
                                 ],
@@ -260,7 +260,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.customer,PROD),email)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.customer_details,PROD),email)"
                                 ],
@@ -271,7 +271,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.address,PROD),address)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.customer_details,PROD),address)"
                                 ],
@@ -282,7 +282,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.city,PROD),city)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.customer_details,PROD),city)"
                                 ],
@@ -293,7 +293,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.address,PROD),postal_code)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.customer_details,PROD),postal_code)"
                                 ],
@@ -304,7 +304,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.address,PROD),phone)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.customer_details,PROD),phone)"
                                 ],
@@ -498,7 +498,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.payments_by_customer_by_month,PROD),billing_month)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.an-aliased-view-for-monthly-billing,PROD),billing_month)"
                                 ],
@@ -509,7 +509,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.payments_by_customer_by_month,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.an-aliased-view-for-monthly-billing,PROD),customer_id)"
                                 ],
@@ -520,7 +520,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.payments_by_customer_by_month,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.an-aliased-view-for-monthly-billing,PROD),amount)"
                                 ],
@@ -778,7 +778,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.payment_p2020_05,PROD),amount)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.payment_p2020_06,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.an-aliased-view-for-payments,PROD),amount)"
                                 ],
@@ -794,7 +794,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.payment_p2020_05,PROD),customer_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.payment_p2020_06,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.an-aliased-view-for-payments,PROD),customer_id)"
                                 ],
@@ -810,7 +810,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.payment_p2020_05,PROD),payment_date)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.payment_p2020_06,PROD),payment_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.an-aliased-view-for-payments,PROD),payment_date)"
                                 ],
@@ -826,7 +826,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.payment_p2020_05,PROD),payment_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.payment_p2020_06,PROD),payment_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.an-aliased-view-for-payments,PROD),payment_id)"
                                 ],
@@ -842,7 +842,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.payment_p2020_05,PROD),rental_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.payment_p2020_06,PROD),rental_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.an-aliased-view-for-payments,PROD),rental_id)"
                                 ],
@@ -858,7 +858,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.payment_p2020_05,PROD),staff_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.public.payment_p2020_06,PROD),staff_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.an-aliased-view-for-payments,PROD),staff_id)"
                                 ],
@@ -1027,7 +1027,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),payment_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.payments_by_customer_by_month,PROD),billing_month)"
                                 ],
@@ -1038,7 +1038,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.payments_by_customer_by_month,PROD),customer_id)"
                                 ],
@@ -1049,7 +1049,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,dbt-instance-1.pagila.dbt_postgres.payments_by_customer_by_month,PROD),amount)"
                                 ],
diff --git a/metadata-ingestion/tests/integration/dbt/dbt_test_with_non_incremental_lineage_mces_golden.json b/metadata-ingestion/tests/integration/dbt/dbt_test_with_non_incremental_lineage_mces_golden.json
index a2a8437d551ebf..80ca85a5e6c61b 100644
--- a/metadata-ingestion/tests/integration/dbt/dbt_test_with_non_incremental_lineage_mces_golden.json
+++ b/metadata-ingestion/tests/integration/dbt/dbt_test_with_non_incremental_lineage_mces_golden.json
@@ -236,7 +236,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),customer_id)"
                                 ],
@@ -248,7 +248,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),first_name)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),last_name)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),full_name)"
                                 ],
@@ -259,7 +259,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),email)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),email)"
                                 ],
@@ -270,7 +270,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),address)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),address)"
                                 ],
@@ -281,7 +281,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.city,PROD),city)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),city)"
                                 ],
@@ -292,7 +292,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),postal_code)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),postal_code)"
                                 ],
@@ -303,7 +303,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),phone)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),phone)"
                                 ],
@@ -496,7 +496,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.payments_by_customer_by_month,PROD),billing_month)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-monthly-billing,PROD),billing_month)"
                                 ],
@@ -507,7 +507,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.payments_by_customer_by_month,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-monthly-billing,PROD),customer_id)"
                                 ],
@@ -518,7 +518,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.payments_by_customer_by_month,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-monthly-billing,PROD),amount)"
                                 ],
@@ -775,7 +775,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),amount)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),amount)"
                                 ],
@@ -791,7 +791,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),customer_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),customer_id)"
                                 ],
@@ -807,7 +807,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),payment_date)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),payment_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),payment_date)"
                                 ],
@@ -823,7 +823,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),payment_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),payment_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),payment_id)"
                                 ],
@@ -839,7 +839,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),rental_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),rental_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),rental_id)"
                                 ],
@@ -855,7 +855,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),staff_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),staff_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),staff_id)"
                                 ],
@@ -1023,7 +1023,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),payment_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.payments_by_customer_by_month,PROD),billing_month)"
                                 ],
@@ -1034,7 +1034,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.payments_by_customer_by_month,PROD),customer_id)"
                                 ],
@@ -1045,7 +1045,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.payments_by_customer_by_month,PROD),amount)"
                                 ],
diff --git a/metadata-ingestion/tests/integration/dbt/dbt_test_with_target_platform_instance_mces_golden.json b/metadata-ingestion/tests/integration/dbt/dbt_test_with_target_platform_instance_mces_golden.json
index c37f3847117f68..1e6e4d8ba94a2e 100644
--- a/metadata-ingestion/tests/integration/dbt/dbt_test_with_target_platform_instance_mces_golden.json
+++ b/metadata-ingestion/tests/integration/dbt/dbt_test_with_target_platform_instance_mces_golden.json
@@ -236,7 +236,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),customer_id)"
                                 ],
@@ -248,7 +248,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),first_name)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),last_name)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),full_name)"
                                 ],
@@ -259,7 +259,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.customer,PROD),email)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),email)"
                                 ],
@@ -270,7 +270,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),address)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),address)"
                                 ],
@@ -281,7 +281,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.city,PROD),city)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),city)"
                                 ],
@@ -292,7 +292,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),postal_code)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),postal_code)"
                                 ],
@@ -303,7 +303,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.address,PROD),phone)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.customer_details,PROD),phone)"
                                 ],
@@ -496,7 +496,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,ps-instance-1.pagila.dbt_postgres.payments_by_customer_by_month,PROD),billing_month)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-monthly-billing,PROD),billing_month)"
                                 ],
@@ -507,7 +507,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,ps-instance-1.pagila.dbt_postgres.payments_by_customer_by_month,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-monthly-billing,PROD),customer_id)"
                                 ],
@@ -518,7 +518,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,ps-instance-1.pagila.dbt_postgres.payments_by_customer_by_month,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-monthly-billing,PROD),amount)"
                                 ],
@@ -775,7 +775,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),amount)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),amount)"
                                 ],
@@ -791,7 +791,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),customer_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),customer_id)"
                                 ],
@@ -807,7 +807,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),payment_date)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),payment_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),payment_date)"
                                 ],
@@ -823,7 +823,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),payment_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),payment_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),payment_id)"
                                 ],
@@ -839,7 +839,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),rental_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),rental_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),rental_id)"
                                 ],
@@ -855,7 +855,7 @@
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_05,PROD),staff_id)",
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.public.payment_p2020_06,PROD),staff_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.an-aliased-view-for-payments,PROD),staff_id)"
                                 ],
@@ -1023,7 +1023,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,ps-instance-1.pagila.dbt_postgres.an-aliased-view-for-payments,PROD),payment_date)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.payments_by_customer_by_month,PROD),billing_month)"
                                 ],
@@ -1034,7 +1034,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,ps-instance-1.pagila.dbt_postgres.an-aliased-view-for-payments,PROD),customer_id)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.payments_by_customer_by_month,PROD),customer_id)"
                                 ],
@@ -1045,7 +1045,7 @@
                                 "upstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,ps-instance-1.pagila.dbt_postgres.an-aliased-view-for-payments,PROD),amount)"
                                 ],
-                                "downstreamType": "FIELD_SET",
+                                "downstreamType": "FIELD",
                                 "downstreams": [
                                     "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:dbt,pagila.dbt_postgres.payments_by_customer_by_month,PROD),amount)"
                                 ],
diff --git a/metadata-ingestion/tests/integration/dbt/test_dbt.py b/metadata-ingestion/tests/integration/dbt/test_dbt.py
index 941315fcfa9d5e..d213cffa78045e 100644
--- a/metadata-ingestion/tests/integration/dbt/test_dbt.py
+++ b/metadata-ingestion/tests/integration/dbt/test_dbt.py
@@ -216,6 +216,20 @@ def set_paths(
             run_results_files=["sample_dbt_run_results_2.json"],
             source_config_modifiers={},
         ),
+        DbtTestConfig(
+            "dbt-prefer-sql-parser-lineage",
+            "dbt_test_prefer_sql_parser_lineage.json",
+            "dbt_test_prefer_sql_parser_lineage_golden.json",
+            catalog_file="sample_dbt_catalog_2.json",
+            manifest_file="sample_dbt_manifest_2.json",
+            sources_file="sample_dbt_sources_2.json",
+            run_results_files=["sample_dbt_run_results_2.json"],
+            source_config_modifiers={
+                "prefer_sql_parser_lineage": True,
+                "skip_sources_in_lineage": True,
+                # "entities_enabled": {"sources": "NO"},
+            },
+        ),
     ],
     ids=lambda dbt_test_config: dbt_test_config.run_id,
 )
diff --git a/metadata-ingestion/tests/integration/fivetran/test_fivetran.py b/metadata-ingestion/tests/integration/fivetran/test_fivetran.py
index 887dcce4b7e9b9..0f5d098ee39c4a 100644
--- a/metadata-ingestion/tests/integration/fivetran/test_fivetran.py
+++ b/metadata-ingestion/tests/integration/fivetran/test_fivetran.py
@@ -9,6 +9,7 @@
 from datahub.configuration.common import ConfigurationWarning
 from datahub.ingestion.api.common import PipelineContext
 from datahub.ingestion.run.pipeline import Pipeline
+from datahub.ingestion.source.bigquery_v2.bigquery_config import BigQueryCredential
 from datahub.ingestion.source.fivetran.config import (
     BigQueryDestinationConfig,
     FivetranSourceConfig,
@@ -16,7 +17,6 @@
 )
 from datahub.ingestion.source.fivetran.fivetran import FivetranSource
 from datahub.ingestion.source.fivetran.fivetran_query import FivetranLogQuery
-from datahub.ingestion.source_config.usage.bigquery_usage import BigQueryCredential
 from tests.test_helpers import mce_helpers
 
 FROZEN_TIME = "2022-06-07 17:00:00"
@@ -205,6 +205,11 @@ def test_fivetran_with_snowflake_dest(pytestconfig, tmp_path):
                                 "postgres",
                             ]
                         },
+                        "destination_patterns": {
+                            "allow": [
+                                "interval_unconstitutional",
+                            ]
+                        },
                         "sources_to_database": {
                             "calendar_elected": "postgres_db",
                         },
@@ -291,6 +296,11 @@ def test_fivetran_with_snowflake_dest_and_null_connector_user(pytestconfig, tmp_
                                 "postgres",
                             ]
                         },
+                        "destination_patterns": {
+                            "allow": [
+                                "interval_unconstitutional",
+                            ]
+                        },
                         "sources_to_database": {
                             "calendar_elected": "postgres_db",
                         },
diff --git a/metadata-ingestion/tests/integration/hana/docker-compose.yml b/metadata-ingestion/tests/integration/hana/docker-compose.yml
index 38bd1f544a0955..3f742362284835 100644
--- a/metadata-ingestion/tests/integration/hana/docker-compose.yml
+++ b/metadata-ingestion/tests/integration/hana/docker-compose.yml
@@ -2,15 +2,11 @@
 version: '3.4'
 services:
   testhana:
-    image: "store/saplabs/hanaexpress:2.00.054.00.20210603.1"
+    image: "saplabs/hanaexpress:latest"
     container_name: "testhana"
     restart: "unless-stopped"
     ports:
-      - 39013:39013
-      - 39017:39017
-      - 39041-39045:39041-39045
-      - 1128-1129:1128-1129
-      - 59013-59014:59013-59014 
+      - 39041:39041
     volumes:
       - ./post_start:/hana/hooks/post_start/
       - ./setup:/hana/mounts/setup/
diff --git a/metadata-ingestion/tests/integration/hana/hana_mces_golden.json b/metadata-ingestion/tests/integration/hana/hana_mces_golden.json
index 84ad1f3d3e592c..26789abc355c75 100644
--- a/metadata-ingestion/tests/integration/hana/hana_mces_golden.json
+++ b/metadata-ingestion/tests/integration/hana/hana_mces_golden.json
@@ -1,158 +1,217 @@
 [
 {
-    "auditHeader": null,
     "entityType": "container",
     "entityUrn": "urn:li:container:c8107a53ee221a15de176e4d34a06940",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
-        "value": "{\"customProperties\": {\"platform\": \"hana\", \"instance\": \"PROD\", \"database\": \"hxe\"}, \"name\": \"hxe\"}",
-        "contentType": "application/json"
+        "json": {
+            "customProperties": {
+                "platform": "hana",
+                "env": "PROD",
+                "database": "hxe"
+            },
+            "name": "hxe"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "hana-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c8107a53ee221a15de176e4d34a06940",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "container",
     "entityUrn": "urn:li:container:c8107a53ee221a15de176e4d34a06940",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
-        "value": "{\"platform\": \"urn:li:dataPlatform:hana\"}",
-        "contentType": "application/json"
+        "json": {
+            "platform": "urn:li:dataPlatform:hana"
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "container",
     "entityUrn": "urn:li:container:c8107a53ee221a15de176e4d34a06940",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
-        "value": "{\"typeNames\": [\"Database\"]}",
-        "contentType": "application/json"
+        "json": {
+            "typeNames": [
+                "Database"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "hana-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c8107a53ee221a15de176e4d34a06940",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": []
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "container",
     "entityUrn": "urn:li:container:f870c782e0a44727bd10da2ab742363b",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
-        "value": "{\"customProperties\": {\"platform\": \"hana\", \"instance\": \"PROD\", \"database\": \"hxe\", \"schema\": \"hotel\"}, \"name\": \"hotel\"}",
-        "contentType": "application/json"
+        "json": {
+            "customProperties": {
+                "platform": "hana",
+                "env": "PROD",
+                "database": "hxe",
+                "schema": "hotel"
+            },
+            "name": "hotel"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "hana-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f870c782e0a44727bd10da2ab742363b",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "container",
     "entityUrn": "urn:li:container:f870c782e0a44727bd10da2ab742363b",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
-        "value": "{\"platform\": \"urn:li:dataPlatform:hana\"}",
-        "contentType": "application/json"
+        "json": {
+            "platform": "urn:li:dataPlatform:hana"
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "container",
     "entityUrn": "urn:li:container:f870c782e0a44727bd10da2ab742363b",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
-        "value": "{\"typeNames\": [\"Schema\"]}",
-        "contentType": "application/json"
+        "json": {
+            "typeNames": [
+                "Schema"
+            ]
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "container",
     "entityUrn": "urn:li:container:f870c782e0a44727bd10da2ab742363b",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
-        "value": "{\"container\": \"urn:li:container:c8107a53ee221a15de176e4d34a06940\"}",
-        "contentType": "application/json"
+        "json": {
+            "container": "urn:li:container:c8107a53ee221a15de176e4d34a06940"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "hana-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f870c782e0a44727bd10da2ab742363b",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:c8107a53ee221a15de176e4d34a06940",
+                    "urn": "urn:li:container:c8107a53ee221a15de176e4d34a06940"
+                }
+            ]
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.customer,PROD)",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
-        "value": "{\"container\": \"urn:li:container:f870c782e0a44727bd10da2ab742363b\"}",
-        "contentType": "application/json"
+        "json": {
+            "container": "urn:li:container:f870c782e0a44727bd10da2ab742363b"
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "proposedSnapshot": {
         "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
             "urn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.customer,PROD)",
@@ -165,11 +224,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {},
-                        "externalUrl": null,
                         "name": "customer",
-                        "qualifiedName": null,
-                        "description": null,
-                        "uri": null,
                         "tags": []
                     }
                 },
@@ -180,17 +235,12 @@
                         "version": 0,
                         "created": {
                             "time": 0,
-                            "actor": "urn:li:corpuser:unknown",
-                            "impersonator": null
+                            "actor": "urn:li:corpuser:unknown"
                         },
                         "lastModified": {
                             "time": 0,
-                            "actor": "urn:li:corpuser:unknown",
-                            "impersonator": null
+                            "actor": "urn:li:corpuser:unknown"
                         },
-                        "deleted": null,
-                        "dataset": null,
-                        "cluster": null,
                         "hash": "",
                         "platformSchema": {
                             "com.linkedin.pegasus2avro.schema.MySqlDDL": {
@@ -200,189 +250,166 @@
                         "fields": [
                             {
                                 "fieldPath": "cno",
-                                "jsonPath": null,
                                 "nullable": false,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": true,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": true
                             },
                             {
                                 "fieldPath": "title",
-                                "jsonPath": null,
                                 "nullable": true,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=7)",
+                                "nativeDataType": "VARCHAR(7)",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": false,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": false
                             },
                             {
                                 "fieldPath": "firstname",
-                                "jsonPath": null,
                                 "nullable": true,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=20)",
+                                "nativeDataType": "VARCHAR(20)",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": false,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": false
                             },
                             {
                                 "fieldPath": "name",
-                                "jsonPath": null,
                                 "nullable": false,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=40)",
+                                "nativeDataType": "VARCHAR(40)",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": false,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": false
                             },
                             {
                                 "fieldPath": "address",
-                                "jsonPath": null,
                                 "nullable": false,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=40)",
+                                "nativeDataType": "VARCHAR(40)",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": false,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": false
                             },
                             {
                                 "fieldPath": "zip",
-                                "jsonPath": null,
                                 "nullable": true,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=6)",
+                                "nativeDataType": "VARCHAR(6)",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": false,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": false
                             }
-                        ],
-                        "primaryKeys": null,
-                        "foreignKeysSpecs": null,
-                        "foreignKeys": null
+                        ]
                     }
                 }
             ]
         }
     },
-    "proposedDelta": null,
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.customer,PROD)",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
-        "value": "{\"typeNames\": [\"Table\"]}",
-        "contentType": "application/json"
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.customer,PROD)",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "domains",
     "aspect": {
-        "value": "{\"domains\": [\"urn:li:domain:sales\"]}",
-        "contentType": "application/json"
+        "json": {
+            "domains": [
+                "urn:li:domain:sales"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "hana-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.customer,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:c8107a53ee221a15de176e4d34a06940",
+                    "urn": "urn:li:container:c8107a53ee221a15de176e4d34a06940"
+                },
+                {
+                    "id": "urn:li:container:f870c782e0a44727bd10da2ab742363b",
+                    "urn": "urn:li:container:f870c782e0a44727bd10da2ab742363b"
+                }
+            ]
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.hotel,PROD)",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
-        "value": "{\"container\": \"urn:li:container:f870c782e0a44727bd10da2ab742363b\"}",
-        "contentType": "application/json"
+        "json": {
+            "container": "urn:li:container:f870c782e0a44727bd10da2ab742363b"
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "proposedSnapshot": {
         "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
             "urn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.hotel,PROD)",
@@ -395,11 +422,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {},
-                        "externalUrl": null,
                         "name": "hotel",
-                        "qualifiedName": null,
-                        "description": null,
-                        "uri": null,
                         "tags": []
                     }
                 },
@@ -410,17 +433,12 @@
                         "version": 0,
                         "created": {
                             "time": 0,
-                            "actor": "urn:li:corpuser:unknown",
-                            "impersonator": null
+                            "actor": "urn:li:corpuser:unknown"
                         },
                         "lastModified": {
                             "time": 0,
-                            "actor": "urn:li:corpuser:unknown",
-                            "impersonator": null
+                            "actor": "urn:li:corpuser:unknown"
                         },
-                        "deleted": null,
-                        "dataset": null,
-                        "cluster": null,
                         "hash": "",
                         "platformSchema": {
                             "com.linkedin.pegasus2avro.schema.MySqlDDL": {
@@ -430,189 +448,166 @@
                         "fields": [
                             {
                                 "fieldPath": "hno",
-                                "jsonPath": null,
                                 "nullable": false,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": true,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": true
                             },
                             {
                                 "fieldPath": "name",
-                                "jsonPath": null,
                                 "nullable": false,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": false,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": false
                             },
                             {
                                 "fieldPath": "address",
-                                "jsonPath": null,
                                 "nullable": false,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=40)",
+                                "nativeDataType": "VARCHAR(40)",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": false,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": false
                             },
                             {
                                 "fieldPath": "city",
-                                "jsonPath": null,
                                 "nullable": false,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=30)",
+                                "nativeDataType": "VARCHAR(30)",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": false,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": false
                             },
                             {
                                 "fieldPath": "state",
-                                "jsonPath": null,
                                 "nullable": false,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=2)",
+                                "nativeDataType": "VARCHAR(2)",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": false,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": false
                             },
                             {
                                 "fieldPath": "zip",
-                                "jsonPath": null,
                                 "nullable": true,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=6)",
+                                "nativeDataType": "VARCHAR(6)",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": false,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": false
                             }
-                        ],
-                        "primaryKeys": null,
-                        "foreignKeysSpecs": null,
-                        "foreignKeys": null
+                        ]
                     }
                 }
             ]
         }
     },
-    "proposedDelta": null,
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.hotel,PROD)",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
-        "value": "{\"typeNames\": [\"Table\"]}",
-        "contentType": "application/json"
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.hotel,PROD)",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "domains",
     "aspect": {
-        "value": "{\"domains\": [\"urn:li:domain:sales\"]}",
-        "contentType": "application/json"
+        "json": {
+            "domains": [
+                "urn:li:domain:sales"
+            ]
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.hotel,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:c8107a53ee221a15de176e4d34a06940",
+                    "urn": "urn:li:container:c8107a53ee221a15de176e4d34a06940"
+                },
+                {
+                    "id": "urn:li:container:f870c782e0a44727bd10da2ab742363b",
+                    "urn": "urn:li:container:f870c782e0a44727bd10da2ab742363b"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "hana-test",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.maintenance,PROD)",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
-        "value": "{\"container\": \"urn:li:container:f870c782e0a44727bd10da2ab742363b\"}",
-        "contentType": "application/json"
+        "json": {
+            "container": "urn:li:container:f870c782e0a44727bd10da2ab742363b"
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "proposedSnapshot": {
         "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
             "urn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.maintenance,PROD)",
@@ -625,11 +620,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {},
-                        "externalUrl": null,
                         "name": "maintenance",
-                        "qualifiedName": null,
-                        "description": null,
-                        "uri": null,
                         "tags": []
                     }
                 },
@@ -640,17 +631,12 @@
                         "version": 0,
                         "created": {
                             "time": 0,
-                            "actor": "urn:li:corpuser:unknown",
-                            "impersonator": null
+                            "actor": "urn:li:corpuser:unknown"
                         },
                         "lastModified": {
                             "time": 0,
-                            "actor": "urn:li:corpuser:unknown",
-                            "impersonator": null
+                            "actor": "urn:li:corpuser:unknown"
                         },
-                        "deleted": null,
-                        "dataset": null,
-                        "cluster": null,
                         "hash": "",
                         "platformSchema": {
                             "com.linkedin.pegasus2avro.schema.MySqlDDL": {
@@ -660,205 +646,811 @@
                         "fields": [
                             {
                                 "fieldPath": "mno",
-                                "jsonPath": null,
                                 "nullable": false,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": true,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": true
                             },
                             {
                                 "fieldPath": "hno",
-                                "jsonPath": null,
                                 "nullable": true,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": false,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": false
                             },
                             {
                                 "fieldPath": "description",
-                                "jsonPath": null,
                                 "nullable": true,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=100)",
+                                "nativeDataType": "VARCHAR(100)",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": false,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": false
                             },
                             {
                                 "fieldPath": "date_performed",
-                                "jsonPath": null,
                                 "nullable": true,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": false,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": false
                             },
                             {
                                 "fieldPath": "performed_by",
-                                "jsonPath": null,
                                 "nullable": true,
-                                "description": null,
                                 "type": {
                                     "type": {
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=40)",
+                                "nativeDataType": "VARCHAR(40)",
                                 "recursive": false,
-                                "globalTags": null,
-                                "glossaryTerms": null,
-                                "isPartOfKey": false,
-                                "isPartitioningKey": null,
-                                "jsonProps": null
+                                "isPartOfKey": false
                             }
-                        ],
-                        "primaryKeys": null,
-                        "foreignKeysSpecs": null,
-                        "foreignKeys": null
+                        ]
                     }
                 }
             ]
         }
     },
-    "proposedDelta": null,
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.maintenance,PROD)",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
-        "value": "{\"typeNames\": [\"Table\"]}",
-        "contentType": "application/json"
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.maintenance,PROD)",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "domains",
     "aspect": {
-        "value": "{\"domains\": [\"urn:li:domain:sales\"]}",
-        "contentType": "application/json"
+        "json": {
+            "domains": [
+                "urn:li:domain:sales"
+            ]
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.maintenance,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:c8107a53ee221a15de176e4d34a06940",
+                    "urn": "urn:li:container:c8107a53ee221a15de176e4d34a06940"
+                },
+                {
+                    "id": "urn:li:container:f870c782e0a44727bd10da2ab742363b",
+                    "urn": "urn:li:container:f870c782e0a44727bd10da2ab742363b"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "hana-test",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.customer,PROD)",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "datasetProfile",
     "aspect": {
-        "value": "{\"timestampMillis\": 1586847600000, \"partitionSpec\": {\"type\": \"FULL_TABLE\", \"partition\": \"FULL_TABLE_SNAPSHOT\"}, \"rowCount\": 15, \"columnCount\": 6, \"fieldProfiles\": [{\"fieldPath\": \"cno\", \"uniqueCount\": 15, \"uniqueProportion\": 1.0, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"1000\", \"1001\", \"1002\", \"1003\", \"1004\", \"1005\", \"1006\", \"1007\", \"1008\", \"1009\", \"1010\", \"1011\", \"1012\", \"1013\", \"1014\"]}, {\"fieldPath\": \"title\", \"uniqueCount\": 3, \"uniqueProportion\": 0.2, \"nullCount\": 0, \"nullProportion\": 0.0, \"distinctValueFrequencies\": [{\"value\": \"Company\", \"frequency\": 2}, {\"value\": \"Mr\", \"frequency\": 7}, {\"value\": \"Mrs\", \"frequency\": 6}], \"sampleValues\": [\"Mrs\", \"Mr\", \"Company\", \"Mrs\", \"Mrs\", \"Mr\", \"Mrs\", \"Mr\", \"Mrs\", \"Mr\", \"Mr\", \"Mrs\", \"Mr\", \"Company\", \"Mr\"]}, {\"fieldPath\": \"firstname\", \"uniqueCount\": 13, \"uniqueProportion\": 1.0, \"nullCount\": 2, \"nullProportion\": 0.13333333333333333, \"sampleValues\": [\"Jenny\", \"Peter\", \"Rose\", \"Mary\", \"Martin\", \"Sally\", \"Mike\", \"Rita\", \"George\", \"Frank\", \"Susan\", \"Joseph\", \"Antony\"]}, {\"fieldPath\": \"name\", \"uniqueCount\": 15, \"uniqueProportion\": 1.0, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"Porter\", \"Brown\", \"Datasoft\", \"Brian\", \"Griffith\", \"Randolph\", \"Smith\", \"Jackson\", \"Doe\", \"Howe\", \"Miller\", \"Baker\", \"Peters\", \"TOOLware\", \"Jenkins\"]}, {\"fieldPath\": \"address\", \"uniqueCount\": 15, \"uniqueProportion\": 1.0, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"1340 N. Ash Street, #3\", \"1001 34th St., APT.3\", \"486 Maple St.\", \"500 Yellowstone Drive, #2\", \"3401 Elder Lane\", \"340 MAIN STREET, #7\", \"250 Curtis Street\", \"133 BROADWAY APT. 1\", \"2000 Humboldt St., #6\", \"111 B Parkway, #23\", \"27 5th St., 76\", \"200 MAIN STREET, #94\", \"700 S. Ash St., APT.12\", \"410 Mariposa St., #10\", \"55 A Parkway, #15\"]}, {\"fieldPath\": \"zip\", \"uniqueCount\": 12, \"uniqueProportion\": 0.8, \"nullCount\": 0, \"nullProportion\": 0.0, \"distinctValueFrequencies\": [{\"value\": \"10580\", \"frequency\": 1}, {\"value\": \"20005\", \"frequency\": 1}, {\"value\": \"20019\", \"frequency\": 1}, {\"value\": \"20903\", \"frequency\": 1}, {\"value\": \"45211\", \"frequency\": 1}, {\"value\": \"48226\", \"frequency\": 1}, {\"value\": \"60615\", \"frequency\": 1}, {\"value\": \"75243\", \"frequency\": 3}, {\"value\": \"90018\", \"frequency\": 2}, {\"value\": \"92714\", \"frequency\": 1}, {\"value\": \"95054\", \"frequency\": 1}, {\"value\": \"97213\", \"frequency\": 1}], \"sampleValues\": [\"10580\", \"48226\", \"90018\", \"75243\", \"20005\", \"60615\", \"75243\", \"45211\", \"97213\", \"75243\", \"95054\", \"90018\", \"92714\", \"20019\", \"20903\"]}]}",
-        "contentType": "application/json"
+        "json": {
+            "timestampMillis": 1586847600000,
+            "partitionSpec": {
+                "type": "FULL_TABLE",
+                "partition": "FULL_TABLE_SNAPSHOT"
+            },
+            "rowCount": 15,
+            "columnCount": 6,
+            "fieldProfiles": [
+                {
+                    "fieldPath": "cno",
+                    "uniqueCount": 15,
+                    "uniqueProportion": 1,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "min": "1000",
+                    "max": "1014",
+                    "mean": "1007.0",
+                    "median": "1007",
+                    "stdev": "4.472135",
+                    "sampleValues": [
+                        "1000",
+                        "1001",
+                        "1002",
+                        "1003",
+                        "1004",
+                        "1005",
+                        "1006",
+                        "1007",
+                        "1008",
+                        "1009",
+                        "1010",
+                        "1011",
+                        "1012",
+                        "1013",
+                        "1014"
+                    ]
+                },
+                {
+                    "fieldPath": "title",
+                    "uniqueCount": 3,
+                    "uniqueProportion": 0.2,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "Company",
+                            "frequency": 2
+                        },
+                        {
+                            "value": "Mr",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "Mrs",
+                            "frequency": 6
+                        }
+                    ],
+                    "sampleValues": [
+                        "Mrs",
+                        "Mr",
+                        "Company",
+                        "Mrs",
+                        "Mrs",
+                        "Mr",
+                        "Mrs",
+                        "Mr",
+                        "Mrs",
+                        "Mr",
+                        "Mr",
+                        "Mrs",
+                        "Mr",
+                        "Company",
+                        "Mr"
+                    ]
+                },
+                {
+                    "fieldPath": "firstname",
+                    "uniqueCount": 13,
+                    "uniqueProportion": 1,
+                    "nullCount": 2,
+                    "nullProportion": 0.13333333333333333,
+                    "sampleValues": [
+                        "Jenny",
+                        "Peter",
+                        "Rose",
+                        "Mary",
+                        "Martin",
+                        "Sally",
+                        "Mike",
+                        "Rita",
+                        "George",
+                        "Frank",
+                        "Susan",
+                        "Joseph",
+                        "Antony"
+                    ]
+                },
+                {
+                    "fieldPath": "name",
+                    "uniqueCount": 15,
+                    "uniqueProportion": 1,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "Porter",
+                        "Brown",
+                        "Datasoft",
+                        "Brian",
+                        "Griffith",
+                        "Randolph",
+                        "Smith",
+                        "Jackson",
+                        "Doe",
+                        "Howe",
+                        "Miller",
+                        "Baker",
+                        "Peters",
+                        "TOOLware",
+                        "Jenkins"
+                    ]
+                },
+                {
+                    "fieldPath": "address",
+                    "uniqueCount": 15,
+                    "uniqueProportion": 1,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "1340 N. Ash Street, #3",
+                        "1001 34th St., APT.3",
+                        "486 Maple St.",
+                        "500 Yellowstone Drive, #2",
+                        "3401 Elder Lane",
+                        "340 MAIN STREET, #7",
+                        "250 Curtis Street",
+                        "133 BROADWAY APT. 1",
+                        "2000 Humboldt St., #6",
+                        "111 B Parkway, #23",
+                        "27 5th St., 76",
+                        "200 MAIN STREET, #94",
+                        "700 S. Ash St., APT.12",
+                        "410 Mariposa St., #10",
+                        "55 A Parkway, #15"
+                    ]
+                },
+                {
+                    "fieldPath": "zip",
+                    "uniqueCount": 12,
+                    "uniqueProportion": 0.8,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "10580",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "20005",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "20019",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "20903",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "45211",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "48226",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "60615",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "75243",
+                            "frequency": 3
+                        },
+                        {
+                            "value": "90018",
+                            "frequency": 2
+                        },
+                        {
+                            "value": "92714",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "95054",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "97213",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "10580",
+                        "48226",
+                        "90018",
+                        "75243",
+                        "20005",
+                        "60615",
+                        "75243",
+                        "45211",
+                        "97213",
+                        "75243",
+                        "95054",
+                        "90018",
+                        "92714",
+                        "20019",
+                        "20903"
+                    ]
+                }
+            ]
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.hotel,PROD)",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "datasetProfile",
     "aspect": {
-        "value": "{\"timestampMillis\": 1586847600000, \"partitionSpec\": {\"type\": \"FULL_TABLE\", \"partition\": \"FULL_TABLE_SNAPSHOT\"}, \"rowCount\": 17, \"columnCount\": 6, \"fieldProfiles\": [{\"fieldPath\": \"hno\", \"uniqueCount\": 17, \"uniqueProportion\": 1.0, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"10\", \"11\", \"12\", \"13\", \"14\", \"15\", \"16\", \"17\", \"18\", \"19\", \"20\", \"21\", \"22\", \"23\", \"24\", \"25\", \"26\"]}, {\"fieldPath\": \"name\", \"uniqueCount\": 17, \"uniqueProportion\": 1.0, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"Congress\", \"Regency\", \"Long Island\", \"Empire State\", \"Midtown\", \"Eighth Avenue\", \"Lake Michigan\", \"Airport\", \"Sunshine\", \"Beach\", \"Atlantic\", \"Long Beach\", \"Indian Horse\", \"Star\", \"River Boat\", \"Ocean Star\", \"Bella Ciente\"]}, {\"fieldPath\": \"address\", \"uniqueCount\": 17, \"uniqueProportion\": 1.0, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"155 Beechwood St.\", \"477 17th Avenue\", \"1499 Grove Street\", \"65 Yellowstone Dr.\", \"12 Barnard St.\", \"112 8th Avenue\", \"354 OAK Terrace\", \"650 C Parkway\", \"200 Yellowstone Dr.\", \"1980 34th St.\", \"111 78th St.\", \"35 Broadway\", \"16 MAIN STREET\", \"13 Beechwood Place\", \"788 MAIN STREET\", \"45 Pacific Avenue\", \"1407 Marshall Ave\"]}, {\"fieldPath\": \"city\", \"uniqueCount\": 15, \"uniqueProportion\": 0.8823529411764706, \"nullCount\": 0, \"nullProportion\": 0.0, \"distinctValueFrequencies\": [{\"value\": \"Albany\", \"frequency\": 1}, {\"value\": \"Atlantic City\", \"frequency\": 1}, {\"value\": \"Chicago\", \"frequency\": 1}, {\"value\": \"Clearwater\", \"frequency\": 1}, {\"value\": \"Daytona Beach\", \"frequency\": 1}, {\"value\": \"Deerfield Beach\", \"frequency\": 1}, {\"value\": \"Hollywood\", \"frequency\": 1}, {\"value\": \"Long Beach\", \"frequency\": 1}, {\"value\": \"Long Island\", \"frequency\": 1}, {\"value\": \"Longview\", \"frequency\": 1}, {\"value\": \"New Orleans\", \"frequency\": 1}, {\"value\": \"New York\", \"frequency\": 2}, {\"value\": \"Palm Springs\", \"frequency\": 1}, {\"value\": \"Rosemont\", \"frequency\": 1}, {\"value\": \"Seattle\", \"frequency\": 2}], \"sampleValues\": [\"Seattle\", \"Seattle\", \"Long Island\", \"Albany\", \"New York\", \"New York\", \"Chicago\", \"Rosemont\", \"Clearwater\", \"Daytona Beach\", \"Deerfield Beach\", \"Long Beach\", \"Palm Springs\", \"Hollywood\", \"New Orleans\", \"Atlantic City\", \"Longview\"]}, {\"fieldPath\": \"state\", \"uniqueCount\": 8, \"uniqueProportion\": 0.47058823529411764, \"nullCount\": 0, \"nullProportion\": 0.0, \"distinctValueFrequencies\": [{\"value\": \"CA\", \"frequency\": 3}, {\"value\": \"FL\", \"frequency\": 3}, {\"value\": \"IL\", \"frequency\": 2}, {\"value\": \"LA\", \"frequency\": 1}, {\"value\": \"NJ\", \"frequency\": 1}, {\"value\": \"NY\", \"frequency\": 4}, {\"value\": \"TX\", \"frequency\": 1}, {\"value\": \"WA\", \"frequency\": 2}], \"sampleValues\": [\"WA\", \"WA\", \"NY\", \"NY\", \"NY\", \"NY\", \"IL\", \"IL\", \"FL\", \"FL\", \"FL\", \"CA\", \"CA\", \"CA\", \"LA\", \"NJ\", \"TX\"]}, {\"fieldPath\": \"zip\", \"uniqueCount\": 16, \"uniqueProportion\": 0.9411764705882353, \"nullCount\": 0, \"nullProportion\": 0.0, \"distinctValueFrequencies\": [{\"value\": \"08401\", \"frequency\": 1}, {\"value\": \"10019\", \"frequency\": 2}, {\"value\": \"11788\", \"frequency\": 1}, {\"value\": \"12203\", \"frequency\": 1}, {\"value\": \"20005\", \"frequency\": 1}, {\"value\": \"20037\", \"frequency\": 1}, {\"value\": \"32018\", \"frequency\": 1}, {\"value\": \"33441\", \"frequency\": 1}, {\"value\": \"33575\", \"frequency\": 1}, {\"value\": \"60018\", \"frequency\": 1}, {\"value\": \"60601\", \"frequency\": 1}, {\"value\": \"70112\", \"frequency\": 1}, {\"value\": \"75601\", \"frequency\": 1}, {\"value\": \"90029\", \"frequency\": 1}, {\"value\": \"90804\", \"frequency\": 1}, {\"value\": \"92262\", \"frequency\": 1}], \"sampleValues\": [\"20005\", \"20037\", \"11788\", \"12203\", \"10019\", \"10019\", \"60601\", \"60018\", \"33575\", \"32018\", \"33441\", \"90804\", \"92262\", \"90029\", \"70112\", \"08401\", \"75601\"]}]}",
-        "contentType": "application/json"
+        "json": {
+            "timestampMillis": 1586847600000,
+            "partitionSpec": {
+                "type": "FULL_TABLE",
+                "partition": "FULL_TABLE_SNAPSHOT"
+            },
+            "rowCount": 17,
+            "columnCount": 6,
+            "fieldProfiles": [
+                {
+                    "fieldPath": "hno",
+                    "uniqueCount": 17,
+                    "uniqueProportion": 1,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "min": "10",
+                    "max": "26",
+                    "mean": "18.0",
+                    "median": "18",
+                    "stdev": "5.049752",
+                    "sampleValues": [
+                        "10",
+                        "11",
+                        "12",
+                        "13",
+                        "14",
+                        "15",
+                        "16",
+                        "17",
+                        "18",
+                        "19",
+                        "20",
+                        "21",
+                        "22",
+                        "23",
+                        "24",
+                        "25",
+                        "26"
+                    ]
+                },
+                {
+                    "fieldPath": "name",
+                    "uniqueCount": 17,
+                    "uniqueProportion": 1,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "Congress",
+                        "Regency",
+                        "Long Island",
+                        "Empire State",
+                        "Midtown",
+                        "Eighth Avenue",
+                        "Lake Michigan",
+                        "Airport",
+                        "Sunshine",
+                        "Beach",
+                        "Atlantic",
+                        "Long Beach",
+                        "Indian Horse",
+                        "Star",
+                        "River Boat",
+                        "Ocean Star",
+                        "Bella Ciente"
+                    ]
+                },
+                {
+                    "fieldPath": "address",
+                    "uniqueCount": 17,
+                    "uniqueProportion": 1,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "155 Beechwood St.",
+                        "477 17th Avenue",
+                        "1499 Grove Street",
+                        "65 Yellowstone Dr.",
+                        "12 Barnard St.",
+                        "112 8th Avenue",
+                        "354 OAK Terrace",
+                        "650 C Parkway",
+                        "200 Yellowstone Dr.",
+                        "1980 34th St.",
+                        "111 78th St.",
+                        "35 Broadway",
+                        "16 MAIN STREET",
+                        "13 Beechwood Place",
+                        "788 MAIN STREET",
+                        "45 Pacific Avenue",
+                        "1407 Marshall Ave"
+                    ]
+                },
+                {
+                    "fieldPath": "city",
+                    "uniqueCount": 15,
+                    "uniqueProportion": 0.8823529411764706,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "Albany",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "Atlantic City",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "Chicago",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "Clearwater",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "Daytona Beach",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "Deerfield Beach",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "Hollywood",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "Long Beach",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "Long Island",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "Longview",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "New Orleans",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "New York",
+                            "frequency": 2
+                        },
+                        {
+                            "value": "Palm Springs",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "Rosemont",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "Seattle",
+                            "frequency": 2
+                        }
+                    ],
+                    "sampleValues": [
+                        "Seattle",
+                        "Seattle",
+                        "Long Island",
+                        "Albany",
+                        "New York",
+                        "New York",
+                        "Chicago",
+                        "Rosemont",
+                        "Clearwater",
+                        "Daytona Beach",
+                        "Deerfield Beach",
+                        "Long Beach",
+                        "Palm Springs",
+                        "Hollywood",
+                        "New Orleans",
+                        "Atlantic City",
+                        "Longview"
+                    ]
+                },
+                {
+                    "fieldPath": "state",
+                    "uniqueCount": 8,
+                    "uniqueProportion": 0.47058823529411764,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "CA",
+                            "frequency": 3
+                        },
+                        {
+                            "value": "FL",
+                            "frequency": 3
+                        },
+                        {
+                            "value": "IL",
+                            "frequency": 2
+                        },
+                        {
+                            "value": "LA",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "NJ",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "NY",
+                            "frequency": 4
+                        },
+                        {
+                            "value": "TX",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "WA",
+                            "frequency": 2
+                        }
+                    ],
+                    "sampleValues": [
+                        "WA",
+                        "WA",
+                        "NY",
+                        "NY",
+                        "NY",
+                        "NY",
+                        "IL",
+                        "IL",
+                        "FL",
+                        "FL",
+                        "FL",
+                        "CA",
+                        "CA",
+                        "CA",
+                        "LA",
+                        "NJ",
+                        "TX"
+                    ]
+                },
+                {
+                    "fieldPath": "zip",
+                    "uniqueCount": 16,
+                    "uniqueProportion": 0.9411764705882353,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "08401",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "10019",
+                            "frequency": 2
+                        },
+                        {
+                            "value": "11788",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "12203",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "20005",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "20037",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "32018",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "33441",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "33575",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "60018",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "60601",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "70112",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "75601",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "90029",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "90804",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "92262",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "20005",
+                        "20037",
+                        "11788",
+                        "12203",
+                        "10019",
+                        "10019",
+                        "60601",
+                        "60018",
+                        "33575",
+                        "32018",
+                        "33441",
+                        "90804",
+                        "92262",
+                        "90029",
+                        "70112",
+                        "08401",
+                        "75601"
+                    ]
+                }
+            ]
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "auditHeader": null,
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,hotel.maintenance,PROD)",
-    "entityKeyAspect": null,
     "changeType": "UPSERT",
     "aspectName": "datasetProfile",
     "aspect": {
-        "value": "{\"timestampMillis\": 1586847600000, \"partitionSpec\": {\"type\": \"FULL_TABLE\", \"partition\": \"FULL_TABLE_SNAPSHOT\"}, \"rowCount\": 3, \"columnCount\": 5, \"fieldProfiles\": [{\"fieldPath\": \"mno\", \"uniqueCount\": 3, \"uniqueProportion\": 1.0, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"10\", \"11\", \"12\"]}, {\"fieldPath\": \"hno\", \"uniqueCount\": 3, \"uniqueProportion\": 1.0, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"24\", \"25\", \"26\"]}, {\"fieldPath\": \"description\", \"uniqueCount\": 3, \"uniqueProportion\": 1.0, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"Replace pool liner and pump\", \"Renovate the bar area.  Replace TV and speakers\", \"Roof repair due to storm\"]}, {\"fieldPath\": \"date_performed\", \"uniqueCount\": 2, \"uniqueProportion\": 1.0, \"nullCount\": 1, \"nullProportion\": 0.3333333333333333, \"min\": \"2019-03-21\", \"max\": \"2020-11-29\", \"sampleValues\": [\"2019-03-21\", \"2020-11-29\"]}, {\"fieldPath\": \"performed_by\", \"uniqueCount\": 2, \"uniqueProportion\": 1.0, \"nullCount\": 1, \"nullProportion\": 0.3333333333333333, \"sampleValues\": [\"Discount Pool Supplies\", \"TV and Audio Superstore\"]}]}",
-        "contentType": "application/json"
+        "json": {
+            "timestampMillis": 1586847600000,
+            "partitionSpec": {
+                "type": "FULL_TABLE",
+                "partition": "FULL_TABLE_SNAPSHOT"
+            },
+            "rowCount": 3,
+            "columnCount": 5,
+            "fieldProfiles": [
+                {
+                    "fieldPath": "mno",
+                    "uniqueCount": 3,
+                    "uniqueProportion": 1,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "min": "10",
+                    "max": "12",
+                    "mean": "11.0",
+                    "median": "11",
+                    "stdev": "1.0",
+                    "sampleValues": [
+                        "10",
+                        "11",
+                        "12"
+                    ]
+                },
+                {
+                    "fieldPath": "hno",
+                    "uniqueCount": 3,
+                    "uniqueProportion": 1,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "min": "24",
+                    "max": "26",
+                    "mean": "25.0",
+                    "median": "25",
+                    "stdev": "1.0",
+                    "sampleValues": [
+                        "24",
+                        "25",
+                        "26"
+                    ]
+                },
+                {
+                    "fieldPath": "description",
+                    "uniqueCount": 3,
+                    "uniqueProportion": 1,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "Replace pool liner and pump",
+                        "Renovate the bar area.  Replace TV and speakers",
+                        "Roof repair due to storm"
+                    ]
+                },
+                {
+                    "fieldPath": "date_performed",
+                    "uniqueCount": 2,
+                    "uniqueProportion": 1,
+                    "nullCount": 1,
+                    "nullProportion": 0.3333333333333333,
+                    "min": "2019-03-21",
+                    "max": "2020-11-29",
+                    "sampleValues": [
+                        "2019-03-21",
+                        "2020-11-29"
+                    ]
+                },
+                {
+                    "fieldPath": "performed_by",
+                    "uniqueCount": 2,
+                    "uniqueProportion": 1,
+                    "nullCount": 1,
+                    "nullProportion": 0.3333333333333333,
+                    "sampleValues": [
+                        "Discount Pool Supplies",
+                        "TV and Audio Superstore"
+                    ]
+                }
+            ]
+        }
     },
     "systemMetadata": {
         "lastObserved": 1586847600000,
         "runId": "hana-test",
-        "registryName": null,
-        "registryVersion": null,
-        "properties": null
+        "lastRunId": "no-run-id-provided"
     }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/looker/golden_test_folder_path_pattern_ingest.json b/metadata-ingestion/tests/integration/looker/golden_test_folder_path_pattern_ingest.json
new file mode 100644
index 00000000000000..5bee9c4adec8d4
--- /dev/null
+++ b/metadata-ingestion/tests/integration/looker/golden_test_folder_path_pattern_ingest.json
@@ -0,0 +1,887 @@
+[
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:13edab8c7af69549d8fc4ab3b7d87e7c",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "looker",
+                "env": "PROD",
+                "folder_id": "a"
+            },
+            "name": "A"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:13edab8c7af69549d8fc4ab3b7d87e7c",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:13edab8c7af69549d8fc4ab3b7d87e7c",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:looker"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:13edab8c7af69549d8fc4ab3b7d87e7c",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:13edab8c7af69549d8fc4ab3b7d87e7c",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Folders"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c91fd8c071064eb00f9a0a9bad69f2d1",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "looker",
+                "env": "PROD",
+                "folder_id": "b"
+            },
+            "name": "B"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c91fd8c071064eb00f9a0a9bad69f2d1",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c91fd8c071064eb00f9a0a9bad69f2d1",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:looker"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c91fd8c071064eb00f9a0a9bad69f2d1",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c91fd8c071064eb00f9a0a9bad69f2d1",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Folders"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ba4628721936d16f4066d86b414e8891",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "looker",
+                "env": "PROD",
+                "folder_id": "c"
+            },
+            "name": "C"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ba4628721936d16f4066d86b414e8891",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ba4628721936d16f4066d86b414e8891",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:looker"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ba4628721936d16f4066d86b414e8891",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ba4628721936d16f4066d86b414e8891",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Folders"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DashboardSnapshot": {
+            "urn": "urn:li:dashboard:(looker,dashboards.3)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.dashboard.DashboardInfo": {
+                        "customProperties": {},
+                        "title": "third dashboard",
+                        "description": "third",
+                        "charts": [],
+                        "datasets": [],
+                        "lastModified": {
+                            "created": {
+                                "time": 1586847600000,
+                                "actor": "urn:li:corpuser:unknown"
+                            },
+                            "lastModified": {
+                                "time": 1586847600000,
+                                "actor": "urn:li:corpuser:unknown"
+                            }
+                        },
+                        "dashboardUrl": "https://looker.company.com/dashboards/3"
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.BrowsePaths": {
+                        "paths": [
+                            "/Folders/A/B/C"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(looker,dashboards.3)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:ba4628721936d16f4066d86b414e8891"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(looker,dashboards.3)",
+    "changeType": "UPSERT",
+    "aspectName": "embed",
+    "aspect": {
+        "json": {
+            "renderUrl": "https://looker.company.com/embed/dashboards/3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(looker,dashboards.3)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Folders"
+                },
+                {
+                    "id": "urn:li:container:13edab8c7af69549d8fc4ab3b7d87e7c",
+                    "urn": "urn:li:container:13edab8c7af69549d8fc4ab3b7d87e7c"
+                },
+                {
+                    "id": "urn:li:container:c91fd8c071064eb00f9a0a9bad69f2d1",
+                    "urn": "urn:li:container:c91fd8c071064eb00f9a0a9bad69f2d1"
+                },
+                {
+                    "id": "urn:li:container:ba4628721936d16f4066d86b414e8891",
+                    "urn": "urn:li:container:ba4628721936d16f4066d86b414e8891"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(looker,dashboard_elements.2)",
+    "changeType": "UPSERT",
+    "aspectName": "inputFields",
+    "aspect": {
+        "json": {
+            "fields": [
+                {
+                    "schemaFieldUrn": "urn:li:schemaField:(urn:li:chart:(looker,dashboard_elements.2),calc)",
+                    "schemaField": {
+                        "fieldPath": "calc",
+                        "nullable": false,
+                        "description": "",
+                        "label": "foobar",
+                        "type": {
+                            "type": {
+                                "com.linkedin.schema.StringType": {}
+                            }
+                        },
+                        "nativeDataType": "string",
+                        "recursive": false,
+                        "isPartOfKey": false
+                    }
+                },
+                {
+                    "schemaFieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,data.explore.my_view,PROD),dim1)",
+                    "schemaField": {
+                        "fieldPath": "dim1",
+                        "nullable": false,
+                        "description": "dimension one description",
+                        "label": "Dimensions One Label",
+                        "type": {
+                            "type": {
+                                "com.linkedin.schema.StringType": {}
+                            }
+                        },
+                        "nativeDataType": "string",
+                        "recursive": false,
+                        "globalTags": {
+                            "tags": [
+                                {
+                                    "tag": "urn:li:tag:Dimension"
+                                }
+                            ]
+                        },
+                        "isPartOfKey": false
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(looker,dashboards.3)",
+    "changeType": "UPSERT",
+    "aspectName": "inputFields",
+    "aspect": {
+        "json": {
+            "fields": [
+                {
+                    "schemaFieldUrn": "urn:li:schemaField:(urn:li:chart:(looker,dashboard_elements.2),calc)",
+                    "schemaField": {
+                        "fieldPath": "calc",
+                        "nullable": false,
+                        "description": "",
+                        "label": "foobar",
+                        "type": {
+                            "type": {
+                                "com.linkedin.schema.StringType": {}
+                            }
+                        },
+                        "nativeDataType": "string",
+                        "recursive": false,
+                        "isPartOfKey": false
+                    }
+                },
+                {
+                    "schemaFieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,data.explore.my_view,PROD),dim1)",
+                    "schemaField": {
+                        "fieldPath": "dim1",
+                        "nullable": false,
+                        "description": "dimension one description",
+                        "label": "Dimensions One Label",
+                        "type": {
+                            "type": {
+                                "com.linkedin.schema.StringType": {}
+                            }
+                        },
+                        "nativeDataType": "string",
+                        "recursive": false,
+                        "globalTags": {
+                            "tags": [
+                                {
+                                    "tag": "urn:li:tag:Dimension"
+                                }
+                            ]
+                        },
+                        "isPartOfKey": false
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:59a5aa45397364e6882e793f1bc77b42",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "looker",
+                "env": "PROD",
+                "model_name": "data"
+            },
+            "name": "data"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:59a5aa45397364e6882e793f1bc77b42",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:59a5aa45397364e6882e793f1bc77b42",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:looker"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:59a5aa45397364e6882e793f1bc77b42",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "LookML Model"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:59a5aa45397364e6882e793f1bc77b42",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Explore"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:looker,data.explore.my_view,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.common.BrowsePaths": {
+                        "paths": [
+                            "/Explore/data"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "looker.explore.label": "My Explore View",
+                            "looker.explore.file": "test_source_file.lkml"
+                        },
+                        "externalUrl": "https://looker.company.com/explore/data/my_view",
+                        "name": "My Explore View",
+                        "description": "lorem ipsum",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1586847600000,
+                                    "actor": "urn:li:corpuser:datahub"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.underlying_view,PROD)",
+                                "type": "VIEW"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "my_view",
+                        "platform": "urn:li:dataPlatform:looker",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.OtherSchema": {
+                                "rawSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "dim1",
+                                "nullable": false,
+                                "description": "dimension one description",
+                                "label": "Dimensions One Label",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            }
+                        ],
+                        "primaryKeys": []
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,data.explore.my_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Explore"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,data.explore.my_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "embed",
+    "aspect": {
+        "json": {
+            "renderUrl": "https://looker.company.com/embed/explore/data/my_view"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,data.explore.my_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:59a5aa45397364e6882e793f1bc77b42"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,data.explore.my_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Explore"
+                },
+                {
+                    "id": "urn:li:container:59a5aa45397364e6882e793f1bc77b42",
+                    "urn": "urn:li:container:59a5aa45397364e6882e793f1bc77b42"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.TagSnapshot": {
+            "urn": "urn:li:tag:Dimension",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.tag.TagProperties": {
+                        "name": "Dimension",
+                        "description": "A tag that is applied to all dimension fields."
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.TagSnapshot": {
+            "urn": "urn:li:tag:Temporal",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.tag.TagProperties": {
+                        "name": "Temporal",
+                        "description": "A tag that is applied to all time-based (temporal) fields such as timestamps or durations."
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.TagSnapshot": {
+            "urn": "urn:li:tag:Measure",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.tag.TagProperties": {
+                        "name": "Measure",
+                        "description": "A tag that is applied to all measures (metrics). Measures are typically the columns that you aggregate on"
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(looker,dashboard_elements.2)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:Dimension",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:Measure",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:Temporal",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "looker-test",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/looker/golden_test_ingest.json b/metadata-ingestion/tests/integration/looker/golden_test_ingest.json
index 76c8f04e8447a7..9c0363e0892f0d 100644
--- a/metadata-ingestion/tests/integration/looker/golden_test_ingest.json
+++ b/metadata-ingestion/tests/integration/looker/golden_test_ingest.json
@@ -1,22 +1,4 @@
 [
-{
-    "entityType": "dataPlatformInstance",
-    "entityUrn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:looker,ap-south-1)",
-    "changeType": "UPSERT",
-    "aspectName": "dataPlatformInfo",
-    "aspect": {
-        "json": {
-            "name": "ap-south-1",
-            "type": "OTHERS",
-            "datasetNameDelimiter": "."
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1586847600000,
-        "runId": "looker-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:e7fe6fc9c3ca70e78694dcc5dd9c05b7",
@@ -805,22 +787,6 @@
         "lastRunId": "no-run-id-provided"
     }
 },
-{
-    "entityType": "dataPlatformInstance",
-    "entityUrn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:looker,ap-south-1)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1586847600000,
-        "runId": "looker-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
 {
     "entityType": "tag",
     "entityUrn": "urn:li:tag:Dimension",
diff --git a/metadata-ingestion/tests/integration/looker/test_looker.py b/metadata-ingestion/tests/integration/looker/test_looker.py
index fdc9c45fcf5396..dfda2fedf877c7 100644
--- a/metadata-ingestion/tests/integration/looker/test_looker.py
+++ b/metadata-ingestion/tests/integration/looker/test_looker.py
@@ -1,7 +1,7 @@
 import json
 import time
 from datetime import datetime
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict, List, Optional, Sequence, Tuple, Union, cast
 from unittest import mock
 
 import pytest
@@ -12,6 +12,7 @@
     Category,
     Dashboard,
     DashboardElement,
+    Folder,
     FolderBase,
     Look,
     LookmlModelExplore,
@@ -1133,3 +1134,147 @@ def test_explore_tags(pytestconfig, tmp_path, mock_time, mock_datahub_graph):
                             ]
 
         assert expected_tag_urns == actual_tag_urns
+
+
+def side_effect_function_for_dashboards(*args: Tuple[str], **kwargs: Any) -> Dashboard:
+    assert kwargs["dashboard_id"] in ["1", "2", "3"], "Invalid dashboard id"
+
+    if kwargs["dashboard_id"] == "1":
+        return Dashboard(
+            id=kwargs["dashboard_id"],
+            title="first dashboard",
+            created_at=datetime.utcfromtimestamp(time.time()),
+            updated_at=datetime.utcfromtimestamp(time.time()),
+            description="first",
+            folder=FolderBase(name="A", id="a"),
+            dashboard_elements=[
+                DashboardElement(
+                    id="2",
+                    type="",
+                    subtitle_text="Some text",
+                    query=Query(
+                        model="data",
+                        view="my_view",
+                        fields=["dim1"],
+                        dynamic_fields='[{"table_calculation":"calc","label":"foobar","expression":"offset(${my_table.value},1)","value_format":null,"value_format_name":"eur","_kind_hint":"measure","_type_hint":"number"}]',
+                    ),
+                )
+            ],
+        )
+
+    if kwargs["dashboard_id"] == "2":
+        return Dashboard(
+            id=kwargs["dashboard_id"],
+            title="second dashboard",
+            created_at=datetime.utcfromtimestamp(time.time()),
+            updated_at=datetime.utcfromtimestamp(time.time()),
+            description="second",
+            folder=FolderBase(name="B", id="b"),
+            dashboard_elements=[
+                DashboardElement(
+                    id="2",
+                    type="",
+                    subtitle_text="Some text",
+                    query=Query(
+                        model="data",
+                        view="my_view",
+                        fields=["dim1"],
+                        dynamic_fields='[{"table_calculation":"calc","label":"foobar","expression":"offset(${my_table.value},1)","value_format":null,"value_format_name":"eur","_kind_hint":"measure","_type_hint":"number"}]',
+                    ),
+                )
+            ],
+        )
+
+    if kwargs["dashboard_id"] == "3":
+        return Dashboard(
+            id=kwargs["dashboard_id"],
+            title="third dashboard",
+            created_at=datetime.utcfromtimestamp(time.time()),
+            updated_at=datetime.utcfromtimestamp(time.time()),
+            description="third",
+            folder=FolderBase(name="C", id="c"),
+            dashboard_elements=[
+                DashboardElement(
+                    id="2",
+                    type="",
+                    subtitle_text="Some text",
+                    query=Query(
+                        model="data",
+                        view="my_view",
+                        fields=["dim1"],
+                        dynamic_fields='[{"table_calculation":"calc","label":"foobar","expression":"offset(${my_table.value},1)","value_format":null,"value_format_name":"eur","_kind_hint":"measure","_type_hint":"number"}]',
+                    ),
+                )
+            ],
+        )
+
+    # Default return to satisfy the linter
+    return Dashboard(
+        id="unknown",
+        title="unknown",
+        created_at=datetime.utcfromtimestamp(time.time()),
+        updated_at=datetime.utcfromtimestamp(time.time()),
+        description="unknown",
+        folder=FolderBase(name="Unknown", id="unknown"),
+        dashboard_elements=[],
+    )
+
+
+def side_effect_function_folder_ancestors(
+    *args: Tuple[Any], **kwargs: Any
+) -> Sequence[Folder]:
+    assert args[0] in ["a", "b", "c"], "Invalid folder id"
+
+    if args[0] == "a":
+        # No parent
+        return ()
+
+    if args[0] == "b":
+        return (Folder(id="a", name="A"),)
+
+    if args[0] == "c":
+        return Folder(id="a", name="A"), Folder(id="b", name="B")
+
+    # Default return to satisfy the linter
+    return (Folder(id="unknown", name="Unknown"),)
+
+
+def setup_mock_dashboard_with_folder(mocked_client):
+    mocked_client.all_dashboards.return_value = [
+        Dashboard(id="1"),
+        Dashboard(id="2"),
+        Dashboard(id="3"),
+    ]
+    mocked_client.dashboard.side_effect = side_effect_function_for_dashboards
+    mocked_client.folder_ancestors.side_effect = side_effect_function_folder_ancestors
+
+
+@freeze_time(FROZEN_TIME)
+def test_folder_path_pattern(pytestconfig, tmp_path, mock_time, mock_datahub_graph):
+    mocked_client = mock.MagicMock()
+    new_recipe = get_default_recipe(output_file_path=f"{tmp_path}/looker_mces.json")
+    new_recipe["source"]["config"]["folder_path_pattern"] = {
+        "allow": ["A/B/C"],
+    }
+
+    with mock.patch("looker_sdk.init40") as mock_sdk:
+        mock_sdk.return_value = mocked_client
+
+        setup_mock_dashboard_with_folder(mocked_client)
+
+        setup_mock_explore(mocked_client)
+
+        setup_mock_look(mocked_client)
+
+        test_resources_dir = pytestconfig.rootpath / "tests/integration/looker"
+
+        pipeline = Pipeline.create(new_recipe)
+        pipeline.run()
+        pipeline.raise_from_status()
+        mce_out_file = "golden_test_folder_path_pattern_ingest.json"
+
+        mce_helpers.check_golden_file(
+            pytestconfig,
+            output_path=tmp_path / "looker_mces.json",
+            golden_path=f"{test_resources_dir}/{mce_out_file}",
+        )
diff --git a/metadata-ingestion/tests/integration/lookml/drop_hive_dot/data.model.lkml b/metadata-ingestion/tests/integration/lookml/drop_hive_dot/data.model.lkml
new file mode 100644
index 00000000000000..95391f6a73e635
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/drop_hive_dot/data.model.lkml
@@ -0,0 +1,6 @@
+connection: "my_connection"
+
+include: "top_10_employee_income_source.view.lkml"
+
+explore: top_10_employee_income_source {
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/lookml/drop_hive_dot/top_10_employee_income_source.view.lkml b/metadata-ingestion/tests/integration/lookml/drop_hive_dot/top_10_employee_income_source.view.lkml
new file mode 100644
index 00000000000000..149ce9219b54b8
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/drop_hive_dot/top_10_employee_income_source.view.lkml
@@ -0,0 +1,26 @@
+view: top_10_employee_income_source {
+  derived_table: {
+    sql: SELECT id,
+                name,
+                source
+         FROM hive.employee_db.income_source
+         ORDER BY source desc
+         LIMIT 10
+  ;;
+  }
+
+  dimension: id {
+    type: number
+    sql: ${TABLE}.id ;;
+  }
+
+  dimension: name {
+    type: string
+    sql: ${TABLE}.name ;;
+  }
+
+  dimension: source {
+    type: string
+    sql: ${TABLE}.source ;;
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/lookml/drop_hive_dot_golden.json b/metadata-ingestion/tests/integration/lookml/drop_hive_dot_golden.json
new file mode 100644
index 00000000000000..e1dad2e91b7353
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/drop_hive_dot_golden.json
@@ -0,0 +1,357 @@
+[
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "looker",
+                "env": "PROD",
+                "project_name": "lkml_samples"
+            },
+            "name": "lkml_samples"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:looker"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "LookML Project"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Folders"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.top_10_employee_income_source,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.top_10_employee_income_source,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "SELECT id,\n                name,\n                source\n         FROM hive.employee_db.income_source\n         ORDER BY source desc\n         LIMIT 10",
+            "viewLanguage": "sql"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.top_10_employee_income_source,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.top_10_employee_income_source,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.common.BrowsePaths": {
+                        "paths": [
+                            "/Develop/lkml_samples/"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1586847600000,
+                                    "actor": "urn:li:corpuser:datahub"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:hive,employee_db.income_source,PROD)",
+                                "type": "VIEW"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,employee_db.income_source,PROD),id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.top_10_employee_income_source,PROD),id)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,employee_db.income_source,PROD),name)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.top_10_employee_income_source,PROD),name)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,employee_db.income_source,PROD),source)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.top_10_employee_income_source,PROD),source)"
+                                ],
+                                "confidenceScore": 1.0
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "top_10_employee_income_source",
+                        "platform": "urn:li:dataPlatform:looker",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.OtherSchema": {
+                                "rawSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "id",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "number",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "name",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "source",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            }
+                        ],
+                        "primaryKeys": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "looker.file.path": "top_10_employee_income_source.view.lkml",
+                            "looker.model": "data"
+                        },
+                        "name": "top_10_employee_income_source",
+                        "tags": []
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.top_10_employee_income_source,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Develop"
+                },
+                {
+                    "id": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+                    "urn": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:Dimension",
+    "changeType": "UPSERT",
+    "aspectName": "tagKey",
+    "aspect": {
+        "json": {
+            "name": "Dimension"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/lookml/expected_output.json b/metadata-ingestion/tests/integration/lookml/expected_output.json
index d870c6dee40655..f42c600281ccb3 100644
--- a/metadata-ingestion/tests/integration/lookml/expected_output.json
+++ b/metadata-ingestion/tests/integration/lookml/expected_output.json
@@ -1632,7 +1632,7 @@
     "aspect": {
         "json": {
             "materialized": false,
-            "viewLogic": "SELECT\n            customer_id,\n            SUM(sale_price) AS lifetime_spend\n          FROM\n            order\n          WHERE\n            order.region='ap-south-1'\n          GROUP BY 1",
+            "viewLogic": "SELECT\n            customer_id,\n            SUM(sale_price) AS lifetime_spend\n          FROM\n            order\n          WHERE\n            {% condition order_region %} order.region {% endcondition %}\n          GROUP BY 1",
             "viewLanguage": "sql"
         }
     },
diff --git a/metadata-ingestion/tests/integration/lookml/lookml_mces_api_bigquery.json b/metadata-ingestion/tests/integration/lookml/lookml_mces_api_bigquery.json
index 8813ea532fa2b5..5f9b99ebe30623 100644
--- a/metadata-ingestion/tests/integration/lookml/lookml_mces_api_bigquery.json
+++ b/metadata-ingestion/tests/integration/lookml/lookml_mces_api_bigquery.json
@@ -1632,7 +1632,7 @@
     "aspect": {
         "json": {
             "materialized": false,
-            "viewLogic": "SELECT\n            customer_id,\n            SUM(sale_price) AS lifetime_spend\n          FROM\n            order\n          WHERE\n            order.region='ap-south-1'\n          GROUP BY 1",
+            "viewLogic": "SELECT\n            customer_id,\n            SUM(sale_price) AS lifetime_spend\n          FROM\n            order\n          WHERE\n            {% condition order_region %} order.region {% endcondition %}\n          GROUP BY 1",
             "viewLanguage": "sql"
         }
     },
diff --git a/metadata-ingestion/tests/integration/lookml/lookml_mces_api_hive2.json b/metadata-ingestion/tests/integration/lookml/lookml_mces_api_hive2.json
index 4bc1a0f2f7da58..1b95959f0ba1d2 100644
--- a/metadata-ingestion/tests/integration/lookml/lookml_mces_api_hive2.json
+++ b/metadata-ingestion/tests/integration/lookml/lookml_mces_api_hive2.json
@@ -1632,7 +1632,7 @@
     "aspect": {
         "json": {
             "materialized": false,
-            "viewLogic": "SELECT\n            customer_id,\n            SUM(sale_price) AS lifetime_spend\n          FROM\n            order\n          WHERE\n            order.region='ap-south-1'\n          GROUP BY 1",
+            "viewLogic": "SELECT\n            customer_id,\n            SUM(sale_price) AS lifetime_spend\n          FROM\n            order\n          WHERE\n            {% condition order_region %} order.region {% endcondition %}\n          GROUP BY 1",
             "viewLanguage": "sql"
         }
     },
diff --git a/metadata-ingestion/tests/integration/lookml/lookml_mces_badsql_parser.json b/metadata-ingestion/tests/integration/lookml/lookml_mces_badsql_parser.json
index 3fd37c47221858..fd479a2baa7226 100644
--- a/metadata-ingestion/tests/integration/lookml/lookml_mces_badsql_parser.json
+++ b/metadata-ingestion/tests/integration/lookml/lookml_mces_badsql_parser.json
@@ -1675,6 +1675,96 @@
                         "removed": false
                     }
                 },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1586847600000,
+                                    "actor": "urn:li:corpuser:datahub"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,default_db.default_schema.order,PROD)",
+                                "type": "VIEW"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,default_db.default_schema.order,PROD),customer_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.customer_facts,PROD),customer_id)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,default_db.default_schema.order,PROD),sale_price)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.customer_facts,PROD),lifetime_spend)"
+                                ],
+                                "confidenceScore": 1.0
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "customer_facts",
+                        "platform": "urn:li:dataPlatform:looker",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.OtherSchema": {
+                                "rawSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NullType": {}
+                                    }
+                                },
+                                "nativeDataType": "unknown",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "lifetime_spend",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NullType": {}
+                                    }
+                                },
+                                "nativeDataType": "unknown",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ],
+                        "primaryKeys": []
+                    }
+                },
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
diff --git a/metadata-ingestion/tests/integration/lookml/lookml_mces_offline.json b/metadata-ingestion/tests/integration/lookml/lookml_mces_offline.json
index 3fd37c47221858..fd479a2baa7226 100644
--- a/metadata-ingestion/tests/integration/lookml/lookml_mces_offline.json
+++ b/metadata-ingestion/tests/integration/lookml/lookml_mces_offline.json
@@ -1675,6 +1675,96 @@
                         "removed": false
                     }
                 },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1586847600000,
+                                    "actor": "urn:li:corpuser:datahub"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,default_db.default_schema.order,PROD)",
+                                "type": "VIEW"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,default_db.default_schema.order,PROD),customer_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.customer_facts,PROD),customer_id)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,default_db.default_schema.order,PROD),sale_price)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.customer_facts,PROD),lifetime_spend)"
+                                ],
+                                "confidenceScore": 1.0
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "customer_facts",
+                        "platform": "urn:li:dataPlatform:looker",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.OtherSchema": {
+                                "rawSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NullType": {}
+                                    }
+                                },
+                                "nativeDataType": "unknown",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "lifetime_spend",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NullType": {}
+                                    }
+                                },
+                                "nativeDataType": "unknown",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ],
+                        "primaryKeys": []
+                    }
+                },
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
diff --git a/metadata-ingestion/tests/integration/lookml/lookml_mces_offline_platform_instance.json b/metadata-ingestion/tests/integration/lookml/lookml_mces_offline_platform_instance.json
index bb8a379fdde224..053e90d473c1ba 100644
--- a/metadata-ingestion/tests/integration/lookml/lookml_mces_offline_platform_instance.json
+++ b/metadata-ingestion/tests/integration/lookml/lookml_mces_offline_platform_instance.json
@@ -1675,6 +1675,96 @@
                         "removed": false
                     }
                 },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1586847600000,
+                                    "actor": "urn:li:corpuser:datahub"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,warehouse.default_db.default_schema.order,DEV)",
+                                "type": "VIEW"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,warehouse.default_db.default_schema.order,DEV),customer_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.customer_facts,PROD),customer_id)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,warehouse.default_db.default_schema.order,DEV),sale_price)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.customer_facts,PROD),lifetime_spend)"
+                                ],
+                                "confidenceScore": 1.0
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "customer_facts",
+                        "platform": "urn:li:dataPlatform:looker",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.OtherSchema": {
+                                "rawSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NullType": {}
+                                    }
+                                },
+                                "nativeDataType": "unknown",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "lifetime_spend",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NullType": {}
+                                    }
+                                },
+                                "nativeDataType": "unknown",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ],
+                        "primaryKeys": []
+                    }
+                },
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
diff --git a/metadata-ingestion/tests/integration/lookml/lookml_mces_with_external_urls.json b/metadata-ingestion/tests/integration/lookml/lookml_mces_with_external_urls.json
index b8a2bcc020c34d..44dd72e8fc41be 100644
--- a/metadata-ingestion/tests/integration/lookml/lookml_mces_with_external_urls.json
+++ b/metadata-ingestion/tests/integration/lookml/lookml_mces_with_external_urls.json
@@ -1683,6 +1683,96 @@
                         "removed": false
                     }
                 },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1586847600000,
+                                    "actor": "urn:li:corpuser:datahub"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,default_db.default_schema.order,PROD)",
+                                "type": "VIEW"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,default_db.default_schema.order,PROD),customer_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.customer_facts,PROD),customer_id)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,default_db.default_schema.order,PROD),sale_price)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.customer_facts,PROD),lifetime_spend)"
+                                ],
+                                "confidenceScore": 1.0
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "customer_facts",
+                        "platform": "urn:li:dataPlatform:looker",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.OtherSchema": {
+                                "rawSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "customer_id",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NullType": {}
+                                    }
+                                },
+                                "nativeDataType": "unknown",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "lifetime_spend",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NullType": {}
+                                    }
+                                },
+                                "nativeDataType": "unknown",
+                                "recursive": false,
+                                "isPartOfKey": false
+                            }
+                        ],
+                        "primaryKeys": []
+                    }
+                },
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
diff --git a/metadata-ingestion/tests/integration/lookml/refinement_include_order_golden.json b/metadata-ingestion/tests/integration/lookml/refinement_include_order_golden.json
index 70f48953a06adb..c5b1d44772deab 100644
--- a/metadata-ingestion/tests/integration/lookml/refinement_include_order_golden.json
+++ b/metadata-ingestion/tests/integration/lookml/refinement_include_order_golden.json
@@ -485,9 +485,195 @@
                                 "dataset": "urn:li:dataset:(urn:li:dataPlatform:conn,.public.book,PROD)",
                                 "type": "VIEW"
                             }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:conn,.public.book,PROD),name)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_refinement_sample1.model_1.view.extend_book,PROD),name)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:conn,.public.book,PROD),date)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_refinement_sample1.model_1.view.extend_book,PROD),date)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:conn,.public.book,PROD),date)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_refinement_sample1.model_1.view.extend_book,PROD),issue_date)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:conn,.public.book,PROD),date)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_refinement_sample1.model_1.view.extend_book,PROD),issue_date_3)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:conn,.public.book,PROD),count)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_refinement_sample1.model_1.view.extend_book,PROD),count)"
+                                ],
+                                "confidenceScore": 1.0
+                            }
                         ]
                     }
                 },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "extend_book",
+                        "platform": "urn:li:dataPlatform:looker",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.OtherSchema": {
+                                "rawSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "name",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "date",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "issue_date",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "number",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "issue_date_3",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "number",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "count",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "count",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Measure"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            }
+                        ],
+                        "primaryKeys": []
+                    }
+                },
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
diff --git a/metadata-ingestion/tests/integration/lookml/refinements_ingestion_golden.json b/metadata-ingestion/tests/integration/lookml/refinements_ingestion_golden.json
index 7265ee3c6c62b9..7c2f92ac1e028c 100644
--- a/metadata-ingestion/tests/integration/lookml/refinements_ingestion_golden.json
+++ b/metadata-ingestion/tests/integration/lookml/refinements_ingestion_golden.json
@@ -1656,7 +1656,7 @@
     "aspect": {
         "json": {
             "materialized": false,
-            "viewLogic": "SELECT\n            customer_id,\n            SUM(sale_price) AS lifetime_spend\n          FROM\n            order\n          WHERE\n            order.region='ap-south-1'\n          GROUP BY 1",
+            "viewLogic": "SELECT\n            customer_id,\n            SUM(sale_price) AS lifetime_spend\n          FROM\n            order\n          WHERE\n            {% condition order_region %} order.region {% endcondition %}\n          GROUP BY 1",
             "viewLanguage": "sql"
         }
     },
diff --git a/metadata-ingestion/tests/integration/lookml/test_lookml.py b/metadata-ingestion/tests/integration/lookml/test_lookml.py
index 9e051995d0b940..a5d838cb16d73a 100644
--- a/metadata-ingestion/tests/integration/lookml/test_lookml.py
+++ b/metadata-ingestion/tests/integration/lookml/test_lookml.py
@@ -1032,3 +1032,30 @@ def test_field_tag_ingest(pytestconfig, tmp_path, mock_time):
         output_path=tmp_path / mce_out_file,
         golden_path=golden_path,
     )
+
+
+@freeze_time(FROZEN_TIME)
+def test_drop_hive(pytestconfig, tmp_path, mock_time):
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/lookml"
+    mce_out_file = "drop_hive_dot.json"
+
+    new_recipe = get_default_recipe(
+        f"{tmp_path}/{mce_out_file}",
+        f"{test_resources_dir}/drop_hive_dot",
+    )
+
+    new_recipe["source"]["config"]["connection_to_platform_map"] = {
+        "my_connection": "hive"
+    }
+
+    pipeline = Pipeline.create(new_recipe)
+    pipeline.run()
+    pipeline.pretty_print_summary()
+    pipeline.raise_from_status(raise_warnings=True)
+
+    golden_path = test_resources_dir / "drop_hive_dot_golden.json"
+    mce_helpers.check_golden_file(
+        pytestconfig,
+        output_path=tmp_path / mce_out_file,
+        golden_path=golden_path,
+    )
diff --git a/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/child_view.view.lkml b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/child_view.view.lkml
new file mode 100644
index 00000000000000..5d8b51527b0fe7
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/child_view.view.lkml
@@ -0,0 +1,16 @@
+include: "parent_view.view.lkml"
+
+view: child_view {
+  extends: [parent_view]
+
+  dimension: id {
+    primary_key: yes
+    type: integer
+    sql: ${TABLE}.id ;;
+  }
+
+  dimension: child_dimension_1 {
+    type: string
+    sql: ${TABLE}.child_dimension_1 ;;
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/data.model.lkml b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/data.model.lkml
index ea55512c5ca06e..d570e0ecdb5b22 100644
--- a/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/data.model.lkml
+++ b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/data.model.lkml
@@ -5,6 +5,11 @@ include: "employee_income_source.view.lkml"
 include: "employee_total_income.view.lkml"
 include: "top_10_employee_income_source.view.lkml"
 include: "employee_tax_report.view.lkml"
+include: "employee_salary_rating.view.lkml"
+include: "environment_activity_logs.view.lkml"
+include: "employee_income_source_as_per_env.view.lkml"
+include: "rent_as_employee_income_source.view.lkml"
+include: "child_view.view.lkml"
 
 explore: activity_logs {
 }
@@ -19,4 +24,19 @@ explore: top_10_employee_income_source {
 }
 
 explore: employee_tax_report {
+}
+
+explore: employee_salary_rating {
+}
+
+explore: environment_activity_logs {
+}
+
+explore: employee_income_source_as_per_env {
+}
+
+explore: rent_as_employee_income_source {
+}
+
+explore: child_view {
 }
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/employee_income_source_as_per_env.view.lkml b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/employee_income_source_as_per_env.view.lkml
new file mode 100644
index 00000000000000..4b8e0dd46a8ce3
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/employee_income_source_as_per_env.view.lkml
@@ -0,0 +1,40 @@
+view: employee_income_source_as_per_env {
+  derived_table: {
+    sql: SELECT
+      employee_id,
+      employee_name,
+      {% if dw_eff_dt_date._is_selected or finance_dw_eff_dt_date._is_selected %}
+        prod_core.data.r_metric_summary_v2
+      {% elsif dw_eff_dt_week._is_selected or finance_dw_eff_dt_week._is_selected %}
+        prod_core.data.r_metric_summary_v3
+      {% else %}
+        'default_table' as source
+      {% endif %},
+      employee_income
+    FROM -- if dev -- dev_income_source  -- if prod -- prod_income_source
+    WHERE
+        {% condition source_region %} source_table.region {% endcondition %}
+  ;;
+  }
+
+  dimension: id {
+    type: number
+    sql: ${TABLE}.employee_id;;
+  }
+
+  dimension: name {
+    type: string
+    sql: ${TABLE}.employee_name;;
+  }
+
+  dimension: source {
+    type: string
+    sql: ${TABLE}.source ;;
+  }
+
+  dimension: income {
+    type: number
+    sql: ${TABLE}.employee_income ;;
+  }
+
+}
diff --git a/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/employee_salary_rating.view.lkml b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/employee_salary_rating.view.lkml
new file mode 100644
index 00000000000000..3a00099e7998e9
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/employee_salary_rating.view.lkml
@@ -0,0 +1,50 @@
+view: employee_salary_rating {
+  derived_table: {
+    sql: SELECT
+      employee_id,
+      employee_name,
+      {% if dw_eff_dt_date._is_selected or finance_dw_eff_dt_date._is_selected %}
+        prod_core.data.r_metric_summary_v2
+      {% elsif dw_eff_dt_week._is_selected or finance_dw_eff_dt_week._is_selected %}
+        prod_core.data.r_metric_summary_v3
+      {% else %}
+        'default_table' as source
+      {% endif %},
+      employee_income
+    FROM source_table
+    WHERE
+        {% condition source_region %} source_table.region {% endcondition %} AND
+        {% if rating_window._is_filtered %}
+            {% condition rating_window %} DATE (rating_created) {% endcondition %}
+        {% endif %}
+  ;;
+  }
+
+  filter: rating_window {
+    description: "Date window in which to look for rating"
+    default_value: "90 days ago for 90 days"
+    datatype: date
+    type: date
+  }
+
+  dimension: id {
+    type: number
+    sql: ${TABLE}.employee_id;;
+  }
+
+  dimension: name {
+    type: string
+    sql: ${TABLE}.employee_name;;
+  }
+
+  dimension: source {
+    type: string
+    sql: ${TABLE}.source ;;
+  }
+
+  dimension: income {
+    type: number
+    sql: ${TABLE}.employee_income ;;
+  }
+
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/environment_activity_logs.view.lkml b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/environment_activity_logs.view.lkml
new file mode 100644
index 00000000000000..efc7ba82754b88
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/environment_activity_logs.view.lkml
@@ -0,0 +1,12 @@
+view: environment_activity_logs {
+  sql_table_name:  -- if prod -- prod.staging_app.stg_app__activity_logs
+                   -- if dev -- {{ _user_attributes['dev_database_prefix'] }}analytics.{{ _user_attributes['dev_schema_prefix'] }}staging_app.stg_app__activity_logs
+                   ;;
+
+  dimension: generated_message_id {
+    group_label: "IDs"
+    primary_key: yes
+    type: number
+    sql: ${TABLE}."GENERATED_MESSAGE_ID" ;;
+  }
+}
diff --git a/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/parent_view.view.lkml b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/parent_view.view.lkml
new file mode 100644
index 00000000000000..c2f18924351c29
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/parent_view.view.lkml
@@ -0,0 +1,18 @@
+view: parent_view {
+  sql_table_name: `dataset.table` ;;
+
+  dimension: id {
+    primary_key: yes
+    type: string
+    sql: ${TABLE}.id ;;
+  }
+
+  dimension: parent_dimension_1 {
+    type: string
+    sql: ${TABLE}.parent_dimension_1 ;;
+  }
+
+  measure: parent_count {
+    type: count
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/rent_as_employee_income_source.view.lkml b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/rent_as_employee_income_source.view.lkml
new file mode 100644
index 00000000000000..40b6e3642f3b34
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/rent_as_employee_income_source.view.lkml
@@ -0,0 +1,27 @@
+view: rent_as_employee_income_source {
+  sql_table_name: (
+         SELECT id,
+                name,
+                source
+         FROM ${employee_income_source.SQL_TABLE_NAME}
+         WHERE source = "RENT"
+         ORDER BY source desc
+         LIMIT 10
+  );;
+
+
+  dimension: id {
+    type: number
+    sql: ${TABLE}.id ;;
+  }
+
+  dimension: name {
+    type: string
+    sql: ${TABLE}.name ;;
+  }
+
+  dimension: source {
+    type: string
+    sql: ${TABLE}.source ;;
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/lookml/vv_lineage_liquid_template_golden.json b/metadata-ingestion/tests/integration/lookml/vv_lineage_liquid_template_golden.json
index 75cd50c5c6059e..dd6917c112579e 100644
--- a/metadata-ingestion/tests/integration/lookml/vv_lineage_liquid_template_golden.json
+++ b/metadata-ingestion/tests/integration/lookml/vv_lineage_liquid_template_golden.json
@@ -302,7 +302,7 @@
     "aspect": {
         "json": {
             "materialized": false,
-            "viewLogic": "SELECT\n      employee_id,\n      employee_name,\n      \n        prod_core.data.r_metric_summary_v2\n      ,\n      employee_income\n    FROM source_table\n    WHERE\n        source_table.region='ap-south-1'",
+            "viewLogic": "SELECT\n      employee_id,\n      employee_name,\n      {% if dw_eff_dt_date._is_selected or finance_dw_eff_dt_date._is_selected %}\n        prod_core.data.r_metric_summary_v2\n      {% elsif dw_eff_dt_week._is_selected or finance_dw_eff_dt_week._is_selected %}\n        prod_core.data.r_metric_summary_v3\n      {% else %}\n        'default_table' as source\n      {% endif %},\n      employee_income\n    FROM source_table\n    WHERE\n        {% condition source_region %} source_table.region {% endcondition %}",
             "viewLanguage": "sql"
         }
     },
@@ -1300,6 +1300,1532 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_salary_rating,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_salary_rating,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "SELECT\n      employee_id,\n      employee_name,\n      {% if dw_eff_dt_date._is_selected or finance_dw_eff_dt_date._is_selected %}\n        prod_core.data.r_metric_summary_v2\n      {% elsif dw_eff_dt_week._is_selected or finance_dw_eff_dt_week._is_selected %}\n        prod_core.data.r_metric_summary_v3\n      {% else %}\n        'default_table' as source\n      {% endif %},\n      employee_income\n    FROM source_table\n    WHERE\n        {% condition source_region %} source_table.region {% endcondition %} AND\n        {% if rating_window._is_filtered %}\n            {% condition rating_window %} DATE (rating_created) {% endcondition %}\n        {% endif %}",
+            "viewLanguage": "sql"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_salary_rating,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_salary_rating,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.common.BrowsePaths": {
+                        "paths": [
+                            "/Develop/lkml_samples/"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1586847600000,
+                                    "actor": "urn:li:corpuser:datahub"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,source_table,PROD)",
+                                "type": "VIEW"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,source_table,PROD),employee_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_salary_rating,PROD),id)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,source_table,PROD),employee_name)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_salary_rating,PROD),name)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,source_table,PROD),source)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_salary_rating,PROD),source)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,source_table,PROD),employee_income)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_salary_rating,PROD),income)"
+                                ],
+                                "confidenceScore": 1.0
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "employee_salary_rating",
+                        "platform": "urn:li:dataPlatform:looker",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.OtherSchema": {
+                                "rawSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "id",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "number",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "name",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "source",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "income",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "number",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            }
+                        ],
+                        "primaryKeys": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "looker.file.path": "employee_salary_rating.view.lkml",
+                            "looker.model": "data"
+                        },
+                        "name": "employee_salary_rating",
+                        "tags": []
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_salary_rating,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Develop"
+                },
+                {
+                    "id": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+                    "urn": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.environment_activity_logs,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.environment_activity_logs,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "view: environment_activity_logs {\n  sql_table_name:  -- if prod -- prod.staging_app.stg_app__activity_logs\n                   -- if dev -- {{ _user_attributes['dev_database_prefix'] }}analytics.{{ _user_attributes['dev_schema_prefix'] }}staging_app.stg_app__activity_logs\n                   ;;\n\n  dimension: generated_message_id {\n    group_label: \"IDs\"\n    primary_key: yes\n    type: number\n    sql: ${TABLE}.\"GENERATED_MESSAGE_ID\" ;;\n  }\n}\n",
+            "viewLanguage": "lookml"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.environment_activity_logs,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.environment_activity_logs,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.common.BrowsePaths": {
+                        "paths": [
+                            "/Develop/lkml_samples/"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1586847600000,
+                                    "actor": "urn:li:corpuser:datahub"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,prod.staging_app.stg_app__activity_logs,PROD)",
+                                "type": "VIEW"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,prod.staging_app.stg_app__activity_logs,PROD),generated_message_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.environment_activity_logs,PROD),generated_message_id)"
+                                ],
+                                "confidenceScore": 1.0
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "environment_activity_logs",
+                        "platform": "urn:li:dataPlatform:looker",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.OtherSchema": {
+                                "rawSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "generated_message_id",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "number",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": true
+                            }
+                        ],
+                        "primaryKeys": [
+                            "generated_message_id"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "looker.file.path": "environment_activity_logs.view.lkml",
+                            "looker.model": "data"
+                        },
+                        "name": "environment_activity_logs",
+                        "tags": []
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.environment_activity_logs,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Develop"
+                },
+                {
+                    "id": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+                    "urn": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_income_source_as_per_env,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_income_source_as_per_env,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "SELECT\n      employee_id,\n      employee_name,\n      {% if dw_eff_dt_date._is_selected or finance_dw_eff_dt_date._is_selected %}\n        prod_core.data.r_metric_summary_v2\n      {% elsif dw_eff_dt_week._is_selected or finance_dw_eff_dt_week._is_selected %}\n        prod_core.data.r_metric_summary_v3\n      {% else %}\n        'default_table' as source\n      {% endif %},\n      employee_income\n    FROM -- if dev -- dev_income_source  -- if prod -- prod_income_source\n    WHERE\n        {% condition source_region %} source_table.region {% endcondition %}",
+            "viewLanguage": "sql"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_income_source_as_per_env,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_income_source_as_per_env,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.common.BrowsePaths": {
+                        "paths": [
+                            "/Develop/lkml_samples/"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1586847600000,
+                                    "actor": "urn:li:corpuser:datahub"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,prod_income_source,PROD)",
+                                "type": "VIEW"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,prod_income_source,PROD),employee_id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_income_source_as_per_env,PROD),id)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,prod_income_source,PROD),employee_name)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_income_source_as_per_env,PROD),name)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,prod_income_source,PROD),source)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_income_source_as_per_env,PROD),source)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,prod_income_source,PROD),employee_income)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_income_source_as_per_env,PROD),income)"
+                                ],
+                                "confidenceScore": 1.0
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "employee_income_source_as_per_env",
+                        "platform": "urn:li:dataPlatform:looker",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.OtherSchema": {
+                                "rawSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "id",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "number",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "name",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "source",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "income",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "number",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            }
+                        ],
+                        "primaryKeys": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "looker.file.path": "employee_income_source_as_per_env.view.lkml",
+                            "looker.model": "data"
+                        },
+                        "name": "employee_income_source_as_per_env",
+                        "tags": []
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_income_source_as_per_env,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Develop"
+                },
+                {
+                    "id": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+                    "urn": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.rent_as_employee_income_source,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.rent_as_employee_income_source,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "view: rent_as_employee_income_source {\n  sql_table_name: (\n         SELECT id,\n                name,\n                source\n         FROM ${employee_income_source.SQL_TABLE_NAME}\n         WHERE source = \"RENT\"\n         ORDER BY source desc\n         LIMIT 10\n  );;\n\n\n  dimension: id {\n    type: number\n    sql: ${TABLE}.id ;;\n  }\n\n  dimension: name {\n    type: string\n    sql: ${TABLE}.name ;;\n  }\n\n  dimension: source {\n    type: string\n    sql: ${TABLE}.source ;;\n  }\n}",
+            "viewLanguage": "lookml"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.rent_as_employee_income_source,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.rent_as_employee_income_source,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.common.BrowsePaths": {
+                        "paths": [
+                            "/Develop/lkml_samples/"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1586847600000,
+                                    "actor": "urn:li:corpuser:datahub"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_income_source,PROD)",
+                                "type": "VIEW"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_income_source,PROD),id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.rent_as_employee_income_source,PROD),id)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_income_source,PROD),name)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.rent_as_employee_income_source,PROD),name)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.employee_income_source,PROD),source)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.rent_as_employee_income_source,PROD),source)"
+                                ],
+                                "confidenceScore": 1.0
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "rent_as_employee_income_source",
+                        "platform": "urn:li:dataPlatform:looker",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.OtherSchema": {
+                                "rawSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "id",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "number",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "name",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "source",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            }
+                        ],
+                        "primaryKeys": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "looker.file.path": "rent_as_employee_income_source.view.lkml",
+                            "looker.model": "data"
+                        },
+                        "name": "rent_as_employee_income_source",
+                        "tags": []
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.rent_as_employee_income_source,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Develop"
+                },
+                {
+                    "id": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+                    "urn": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.parent_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.parent_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "view: parent_view {\n  sql_table_name: `dataset.table` ;;\n\n  dimension: id {\n    primary_key: yes\n    type: string\n    sql: ${TABLE}.id ;;\n  }\n\n  dimension: parent_dimension_1 {\n    type: string\n    sql: ${TABLE}.parent_dimension_1 ;;\n  }\n\n  measure: parent_count {\n    type: count\n  }\n}",
+            "viewLanguage": "lookml"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.parent_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.parent_view,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.common.BrowsePaths": {
+                        "paths": [
+                            "/Develop/lkml_samples/"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1586847600000,
+                                    "actor": "urn:li:corpuser:datahub"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,.dataset.table,PROD)",
+                                "type": "VIEW"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,.dataset.table,PROD),id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.parent_view,PROD),id)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,.dataset.table,PROD),parent_dimension_1)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.parent_view,PROD),parent_dimension_1)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,.dataset.table,PROD),parent_count)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.parent_view,PROD),parent_count)"
+                                ],
+                                "confidenceScore": 1.0
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "parent_view",
+                        "platform": "urn:li:dataPlatform:looker",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.OtherSchema": {
+                                "rawSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "id",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": true
+                            },
+                            {
+                                "fieldPath": "parent_dimension_1",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "parent_count",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "count",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Measure"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            }
+                        ],
+                        "primaryKeys": [
+                            "id"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "looker.file.path": "parent_view.view.lkml",
+                            "looker.model": "data"
+                        },
+                        "name": "parent_view",
+                        "tags": []
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.parent_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Develop"
+                },
+                {
+                    "id": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+                    "urn": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.child_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.child_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "include: \"parent_view.view.lkml\"\n\nview: child_view {\n  extends: [parent_view]\n\n  dimension: id {\n    primary_key: yes\n    type: integer\n    sql: ${TABLE}.id ;;\n  }\n\n  dimension: child_dimension_1 {\n    type: string\n    sql: ${TABLE}.child_dimension_1 ;;\n  }\n}",
+            "viewLanguage": "lookml"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.child_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.child_view,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.common.BrowsePaths": {
+                        "paths": [
+                            "/Develop/lkml_samples/"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1586847600000,
+                                    "actor": "urn:li:corpuser:datahub"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,.dataset.table,PROD)",
+                                "type": "VIEW"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,.dataset.table,PROD),id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.child_view,PROD),id)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,.dataset.table,PROD),child_dimension_1)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.child_view,PROD),child_dimension_1)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,.dataset.table,PROD),parent_dimension_1)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.child_view,PROD),parent_dimension_1)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,.dataset.table,PROD),parent_count)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.child_view,PROD),parent_count)"
+                                ],
+                                "confidenceScore": 1.0
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "child_view",
+                        "platform": "urn:li:dataPlatform:looker",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.OtherSchema": {
+                                "rawSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "id",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "integer",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": true
+                            },
+                            {
+                                "fieldPath": "child_dimension_1",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "parent_dimension_1",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            },
+                            {
+                                "fieldPath": "parent_count",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "count",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Measure"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            }
+                        ],
+                        "primaryKeys": [
+                            "id"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "looker.file.path": "child_view.view.lkml",
+                            "looker.model": "data"
+                        },
+                        "name": "child_view",
+                        "tags": []
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.child_view,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Develop"
+                },
+                {
+                    "id": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+                    "urn": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "tag",
     "entityUrn": "urn:li:tag:Dimension",
diff --git a/metadata-ingestion/tests/integration/mode/mode_mces_golden.json b/metadata-ingestion/tests/integration/mode/mode_mces_golden.json
index 2fa9f4ee86a860..a6a685672bda00 100644
--- a/metadata-ingestion/tests/integration/mode/mode_mces_golden.json
+++ b/metadata-ingestion/tests/integration/mode/mode_mces_golden.json
@@ -132,8 +132,8 @@
         "json": {
             "timestampMillis": 1638860400000,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "viewsCount": 6
         }
@@ -173,7 +173,9 @@
                         "charts": [
                             "urn:li:chart:(mode,f622b9ee725b)"
                         ],
-                        "datasets": [],
+                        "datasets": [
+                            "urn:li:dataset:(urn:li:dataPlatform:mode,5450544,PROD)"
+                        ],
                         "lastModified": {
                             "created": {
                                 "time": 1639169724316,
@@ -243,6 +245,89 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mode,5450544,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "updated_at": "2024-09-02T07:40:44.046Z",
+                "last_run_id": "3535709679",
+                "data_source_id": "44763",
+                "report_imports_count": "2"
+            },
+            "externalUrl": "https://app.mode.com/acryl/datasets/24f66e1701b6",
+            "name": "Dataset 1",
+            "description": "### Source Code\n``` sql\n-- Returns first 100 rows from DATAHUB_COMMUNITY.POSTGRES_PUBLIC.COMPANY\n  SELECT \n\t\tAGE,\n\t\tID,\n\t\tNAME,\n\t\t_FIVETRAN_DELETED,\n\t\t_FIVETRAN_SYNCED\n FROM DATAHUB_COMMUNITY.POSTGRES_PUBLIC.COMPANY LIMIT 100;\n\n-- Returns first 100 rows from ETHAN_TEST_DB.PUBLIC.ACCOUNT_PHONE_NUMBER\n  SELECT \n\t\tCOMMUNICATION_ACCOUNT_ID,\n\t\tID,\n\t\tMMS_CAPABLE,\n\t\tPHONE_NUMBER,\n\t\tSMS_CAPABLE,\n\t\tSTATUS,\n\t\tSTATUS_TLM,\n\t\tTLM,\n\t\tVOICE_CAPABLE,\n\t\tWHEN_CREATED\n FROM ETHAN_TEST_DB.PUBLIC.ACCOUNT_PHONE_NUMBER LIMIT 100;\n \n \n```\n            ",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1638860400000,
+        "runId": "mode-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mode,5450544,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:800cfcb4cec6ad587cafde11a0b0bb4a"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1638860400000,
+        "runId": "mode-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mode,5450544,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Dataset"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1638860400000,
+        "runId": "mode-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mode,5450544,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "acryl"
+                },
+                {
+                    "id": "urn:li:container:800cfcb4cec6ad587cafde11a0b0bb4a",
+                    "urn": "urn:li:container:800cfcb4cec6ad587cafde11a0b0bb4a"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1638860400000,
+        "runId": "mode-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mode,10149707,PROD)",
@@ -643,8 +728,8 @@
         "json": {
             "timestampMillis": 1638860400000,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "operationType": "UPDATE",
             "lastUpdatedTimestamp": 1639177973273
@@ -721,9 +806,9 @@
         "json": {
             "fields": [
                 {
-                    "schemaFieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:mode,10149707,PROD),payment_date)",
+                    "schemaFieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:mode,10149707,PROD),amount)",
                     "schemaField": {
-                        "fieldPath": "payment_date",
+                        "fieldPath": "amount",
                         "nullable": false,
                         "type": {
                             "type": {
@@ -743,9 +828,9 @@
                     }
                 },
                 {
-                    "schemaFieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:mode,10149707,PROD),amount)",
+                    "schemaFieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:mode,10149707,PROD),payment_date)",
                     "schemaField": {
-                        "fieldPath": "amount",
+                        "fieldPath": "payment_date",
                         "nullable": false,
                         "type": {
                             "type": {
@@ -943,6 +1028,22 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mode,5450544,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1638860400000,
+        "runId": "mode-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "query",
     "entityUrn": "urn:li:query:10149707.34499.1897576958",
diff --git a/metadata-ingestion/tests/integration/mode/setup/dataset_24f66e1701b6.json b/metadata-ingestion/tests/integration/mode/setup/dataset_24f66e1701b6.json
new file mode 100644
index 00000000000000..4e9cb911ab565d
--- /dev/null
+++ b/metadata-ingestion/tests/integration/mode/setup/dataset_24f66e1701b6.json
@@ -0,0 +1,149 @@
+{
+    "token": "24f66e1701b6",
+    "id": 5450544,
+    "name": "Dataset 1",
+    "description": "",
+    "created_at": "2024-09-02T07:38:43.722Z",
+    "updated_at": "2024-09-02T07:40:44.026Z",
+    "published_at": null,
+    "edited_at": "2024-09-02T07:40:32.668Z",
+    "type": "DatasetReport",
+    "last_successful_sync_at": null,
+    "last_saved_at": "2024-09-02T07:40:32.679Z",
+    "archived": false,
+    "space_token": "75737b70402e",
+    "account_id": 751252,
+    "account_username": "acryltest",
+    "public": false,
+    "manual_run_disabled": false,
+    "drill_anywhere_enabled": false,
+    "run_privately": true,
+    "drilldowns_enabled": false,
+    "expected_runtime": 0.763795,
+    "last_successfully_run_at": "2024-09-02T07:40:44.009Z",
+    "last_run_at": "2024-09-02T07:40:43.185Z",
+    "last_successful_run_token": "29e56ca29a45",
+    "query_count": 1,
+    "max_query_count": 160,
+    "runs_count": 3,
+    "schedules_count": 0,
+    "query_preview": "-- Returns first 100 rows from DATAHUB_COMMUNITY.POSTGRES_PUBLIC.COMPANY\n  SELECT \n\t\tAGE,\n\t\tID,\n\t\tNAME,\n\t\t_FIVETRAN_DELE",
+    "view_count": 6,
+    "thoughtspot_published_at": null,
+    "_links": {
+        "self": {
+            "href": "/api/acryltest/reports/24f66e1701b6"
+        },
+        "web": {
+            "href": "https://app.mode.com/acryltest/datasets/24f66e1701b6"
+        },
+        "web_edit": {
+            "href": "/editor/acryltest/datasets/24f66e1701b6"
+        },
+        "account": {
+            "href": "/api/acryltest"
+        },
+        "report_run": {
+            "templated": true,
+            "href": "/api/acryltest/reports/24f66e1701b6/runs/{id}?embed[result]=1"
+        },
+        "space": {
+            "href": "/api/acryltest/collections/75737b70402e"
+        },
+        "space_links": {
+            "href": "/api/acryltest/reports/24f66e1701b6/space_links"
+        },
+        "queries": {
+            "href": "/api/acryltest/reports/24f66e1701b6/queries"
+        },
+        "report_runs": {
+            "href": "/api/acryltest/reports/24f66e1701b6/runs"
+        },
+        "report_pins": {
+            "href": "/api/acryltest/reports/24f66e1701b6/pins"
+        },
+        "report_schedules": {
+            "href": "/api/acryltest/reports/24f66e1701b6/schedules"
+        },
+        "dataset_dependencies": {
+            "href": "/api/acryltest/datasets/24f66e1701b6/reports"
+        },
+        "last_run": {
+            "href": "/api/acryltest/reports/24f66e1701b6/runs/29e56ca29a45"
+        },
+        "last_successful_run": {
+            "href": "/api/acryltest/reports/24f66e1701b6/runs/29e56ca29a45"
+        },
+        "perspective_email_subscription_memberships": {
+            "href": "/api/acryltest/reports/24f66e1701b6/perspective_email_report_subscription_memberships"
+        },
+        "creator": {
+            "href": "/api/modeuser"
+        },
+        "report_index_web": {
+            "href": "/acryltest/spaces/75737b70402e"
+        }
+    },
+    "_forms": {
+        "edit": {
+            "method": "patch",
+            "action": "/api/acryltest/reports/24f66e1701b6",
+            "input": {
+                "report": {
+                    "name": {
+                        "type": "text",
+                        "value": "Dataset_2"
+                    },
+                    "description": {
+                        "type": "text",
+                        "value": ""
+                    },
+                    "account_id": {
+                        "type": "text",
+                        "value": 751252
+                    },
+                    "space_token": {
+                        "type": "text",
+                        "value": "75737b70402e"
+                    }
+                }
+            }
+        },
+        "destroy": {
+            "method": "delete",
+            "action": "/api/acryltest/reports/24f66e1701b6"
+        },
+        "archive": {
+            "method": "patch",
+            "action": "/api/acryltest/reports/24f66e1701b6/archive"
+        },
+        "unarchive": {
+            "method": "patch",
+            "action": "/api/acryltest/reports/24f66e1701b6/unarchive"
+        },
+        "update_settings": {
+            "method": "patch",
+            "action": "/api/acryltest/reports/24f66e1701b6/update_settings",
+            "input": {
+                "report": {
+                    "manual_run_disabled": {
+                        "type": "select",
+                        "options": [
+                            true,
+                            false
+                        ],
+                        "value": false
+                    },
+                    "drill_anywhere_enabled": {
+                        "type": "select",
+                        "options": [
+                            true,
+                            false
+                        ],
+                        "value": false
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/mode/setup/dataset_queries_24f66e1701b6.json b/metadata-ingestion/tests/integration/mode/setup/dataset_queries_24f66e1701b6.json
new file mode 100644
index 00000000000000..ba3be157786e6f
--- /dev/null
+++ b/metadata-ingestion/tests/integration/mode/setup/dataset_queries_24f66e1701b6.json
@@ -0,0 +1,64 @@
+{
+    "_links": {
+        "self": {
+            "href": "/api/acryl/reports/24f66e1701b6/queries"
+        }
+    },
+    "_embedded": {
+        "queries": [
+            {
+                "id": 19780522,
+                "token": "9b2f34343531",
+                "raw_query": "-- Returns first 100 rows from DATAHUB_COMMUNITY.POSTGRES_PUBLIC.COMPANY\n  SELECT \n\t\tAGE,\n\t\tID,\n\t\tNAME,\n\t\t_FIVETRAN_DELETED,\n\t\t_FIVETRAN_SYNCED\n FROM DATAHUB_COMMUNITY.POSTGRES_PUBLIC.COMPANY LIMIT 100;\n\n-- Returns first 100 rows from ETHAN_TEST_DB.PUBLIC.ACCOUNT_PHONE_NUMBER\n  SELECT \n\t\tCOMMUNICATION_ACCOUNT_ID,\n\t\tID,\n\t\tMMS_CAPABLE,\n\t\tPHONE_NUMBER,\n\t\tSMS_CAPABLE,\n\t\tSTATUS,\n\t\tSTATUS_TLM,\n\t\tTLM,\n\t\tVOICE_CAPABLE,\n\t\tWHEN_CREATED\n FROM ETHAN_TEST_DB.PUBLIC.ACCOUNT_PHONE_NUMBER LIMIT 100;\n \n ",
+                "created_at": "2024-09-02T07:38:43.755Z",
+                "updated_at": "2024-09-02T07:40:44.046Z",
+                "name": "Query 1",
+                "last_run_id": 3535709679,
+                "data_source_id": 44763,
+                "explorations_count": 0,
+                "report_imports_count": 2,
+                "dbt_metric_id": null,
+                "_links": {
+                    "self": {
+                        "href": "/api/acryl/reports/24f66e1701b6/queries/9b2f34343531"
+                    },
+                    "report": {
+                        "href": "/api/acryl/reports/24f66e1701b6"
+                    },
+                    "report_runs": {
+                        "href": "/api/acryl/reports/24f66e1701b6/runs"
+                    },
+                    "query_runs": {
+                        "href": "/api/acryl/reports/24f66e1701b6/queries/9b2f34343531/runs"
+                    },
+                    "creator": {
+                        "href": "/api/modeuser"
+                    }
+                },
+                "_forms": {
+                    "edit": {
+                        "method": "patch",
+                        "action": "/api/acryl/reports/24f66e1701b6/queries/9b2f34343531",
+                        "content_type": "application/json",
+                        "input": {
+                            "query": {
+                                "raw_query": {
+                                    "type": "text",
+                                    "value": "-- Returns first 100 rows from DATAHUB_COMMUNITY.POSTGRES_PUBLIC.COMPANY\n  SELECT \n\t\tAGE,\n\t\tID,\n\t\tNAME,\n\t\t_FIVETRAN_DELETED,\n\t\t_FIVETRAN_SYNCED\n FROM DATAHUB_COMMUNITY.POSTGRES_PUBLIC.COMPANY LIMIT 100;\n\n-- Returns first 100 rows from ETHAN_TEST_DB.PUBLIC.ACCOUNT_PHONE_NUMBER\n  SELECT \n\t\tCOMMUNICATION_ACCOUNT_ID,\n\t\tID,\n\t\tMMS_CAPABLE,\n\t\tPHONE_NUMBER,\n\t\tSMS_CAPABLE,\n\t\tSTATUS,\n\t\tSTATUS_TLM,\n\t\tTLM,\n\t\tVOICE_CAPABLE,\n\t\tWHEN_CREATED\n FROM ETHAN_TEST_DB.PUBLIC.ACCOUNT_PHONE_NUMBER LIMIT 100;\n \n "
+                                },
+                                "name": {
+                                    "type": "text",
+                                    "value": "Query 1"
+                                },
+                                "data_source_id": {
+                                    "type": "text",
+                                    "value": 44763
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/mode/setup/datasets_157933cc1168.json b/metadata-ingestion/tests/integration/mode/setup/datasets_157933cc1168.json
new file mode 100644
index 00000000000000..4ca48a84e9110f
--- /dev/null
+++ b/metadata-ingestion/tests/integration/mode/setup/datasets_157933cc1168.json
@@ -0,0 +1,10 @@
+{
+  "_links": {
+    "self": {
+      "href": "/api/acryltest/collections/157933cc1168/reports"
+    }
+  },
+  "_embedded": {
+    "reports": []
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/mode/setup/datasets_75737b70402e.json b/metadata-ingestion/tests/integration/mode/setup/datasets_75737b70402e.json
new file mode 100644
index 00000000000000..ffb1bbf521db76
--- /dev/null
+++ b/metadata-ingestion/tests/integration/mode/setup/datasets_75737b70402e.json
@@ -0,0 +1,149 @@
+{
+  "_links": {
+    "self": {
+      "href": "/api/acryltest/collections/75737b70402e/reports"
+    }
+  },
+  "_embedded": {
+    "reports": [
+      {
+        "account_id": 751252,
+        "account_username": "acryltest",
+        "collection_name": "AcrylTest",
+        "collection_token": "75737b70402e",
+        "created_at": "2024-09-02T07:38:43.722Z",
+        "description": "",
+        "drilldowns_enabled": false,
+        "edited_at": "2024-09-02T07:40:32.668Z",
+        "id": 5450544,
+        "is_sample": false,
+        "last_run_at": "2024-09-02T07:40:43.185Z",
+        "last_saved_at": "2024-09-02T07:40:32.679Z",
+        "last_successful_run_token": "29e56ca29a45",
+        "last_successful_sync_at": null,
+        "last_successfully_run_at": "2024-09-02T07:40:44.009Z",
+        "manual_run_disabled": false,
+        "max_query_count": 1,
+        "name": "Dataset 1",
+        "public": false,
+        "query_count": 1,
+        "query_preview": "-- Returns first 100 rows from DATAHUB_COMMUNITY.POSTGRES_PUBLIC.COMPANY\n  SELECT \n\t\tAGE,\n\t\tID,\n\t\tNAME,\n\t\t_FIVETRAN_DELE",
+        "run_privately": true,
+        "runs_count": 3,
+        "schedules_count": 0,
+        "space_token": "75737b70402e",
+        "switch_view_token": "f213a1bb8f8a",
+        "token": "24f66e1701b6",
+        "type": "DatasetReport",
+        "updated_at": "2024-09-02T07:40:44.026Z",
+        "view_count": 6,
+        "thoughtspot_published_at": null,
+        "_links": {
+            "account": {
+                "href": "/api/acryltest"
+            },
+            "creator": {
+                "href": "/api/modeuser"
+            },
+            "dataset_dependencies": {
+                "href": "/api/acryltest/datasets/24f66e1701b6/reports"
+            },
+            "last_run": {
+                "href": "/api/acryltest/reports/24f66e1701b6/runs/29e56ca29a45"
+            },
+            "last_successful_run": {
+                "href": "/api/acryltest/reports/24f66e1701b6/runs/29e56ca29a45"
+            },
+            "queries": {
+                "href": "/api/acryltest/reports/24f66e1701b6/queries"
+            },
+            "report_index_web": {
+                "href": "/acryltest/spaces/75737b70402e"
+            },
+            "report_pins": {
+                "href": "/api/acryltest/reports/24f66e1701b6/pins"
+            },
+            "report_run": {
+                "templated": true,
+                "href": "/api/acryltest/reports/24f66e1701b6/runs/{id}?embed[result]=1"
+            },
+            "report_runs": {
+                "href": "/api/acryltest/reports/24f66e1701b6/runs"
+            },
+            "report_schedules": {
+                "href": "/api/acryltest/reports/24f66e1701b6/schedules"
+            },
+            "self": {
+                "href": "/api/acryltest/reports/24f66e1701b6"
+            },
+            "space": {
+                "href": "/api/acryltest/collections/75737b70402e"
+            },
+            "space_links": {
+                "href": "/api/acryltest/reports/24f66e1701b6/space_links"
+            },
+            "web": {
+                "href": "https://app.mode.com/acryltest/datasets/24f66e1701b6"
+            },
+            "web_edit": {
+                "href": "/editor/acryltest/datasets/24f66e1701b6"
+            }
+        },
+        "_forms": {
+            "destroy": {
+                "method": "delete",
+                "action": "/api/acryltest/reports/24f66e1701b6"
+            },
+            "edit": {
+                "method": "patch",
+                "action": "/api/acryltest/reports/24f66e1701b6",
+                "input": {
+                    "report": {
+                        "name": {
+                            "type": "text",
+                            "value": "Dataset_2"
+                        },
+                        "description": {
+                            "type": "text",
+                            "value": ""
+                        },
+                        "account_id": {
+                            "type": "text",
+                            "value": 751252
+                        },
+                        "space_token": {
+                            "type": "text",
+                            "value": "75737b70402e"
+                        }
+                    }
+                }
+            },
+            "update_settings": {
+                "method": "patch",
+                "action": "/api/acryltest/reports/24f66e1701b6/update_settings",
+                "input": {
+                    "report": {
+                        "manual_run_disabled": {
+                            "type": "select",
+                            "options": [
+                                true,
+                                false
+                            ],
+                            "value": false
+                        },
+                        "drill_anywhere_enabled": {
+                            "type": "select",
+                            "options": [
+                                true,
+                                false
+                            ],
+                            "value": false
+                        }
+                    }
+                }
+            }
+        }
+     }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/mode/setup/reports_75737b70402e.json b/metadata-ingestion/tests/integration/mode/setup/reports_75737b70402e.json
index 9718967e5e463f..956093a95d8492 100644
--- a/metadata-ingestion/tests/integration/mode/setup/reports_75737b70402e.json
+++ b/metadata-ingestion/tests/integration/mode/setup/reports_75737b70402e.json
@@ -221,7 +221,34 @@
             }
           }
         }
-      }
+      },
+      "imported_datasets": [
+        {
+            "name": "Dataset 1",
+            "token": "24f66e1701b6",
+            "_links": {
+                "report": {
+                    "href": "/api/acryltest/reports/94750a190dc8"
+                },
+                "source_dataset": {
+                    "href": "/api/acryltest/reports/24f66e1701b6"
+                }
+            },
+            "_forms": {
+                "refresh": {
+                    "method": "post",
+                    "action": "/api/acryltest/reports/94750a190dc8/runs",
+                    "input": {
+                        "dataset_tokens": [
+                            {
+                                "token": "24f66e1701b6"
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    ]
     }]
   }
 }
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/mode/test_mode.py b/metadata-ingestion/tests/integration/mode/test_mode.py
index 0346767b05d253..7ea6597460de20 100644
--- a/metadata-ingestion/tests/integration/mode/test_mode.py
+++ b/metadata-ingestion/tests/integration/mode/test_mode.py
@@ -22,6 +22,10 @@
     "https://app.mode.com/api/acryl/reports/9d2da37fa91e/queries/6e26a9f3d4e2/charts": "charts.json",
     "https://app.mode.com/api/acryl/data_sources": "data_sources.json",
     "https://app.mode.com/api/acryl/definitions": "definitions.json",
+    "https://app.mode.com/api/acryl/spaces/157933cc1168/datasets": "datasets_157933cc1168.json",
+    "https://app.mode.com/api/acryl/spaces/75737b70402e/datasets": "datasets_75737b70402e.json",
+    "https://app.mode.com/api/acryl/reports/24f66e1701b6": "dataset_24f66e1701b6.json",
+    "https://app.mode.com/api/acryl/reports/24f66e1701b6/queries": "dataset_queries_24f66e1701b6.json",
 }
 
 RESPONSE_ERROR_LIST = ["https://app.mode.com/api/acryl/spaces/75737b70402e/reports"]
diff --git a/metadata-ingestion/tests/integration/mongodb/mongodb_mces_golden.json b/metadata-ingestion/tests/integration/mongodb/mongodb_mces_golden.json
index ec3fd80e6a6ea4..bba160984eed87 100644
--- a/metadata-ingestion/tests/integration/mongodb/mongodb_mces_golden.json
+++ b/metadata-ingestion/tests/integration/mongodb/mongodb_mces_golden.json
@@ -1,4 +1,59 @@
 [
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "mongodb",
+                "instance": "instance",
+                "env": "PROD",
+                "database": "mngdb"
+            },
+            "name": "mngdb"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:mongodb",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
@@ -47,6 +102,22 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
@@ -64,6 +135,70 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Database"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+                },
+                {
+                    "id": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+                    "urn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.firstCollection,PROD)",
@@ -377,6 +512,22 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.firstCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.firstCollection,PROD)",
@@ -4026,6 +4177,22 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.largeCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.largeCollection,PROD)",
@@ -4046,6 +4213,31 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.firstCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+                },
+                {
+                    "id": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+                    "urn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.largeCollection,PROD)",
@@ -4063,6 +4255,47 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.largeCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+                },
+                {
+                    "id": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+                    "urn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.secondCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.secondCollection,PROD)",
@@ -4237,6 +4470,31 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.secondCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+                },
+                {
+                    "id": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+                    "urn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
diff --git a/metadata-ingestion/tests/integration/mongodb/mongodb_mces_small_schema_size_golden.json b/metadata-ingestion/tests/integration/mongodb/mongodb_mces_small_schema_size_golden.json
index 72b5fee49a0dbd..b2a1ba03dab768 100644
--- a/metadata-ingestion/tests/integration/mongodb/mongodb_mces_small_schema_size_golden.json
+++ b/metadata-ingestion/tests/integration/mongodb/mongodb_mces_small_schema_size_golden.json
@@ -1,4 +1,59 @@
 [
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "mongodb",
+                "instance": "instance",
+                "env": "PROD",
+                "database": "mngdb"
+            },
+            "name": "mngdb"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-small-schema-size",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-small-schema-size",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:mongodb",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-small-schema-size",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
@@ -47,6 +102,22 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-small-schema-size",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
@@ -64,6 +135,70 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Database"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-small-schema-size",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-small-schema-size",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+                },
+                {
+                    "id": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+                    "urn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-small-schema-size",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.firstCollection,PROD)",
@@ -236,6 +371,22 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.firstCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-small-schema-size",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.firstCollection,PROD)",
@@ -405,6 +556,22 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.largeCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-small-schema-size",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.largeCollection,PROD)",
@@ -425,6 +592,31 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.firstCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+                },
+                {
+                    "id": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+                    "urn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-small-schema-size",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.largeCollection,PROD)",
@@ -442,6 +634,47 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.largeCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+                },
+                {
+                    "id": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+                    "urn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-small-schema-size",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.secondCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-small-schema-size",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.secondCollection,PROD)",
@@ -616,6 +849,31 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.secondCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+                },
+                {
+                    "id": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+                    "urn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-small-schema-size",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
diff --git a/metadata-ingestion/tests/integration/mysql/mysql_mces_no_db_golden.json b/metadata-ingestion/tests/integration/mysql/mysql_mces_no_db_golden.json
index f78b45fb373fc6..bddccc856c842c 100644
--- a/metadata-ingestion/tests/integration/mysql/mysql_mces_no_db_golden.json
+++ b/metadata-ingestion/tests/integration/mysql/mysql_mces_no_db_golden.json
@@ -147,7 +147,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -159,7 +159,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -171,7 +171,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=14)",
+                                "nativeDataType": "VARCHAR(14)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -183,7 +183,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=16)",
+                                "nativeDataType": "VARCHAR(16)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -195,7 +195,7 @@
                                         "com.linkedin.pegasus2avro.schema.EnumType": {}
                                     }
                                 },
-                                "nativeDataType": "ENUM('M', 'F')",
+                                "nativeDataType": "ENUM('M','F')",
                                 "recursive": false,
                                 "glossaryTerms": {
                                     "terms": [
@@ -218,7 +218,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -334,7 +334,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -346,7 +346,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -358,7 +358,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -370,7 +370,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -439,7 +439,6 @@
             },
             "rowCount": 10,
             "columnCount": 6,
-            "sizeInBytes": 16384,
             "fieldProfiles": [
                 {
                     "fieldPath": "emp_no",
@@ -574,7 +573,8 @@
                         "1989-08-24"
                     ]
                 }
-            ]
+            ],
+            "sizeInBytes": 16384
         }
     },
     "systemMetadata": {
@@ -597,7 +597,6 @@
             },
             "rowCount": 112,
             "columnCount": 4,
-            "sizeInBytes": 16384,
             "fieldProfiles": [
                 {
                     "fieldPath": "emp_no",
@@ -991,7 +990,8 @@
                         "1993-02-09"
                     ]
                 }
-            ]
+            ],
+            "sizeInBytes": 16384
         }
     },
     "systemMetadata": {
@@ -1166,7 +1166,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=500)",
+                                "nativeDataType": "VARCHAR(500)",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -1178,7 +1178,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=200)",
+                                "nativeDataType": "VARCHAR(200)",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -1190,7 +1190,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "BIGINT()",
+                                "nativeDataType": "BIGINT",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -1202,7 +1202,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "LONGTEXT()",
+                                "nativeDataType": "LONGTEXT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1214,7 +1214,7 @@
                                         "com.linkedin.pegasus2avro.schema.TimeType": {}
                                     }
                                 },
-                                "nativeDataType": "DATETIME(fsp=6)",
+                                "nativeDataType": "DATETIME(6)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1226,7 +1226,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255)",
+                                "nativeDataType": "VARCHAR(255)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1238,7 +1238,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255)",
+                                "nativeDataType": "VARCHAR(255)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1373,7 +1373,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "BIGINT()",
+                                "nativeDataType": "BIGINT",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -1386,7 +1386,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=200)",
+                                "nativeDataType": "VARCHAR(200)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1398,7 +1398,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=150)",
+                                "nativeDataType": "VARCHAR(150)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1410,7 +1410,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=150)",
+                                "nativeDataType": "VARCHAR(150)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1422,7 +1422,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "BIGINT()",
+                                "nativeDataType": "BIGINT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1434,7 +1434,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=200)",
+                                "nativeDataType": "VARCHAR(200)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1446,7 +1446,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "DOUBLE(asdecimal=True)",
+                                "nativeDataType": "DOUBLE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1583,7 +1583,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "BIGINT()",
+                                "nativeDataType": "BIGINT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1595,7 +1595,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=200)",
+                                "nativeDataType": "VARCHAR(200)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1607,7 +1607,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=150)",
+                                "nativeDataType": "VARCHAR(150)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1619,7 +1619,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "DOUBLE(asdecimal=True)",
+                                "nativeDataType": "DOUBLE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1858,7 +1858,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -1870,7 +1870,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1882,7 +1882,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1894,7 +1894,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1906,7 +1906,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "glossaryTerms": {
                                     "terms": [
@@ -1929,7 +1929,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -2045,7 +2045,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -2057,7 +2057,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2069,7 +2069,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -2150,7 +2150,6 @@
             },
             "rowCount": 5,
             "columnCount": 6,
-            "sizeInBytes": 16384,
             "fieldProfiles": [
                 {
                     "fieldPath": "id",
@@ -2259,7 +2258,8 @@
                         "3.8"
                     ]
                 }
-            ]
+            ],
+            "sizeInBytes": 16384
         }
     },
     "systemMetadata": {
@@ -2282,7 +2282,6 @@
             },
             "rowCount": 0,
             "columnCount": 3,
-            "sizeInBytes": 16384,
             "fieldProfiles": [
                 {
                     "fieldPath": "id",
@@ -2299,7 +2298,8 @@
                     "uniqueCount": 0,
                     "nullCount": 0
                 }
-            ]
+            ],
+            "sizeInBytes": 16384
         }
     },
     "systemMetadata": {
@@ -2456,7 +2456,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "SET('a', 'b', 'c', 'd')",
+                                "nativeDataType": "SET('a','b','c','d')",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -2572,7 +2572,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -2641,14 +2641,14 @@
             },
             "rowCount": 0,
             "columnCount": 1,
-            "sizeInBytes": 16384,
             "fieldProfiles": [
                 {
                     "fieldPath": "col",
                     "uniqueCount": 0,
                     "nullCount": 0
                 }
-            ]
+            ],
+            "sizeInBytes": 16384
         }
     },
     "systemMetadata": {
@@ -2671,14 +2671,14 @@
             },
             "rowCount": 0,
             "columnCount": 1,
-            "sizeInBytes": 16384,
             "fieldProfiles": [
                 {
                     "fieldPath": "dummy",
                     "uniqueCount": 0,
                     "nullCount": 0
                 }
-            ]
+            ],
+            "sizeInBytes": 16384
         }
     },
     "systemMetadata": {
diff --git a/metadata-ingestion/tests/integration/mysql/mysql_mces_with_db_golden.json b/metadata-ingestion/tests/integration/mysql/mysql_mces_with_db_golden.json
index 065d6cbe90b313..8c6f6338bc2b07 100644
--- a/metadata-ingestion/tests/integration/mysql/mysql_mces_with_db_golden.json
+++ b/metadata-ingestion/tests/integration/mysql/mysql_mces_with_db_golden.json
@@ -165,7 +165,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -177,7 +177,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -189,7 +189,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -201,7 +201,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -213,7 +213,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -225,7 +225,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -359,7 +359,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -371,7 +371,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -383,7 +383,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
diff --git a/metadata-ingestion/tests/integration/mysql/mysql_table_level_only.json b/metadata-ingestion/tests/integration/mysql/mysql_table_level_only.json
index b8dfd7d9efc37d..3f5899aa8a98c3 100644
--- a/metadata-ingestion/tests/integration/mysql/mysql_table_level_only.json
+++ b/metadata-ingestion/tests/integration/mysql/mysql_table_level_only.json
@@ -147,7 +147,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -159,7 +159,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -171,7 +171,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -183,7 +183,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -195,7 +195,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -207,7 +207,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -323,7 +323,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -335,7 +335,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -347,7 +347,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -461,63 +461,5 @@
         "runId": "mysql-2020_04_14-07_00_00",
         "lastRunId": "no-run-id-provided"
     }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:dc2ae101b66746b9c2b6df8ee89ca88f",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1586847600000,
-        "runId": "mysql-2020_04_14-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mysql,northwind.customers,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:dc2ae101b66746b9c2b6df8ee89ca88f",
-                    "urn": "urn:li:container:dc2ae101b66746b9c2b6df8ee89ca88f"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1586847600000,
-        "runId": "mysql-2020_04_14-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mysql,northwind.orders,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:dc2ae101b66746b9c2b6df8ee89ca88f",
-                    "urn": "urn:li:container:dc2ae101b66746b9c2b6df8ee89ca88f"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1586847600000,
-        "runId": "mysql-2020_04_14-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/mysql/mysql_table_row_count_estimate_only.json b/metadata-ingestion/tests/integration/mysql/mysql_table_row_count_estimate_only.json
index fc25af0400bb5d..58a70cae2b2d5e 100644
--- a/metadata-ingestion/tests/integration/mysql/mysql_table_row_count_estimate_only.json
+++ b/metadata-ingestion/tests/integration/mysql/mysql_table_row_count_estimate_only.json
@@ -147,7 +147,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -159,7 +159,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -171,7 +171,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -183,7 +183,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -195,7 +195,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -207,7 +207,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -323,7 +323,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -335,7 +335,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -347,7 +347,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
diff --git a/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_database.json b/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_database.json
index b740dfe025ef7f..4054d757c22fdb 100644
--- a/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_database.json
+++ b/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_database.json
@@ -1,7 +1,7 @@
 [
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
+    "entityUrn": "urn:li:container:0e497517e191d344b0c403231bc708d0",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -9,9 +9,9 @@
             "customProperties": {
                 "platform": "oracle",
                 "env": "PROD",
-                "database": "oradoc"
+                "database": "OraDoc"
             },
-            "name": "oradoc"
+            "name": "OraDoc"
         }
     },
     "systemMetadata": {
@@ -22,7 +22,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
+    "entityUrn": "urn:li:container:0e497517e191d344b0c403231bc708d0",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -38,7 +38,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
+    "entityUrn": "urn:li:container:0e497517e191d344b0c403231bc708d0",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -54,7 +54,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
+    "entityUrn": "urn:li:container:0e497517e191d344b0c403231bc708d0",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -72,7 +72,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
+    "entityUrn": "urn:li:container:0e497517e191d344b0c403231bc708d0",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
@@ -88,7 +88,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
+    "entityUrn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -96,7 +96,7 @@
             "customProperties": {
                 "platform": "oracle",
                 "env": "PROD",
-                "database": "oradoc",
+                "database": "OraDoc",
                 "schema": "schema1"
             },
             "name": "schema1"
@@ -110,7 +110,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
+    "entityUrn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -126,7 +126,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
+    "entityUrn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -142,7 +142,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
+    "entityUrn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -160,12 +160,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
+    "entityUrn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+            "container": "urn:li:container:0e497517e191d344b0c403231bc708d0"
         }
     },
     "systemMetadata": {
@@ -176,15 +176,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
+    "entityUrn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 }
             ]
         }
@@ -202,7 +202,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
+            "container": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad"
         }
     },
     "systemMetadata": {
@@ -258,7 +258,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "NUMBER(asdecimal=False)",
+                                "nativeDataType": "NUMBER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             }
@@ -301,12 +301,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 },
                 {
-                    "id": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
-                    "urn": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
+                    "id": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
+                    "urn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad"
                 }
             ]
         }
@@ -324,7 +324,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
+            "container": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad"
         }
     },
     "systemMetadata": {
@@ -380,7 +380,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "NUMBER(asdecimal=False)",
+                                "nativeDataType": "NUMBER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             }
@@ -423,12 +423,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 },
                 {
-                    "id": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
-                    "urn": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
+                    "id": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
+                    "urn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad"
                 }
             ]
         }
@@ -446,7 +446,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
+            "container": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad"
         }
     },
     "systemMetadata": {
@@ -505,7 +505,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "NUMBER(asdecimal=False)",
+                                "nativeDataType": "NUMBER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -566,12 +566,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 },
                 {
-                    "id": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
-                    "urn": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
+                    "id": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
+                    "urn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad"
                 }
             ]
         }
@@ -584,7 +584,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
+    "entityUrn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -592,7 +592,7 @@
             "customProperties": {
                 "platform": "oracle",
                 "env": "PROD",
-                "database": "oradoc",
+                "database": "OraDoc",
                 "schema": "schema2"
             },
             "name": "schema2"
@@ -606,7 +606,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
+    "entityUrn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -622,7 +622,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
+    "entityUrn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -638,7 +638,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
+    "entityUrn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -656,12 +656,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
+    "entityUrn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+            "container": "urn:li:container:0e497517e191d344b0c403231bc708d0"
         }
     },
     "systemMetadata": {
@@ -672,15 +672,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
+    "entityUrn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 }
             ]
         }
@@ -698,7 +698,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
+            "container": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f"
         }
     },
     "systemMetadata": {
@@ -754,7 +754,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "NUMBER(asdecimal=False)",
+                                "nativeDataType": "NUMBER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             }
@@ -797,12 +797,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 },
                 {
-                    "id": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
-                    "urn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
+                    "id": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
+                    "urn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f"
                 }
             ]
         }
@@ -820,7 +820,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
+            "container": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f"
         }
     },
     "systemMetadata": {
@@ -876,7 +876,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "NUMBER(asdecimal=False)",
+                                "nativeDataType": "NUMBER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             }
@@ -919,12 +919,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 },
                 {
-                    "id": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
-                    "urn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
+                    "id": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
+                    "urn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f"
                 }
             ]
         }
@@ -942,7 +942,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
+            "container": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f"
         }
     },
     "systemMetadata": {
@@ -1001,7 +1001,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "NUMBER(asdecimal=False)",
+                                "nativeDataType": "NUMBER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1062,12 +1062,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 },
                 {
-                    "id": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
-                    "urn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
+                    "id": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
+                    "urn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f"
                 }
             ]
         }
@@ -1080,7 +1080,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema2.mock_view,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema1.mock_view,PROD)",
     "changeType": "UPSERT",
     "aspectName": "upstreamLineage",
     "aspect": {
@@ -1091,7 +1091,7 @@
                         "time": 0,
                         "actor": "urn:li:corpuser:unknown"
                     },
-                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema2.mock_table,PROD)",
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema1.mock_table,PROD)",
                     "type": "VIEW"
                 }
             ],
@@ -1099,22 +1099,22 @@
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema2.mock_table,PROD),MOCK_COLUMN1)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema1.mock_table,PROD),MOCK_COLUMN1)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema2.mock_view,PROD),MOCK_COLUMN1)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema1.mock_view,PROD),MOCK_COLUMN1)"
                     ],
                     "confidenceScore": 1.0
                 },
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema2.mock_table,PROD),MOCK_COLUMN2)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema1.mock_table,PROD),MOCK_COLUMN2)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema2.mock_view,PROD),MOCK_COLUMN2)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema1.mock_view,PROD),MOCK_COLUMN2)"
                     ],
                     "confidenceScore": 1.0
                 }
@@ -1129,7 +1129,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema1.mock_view,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema2.mock_view,PROD)",
     "changeType": "UPSERT",
     "aspectName": "upstreamLineage",
     "aspect": {
@@ -1140,7 +1140,7 @@
                         "time": 0,
                         "actor": "urn:li:corpuser:unknown"
                     },
-                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema1.mock_table,PROD)",
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema2.mock_table,PROD)",
                     "type": "VIEW"
                 }
             ],
@@ -1148,22 +1148,22 @@
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema1.mock_table,PROD),MOCK_COLUMN1)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema2.mock_table,PROD),MOCK_COLUMN1)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema1.mock_view,PROD),MOCK_COLUMN1)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema2.mock_view,PROD),MOCK_COLUMN1)"
                     ],
                     "confidenceScore": 1.0
                 },
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema1.mock_table,PROD),MOCK_COLUMN2)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema2.mock_table,PROD),MOCK_COLUMN2)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema1.mock_view,PROD),MOCK_COLUMN2)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:oracle,oradoc.schema2.mock_view,PROD),MOCK_COLUMN2)"
                     ],
                     "confidenceScore": 1.0
                 }
@@ -1207,213 +1207,5 @@
         "runId": "oracle-2022_02_03-07_00_00",
         "lastRunId": "no-run-id-provided"
     }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,OraDoc.schema1.test1,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                },
-                {
-                    "id": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
-                    "urn": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,OraDoc.schema1.test2,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                },
-                {
-                    "id": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
-                    "urn": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,OraDoc.schema1.view1,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                },
-                {
-                    "id": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
-                    "urn": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,OraDoc.schema2.test3,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                },
-                {
-                    "id": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
-                    "urn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,OraDoc.schema2.test4,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                },
-                {
-                    "id": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
-                    "urn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,OraDoc.schema2.view1,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                },
-                {
-                    "id": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
-                    "urn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_out_database.json b/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_out_database.json
index 008cd405186c39..9df23078be18d4 100644
--- a/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_out_database.json
+++ b/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_out_database.json
@@ -1,7 +1,7 @@
 [
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
+    "entityUrn": "urn:li:container:0e497517e191d344b0c403231bc708d0",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -9,9 +9,9 @@
             "customProperties": {
                 "platform": "oracle",
                 "env": "PROD",
-                "database": "oradoc"
+                "database": "OraDoc"
             },
-            "name": "oradoc"
+            "name": "OraDoc"
         }
     },
     "systemMetadata": {
@@ -22,7 +22,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
+    "entityUrn": "urn:li:container:0e497517e191d344b0c403231bc708d0",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -38,7 +38,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
+    "entityUrn": "urn:li:container:0e497517e191d344b0c403231bc708d0",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -54,7 +54,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
+    "entityUrn": "urn:li:container:0e497517e191d344b0c403231bc708d0",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -72,7 +72,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
+    "entityUrn": "urn:li:container:0e497517e191d344b0c403231bc708d0",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
@@ -88,7 +88,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
+    "entityUrn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -96,7 +96,7 @@
             "customProperties": {
                 "platform": "oracle",
                 "env": "PROD",
-                "database": "oradoc",
+                "database": "OraDoc",
                 "schema": "schema1"
             },
             "name": "schema1"
@@ -110,7 +110,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
+    "entityUrn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -126,7 +126,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
+    "entityUrn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -142,7 +142,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
+    "entityUrn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -160,12 +160,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
+    "entityUrn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+            "container": "urn:li:container:0e497517e191d344b0c403231bc708d0"
         }
     },
     "systemMetadata": {
@@ -176,15 +176,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
+    "entityUrn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 }
             ]
         }
@@ -202,7 +202,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
+            "container": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad"
         }
     },
     "systemMetadata": {
@@ -258,7 +258,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "NUMBER(asdecimal=False)",
+                                "nativeDataType": "NUMBER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             }
@@ -301,12 +301,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 },
                 {
-                    "id": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
-                    "urn": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
+                    "id": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
+                    "urn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad"
                 }
             ]
         }
@@ -324,7 +324,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
+            "container": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad"
         }
     },
     "systemMetadata": {
@@ -380,7 +380,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "NUMBER(asdecimal=False)",
+                                "nativeDataType": "NUMBER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             }
@@ -423,12 +423,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 },
                 {
-                    "id": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
-                    "urn": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
+                    "id": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
+                    "urn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad"
                 }
             ]
         }
@@ -446,7 +446,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
+            "container": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad"
         }
     },
     "systemMetadata": {
@@ -505,7 +505,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "NUMBER(asdecimal=False)",
+                                "nativeDataType": "NUMBER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -566,12 +566,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 },
                 {
-                    "id": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
-                    "urn": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
+                    "id": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad",
+                    "urn": "urn:li:container:937a38ee28b69ecae38665c5e842d0ad"
                 }
             ]
         }
@@ -584,7 +584,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
+    "entityUrn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -592,7 +592,7 @@
             "customProperties": {
                 "platform": "oracle",
                 "env": "PROD",
-                "database": "oradoc",
+                "database": "OraDoc",
                 "schema": "schema2"
             },
             "name": "schema2"
@@ -606,7 +606,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
+    "entityUrn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -622,7 +622,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
+    "entityUrn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -638,7 +638,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
+    "entityUrn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -656,12 +656,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
+    "entityUrn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+            "container": "urn:li:container:0e497517e191d344b0c403231bc708d0"
         }
     },
     "systemMetadata": {
@@ -672,15 +672,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
+    "entityUrn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 }
             ]
         }
@@ -698,7 +698,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
+            "container": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f"
         }
     },
     "systemMetadata": {
@@ -754,7 +754,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "NUMBER(asdecimal=False)",
+                                "nativeDataType": "NUMBER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             }
@@ -797,12 +797,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 },
                 {
-                    "id": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
-                    "urn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
+                    "id": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
+                    "urn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f"
                 }
             ]
         }
@@ -820,7 +820,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
+            "container": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f"
         }
     },
     "systemMetadata": {
@@ -876,7 +876,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "NUMBER(asdecimal=False)",
+                                "nativeDataType": "NUMBER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             }
@@ -919,12 +919,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 },
                 {
-                    "id": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
-                    "urn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
+                    "id": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
+                    "urn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f"
                 }
             ]
         }
@@ -942,7 +942,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
+            "container": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f"
         }
     },
     "systemMetadata": {
@@ -1001,7 +1001,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "NUMBER(asdecimal=False)",
+                                "nativeDataType": "NUMBER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1062,220 +1062,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
+                    "id": "urn:li:container:0e497517e191d344b0c403231bc708d0",
+                    "urn": "urn:li:container:0e497517e191d344b0c403231bc708d0"
                 },
                 {
-                    "id": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
-                    "urn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,schema1.test1,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                },
-                {
-                    "id": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
-                    "urn": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,schema1.test2,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                },
-                {
-                    "id": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
-                    "urn": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,schema1.view1,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                },
-                {
-                    "id": "urn:li:container:c093e810646c7ebc493237bb24a3538f",
-                    "urn": "urn:li:container:c093e810646c7ebc493237bb24a3538f"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,schema2.test3,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                },
-                {
-                    "id": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
-                    "urn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,schema2.test4,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                },
-                {
-                    "id": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
-                    "urn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "oracle-2022_02_03-07_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:oracle,schema2.view1,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:8c867b02fcc2615b19cd02b15b023287",
-                    "urn": "urn:li:container:8c867b02fcc2615b19cd02b15b023287"
-                },
-                {
-                    "id": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825",
-                    "urn": "urn:li:container:ab1a240f35ae787df0eff0e6726a9825"
+                    "id": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f",
+                    "urn": "urn:li:container:1965527855ae77f259a8ddea2b8eed2f"
                 }
             ]
         }
diff --git a/metadata-ingestion/tests/integration/oracle/test_oracle.py b/metadata-ingestion/tests/integration/oracle/test_oracle.py
index 6c9aba8ec5620e..4541bb8ac65bff 100644
--- a/metadata-ingestion/tests/integration/oracle/test_oracle.py
+++ b/metadata-ingestion/tests/integration/oracle/test_oracle.py
@@ -24,6 +24,7 @@ def apply_mock_data(self, mock_create_engine, mock_inspect, mock_event):
         inspector_magic_mock.dialect.server_version_info = (
             self.get_server_version_info()
         )
+        inspector_magic_mock.dialect.type_compiler.process = lambda x: "NUMBER"
 
         mock_inspect.return_value = inspector_magic_mock
         mock_create_engine.connect.return_value = connection_magic_mock
diff --git a/metadata-ingestion/tests/integration/postgres/postgres_all_db_mces_with_db_golden.json b/metadata-ingestion/tests/integration/postgres/postgres_all_db_mces_with_db_golden.json
index f35ff9fdb9d153..f42ff7c0df068c 100644
--- a/metadata-ingestion/tests/integration/postgres/postgres_all_db_mces_with_db_golden.json
+++ b/metadata-ingestion/tests/integration/postgres/postgres_all_db_mces_with_db_golden.json
@@ -452,7 +452,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=500)",
+                                "nativeDataType": "VARCHAR(500)",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -464,7 +464,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=200)",
+                                "nativeDataType": "VARCHAR(200)",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -476,7 +476,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "BIGINT()",
+                                "nativeDataType": "BIGINT",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -488,7 +488,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "TEXT()",
+                                "nativeDataType": "TEXT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -500,7 +500,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "TEXT()",
+                                "nativeDataType": "TEXT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -512,7 +512,7 @@
                                         "com.linkedin.pegasus2avro.schema.TimeType": {}
                                     }
                                 },
-                                "nativeDataType": "TIMESTAMP()",
+                                "nativeDataType": "TIMESTAMP WITHOUT TIME ZONE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -524,7 +524,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255)",
+                                "nativeDataType": "VARCHAR(255)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -536,7 +536,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255)",
+                                "nativeDataType": "VARCHAR(255)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -548,7 +548,7 @@
                                         "com.linkedin.pegasus2avro.schema.RecordType": {}
                                     }
                                 },
-                                "nativeDataType": "JSON(astext_type=Text())",
+                                "nativeDataType": "JSON",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -671,7 +671,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=500)",
+                                "nativeDataType": "VARCHAR(500)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -683,7 +683,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=200)",
+                                "nativeDataType": "VARCHAR(200)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
diff --git a/metadata-ingestion/tests/integration/postgres/postgres_mces_with_db_golden.json b/metadata-ingestion/tests/integration/postgres/postgres_mces_with_db_golden.json
index f47789fc470cd8..f107fb1006bf6e 100644
--- a/metadata-ingestion/tests/integration/postgres/postgres_mces_with_db_golden.json
+++ b/metadata-ingestion/tests/integration/postgres/postgres_mces_with_db_golden.json
@@ -256,7 +256,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=500)",
+                                "nativeDataType": "VARCHAR(500)",
                                 "recursive": false,
                                 "glossaryTerms": {
                                     "terms": [
@@ -279,7 +279,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=200)",
+                                "nativeDataType": "VARCHAR(200)",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -291,7 +291,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "BIGINT()",
+                                "nativeDataType": "BIGINT",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -303,7 +303,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "TEXT()",
+                                "nativeDataType": "TEXT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -315,7 +315,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "TEXT()",
+                                "nativeDataType": "TEXT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -327,7 +327,7 @@
                                         "com.linkedin.pegasus2avro.schema.TimeType": {}
                                     }
                                 },
-                                "nativeDataType": "TIMESTAMP()",
+                                "nativeDataType": "TIMESTAMP WITHOUT TIME ZONE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -339,7 +339,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255)",
+                                "nativeDataType": "VARCHAR(255)",
                                 "recursive": false,
                                 "glossaryTerms": {
                                     "terms": [
@@ -362,7 +362,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255)",
+                                "nativeDataType": "VARCHAR(255)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -374,7 +374,7 @@
                                         "com.linkedin.pegasus2avro.schema.RecordType": {}
                                     }
                                 },
-                                "nativeDataType": "JSON(astext_type=Text())",
+                                "nativeDataType": "JSON",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -497,7 +497,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=500)",
+                                "nativeDataType": "VARCHAR(500)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -509,7 +509,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=200)",
+                                "nativeDataType": "VARCHAR(200)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_admin_access_not_allowed.json b/metadata-ingestion/tests/integration/powerbi/golden_test_admin_access_not_allowed.json
index 8ec431b6fe9f1b..049008bddc58ed 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_admin_access_not_allowed.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_admin_access_not_allowed.json
@@ -312,6 +312,45 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C10-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Description of test dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+                "value": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+                "value": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_admin_only.json b/metadata-ingestion/tests/integration/powerbi/golden_test_admin_only.json
index 29e9ccebf067ec..fa4bcb8abaa94d 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_admin_only.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_admin_only.json
@@ -1226,6 +1226,40 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C10-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+                "value": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+                "value": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
@@ -1951,6 +1985,50 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(powerbi,reports.5b218778-e7a5-4d73-8187-f10824047715)",
+    "changeType": "PATCH",
+    "aspectName": "dashboardInfo",
+    "aspect": {
+        "json": [
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://app.powerbi.com/groups/f089354e-8366-4e18-aea3-4cb4a3a50b48/reports/5b218778-e7a5-4d73-8187-f10824047715"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Acryl sales marketing report"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "SalesMarketing"
+            }
+        ]
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dashboard",
     "entityUrn": "urn:li:dashboard:(powerbi,reports.5b218778-e7a5-4d73-8187-f10824047715)",
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_cll.json b/metadata-ingestion/tests/integration/powerbi/golden_test_cll.json
index 937cad0b9ec17e..60b36897ed2e42 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_cll.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_cll.json
@@ -1276,6 +1276,45 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C10-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Description of test dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+                "value": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+                "value": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_container.json b/metadata-ingestion/tests/integration/powerbi/golden_test_container.json
index 501ec284097b39..b43e4a6c2c1c2d 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_container.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_container.json
@@ -1721,6 +1721,45 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C10-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Description of test dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+                "value": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+                "value": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
@@ -2903,6 +2942,60 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(powerbi,reports.5b218778-e7a5-4d73-8187-f10824047715)",
+    "changeType": "PATCH",
+    "aspectName": "dashboardInfo",
+    "aspect": {
+        "json": [
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "SalesMarketing"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Acryl sales marketing report"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,pages.5b218778-e7a5-4d73-8187-f10824047715.ReportSection)",
+                "value": "urn:li:chart:(powerbi,pages.5b218778-e7a5-4d73-8187-f10824047715.ReportSection)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,pages.5b218778-e7a5-4d73-8187-f10824047715.ReportSection1)",
+                "value": "urn:li:chart:(powerbi,pages.5b218778-e7a5-4d73-8187-f10824047715.ReportSection1)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://app.powerbi.com/groups/f089354e-8366-4e18-aea3-4cb4a3a50b48/reports/5b218778-e7a5-4d73-8187-f10824047715"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
+            }
+        ]
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:33c7cab6ea0e58930cd6f943d0a4111e",
@@ -3065,6 +3158,30 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C22-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard2"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_disabled_ownership.json b/metadata-ingestion/tests/integration/powerbi/golden_test_disabled_ownership.json
index 74779ac7a0577e..c5414444cc35b8 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_disabled_ownership.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_disabled_ownership.json
@@ -986,6 +986,45 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C10-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Description of test dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+                "value": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+                "value": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_endorsement.json b/metadata-ingestion/tests/integration/powerbi/golden_test_endorsement.json
index 442dfd5c8c0825..e1ddbfb901badd 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_endorsement.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_endorsement.json
@@ -1158,6 +1158,45 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C10-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Description of test dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+                "value": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+                "value": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_ingest.json b/metadata-ingestion/tests/integration/powerbi/golden_test_ingest.json
index 2c4ff6ee851f4a..6f899a7fa11b72 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_ingest.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_ingest.json
@@ -1018,6 +1018,45 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C10-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Description of test dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+                "value": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+                "value": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_ingest_patch_disabled.json b/metadata-ingestion/tests/integration/powerbi/golden_test_ingest_patch_disabled.json
new file mode 100644
index 00000000000000..efbd9abfdb9118
--- /dev/null
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_ingest_patch_disabled.json
@@ -0,0 +1,1153 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.public_issue_history,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "dummy",
+            "viewLanguage": "m_query"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.public_issue_history,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445"
+            },
+            "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+            "name": "public issue_history",
+            "description": "Library dataset description",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.public_issue_history,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.public_issue_history,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "PowerBI Dataset Table",
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.SNOWFLAKE_TESTTABLE,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "let\n    Source = Snowflake.Databases(\"hp123rt5.ap-southeast-2.fakecomputing.com\",\"PBI_TEST_WAREHOUSE_PROD\",[Role=\"PBI_TEST_MEMBER\"]),\n    PBI_TEST_Database = Source{[Name=\"PBI_TEST\",Kind=\"Database\"]}[Data],\n    TEST_Schema = PBI_TEST_Database{[Name=\"TEST\",Kind=\"Schema\"]}[Data],\n    TESTTABLE_Table = TEST_Schema{[Name=\"TESTTABLE\",Kind=\"Table\"]}[Data]\nin\n    TESTTABLE_Table",
+            "viewLanguage": "m_query"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.SNOWFLAKE_TESTTABLE,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445"
+            },
+            "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+            "name": "SNOWFLAKE_TESTTABLE",
+            "description": "Library dataset description",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.SNOWFLAKE_TESTTABLE,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.SNOWFLAKE_TESTTABLE,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "PowerBI Dataset Table",
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "let\n    Source = Value.NativeQuery(Snowflake.Databases(\"bu20658.ap-southeast-2.snowflakecomputing.com\",\"operations_analytics_warehouse_prod\",[Role=\"OPERATIONS_ANALYTICS_MEMBER\"]){[Name=\"OPERATIONS_ANALYTICS\"]}[Data], \"SELECT#(lf)concat((UPPER(REPLACE(SELLER,'-',''))), MONTHID) as AGENT_KEY,#(lf)concat((UPPER(REPLACE(CLIENT_DIRECTOR,'-',''))), MONTHID) as CD_AGENT_KEY,#(lf) *#(lf)FROM#(lf)OPERATIONS_ANALYTICS.TRANSFORMED_PROD.V_APS_SME_UNITS_V4\", null, [EnableFolding=true]),\n    #\"Added Conditional Column\" = Table.AddColumn(Source, \"SME Units ENT\", each if [DEAL_TYPE] = \"SME Unit\" then [UNIT] else 0),\n    #\"Added Conditional Column1\" = Table.AddColumn(#\"Added Conditional Column\", \"Banklink Units\", each if [DEAL_TYPE] = \"Banklink\" then [UNIT] else 0),\n    #\"Removed Columns\" = Table.RemoveColumns(#\"Added Conditional Column1\",{\"Banklink Units\"}),\n    #\"Added Custom\" = Table.AddColumn(#\"Removed Columns\", \"Banklink Units\", each if [DEAL_TYPE] = \"Banklink\" and [SALES_TYPE] = \"3 - Upsell\"\nthen [UNIT]\n\nelse if [SALES_TYPE] = \"Adjusted BL Migration\"\nthen [UNIT]\n\nelse 0),\n    #\"Added Custom1\" = Table.AddColumn(#\"Added Custom\", \"SME Units in $ (*$361)\", each if [DEAL_TYPE] = \"SME Unit\" \nand [SALES_TYPE] <> \"4 - Renewal\"\n    then [UNIT] * 361\nelse 0),\n    #\"Added Custom2\" = Table.AddColumn(#\"Added Custom1\", \"Banklink in $ (*$148)\", each [Banklink Units] * 148)\nin\n    #\"Added Custom2\"",
+            "viewLanguage": "m_query"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445"
+            },
+            "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+            "name": "snowflake native-query",
+            "description": "Library dataset description",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "PowerBI Dataset Table",
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.big-query-with-parameter,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "let\n Source = GoogleBigQuery.Database([BillingProject = #\"Parameter - Source\"]),\n#\"gcp-project\" = Source{[Name=#\"Parameter - Source\"]}[Data],\nuniversal_Schema = #\"gcp-project\"{[Name=\"universal\",Kind=\"Schema\"]}[Data],\nD_WH_DATE_Table = universal_Schema{[Name=\"D_WH_DATE\",Kind=\"Table\"]}[Data],\n#\"Filtered Rows\" = Table.SelectRows(D_WH_DATE_Table, each [D_DATE] > #datetime(2019, 9, 10, 0, 0, 0)),\n#\"Filtered Rows1\" = Table.SelectRows(#\"Filtered Rows\", each DateTime.IsInPreviousNHours([D_DATE], 87600))\n in \n#\"Filtered Rows1\"",
+            "viewLanguage": "m_query"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.big-query-with-parameter,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445"
+            },
+            "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+            "name": "big-query-with-parameter",
+            "description": "Library dataset description",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.big-query-with-parameter,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.big-query-with-parameter,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "PowerBI Dataset Table",
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query-with-join,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "let\n    Source = Value.NativeQuery(Snowflake.Databases(\"xaa48144.snowflakecomputing.com\",\"GSL_TEST_WH\",[Role=\"ACCOUNTADMIN\"]){[Name=\"GSL_TEST_DB\"]}[Data], \"select A.name from GSL_TEST_DB.PUBLIC.SALES_ANALYST as A inner join GSL_TEST_DB.PUBLIC.SALES_FORECAST as B on A.name = B.name where startswith(A.name, 'mo')\", null, [EnableFolding=true])\nin\n    Source",
+            "viewLanguage": "m_query"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query-with-join,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445"
+            },
+            "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+            "name": "snowflake native-query-with-join",
+            "description": "Library dataset description",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query-with-join,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query-with-join,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "PowerBI Dataset Table",
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.job-history,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "let\n    Source = Oracle.Database(\"localhost:1521/salesdb.domain.com\", [HierarchicalNavigation=true]), HR = Source{[Schema=\"HR\"]}[Data], EMPLOYEES1 = HR{[Name=\"EMPLOYEES\"]}[Data] \n in EMPLOYEES1",
+            "viewLanguage": "m_query"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.job-history,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445"
+            },
+            "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+            "name": "job-history",
+            "description": "Library dataset description",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.job-history,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.job-history,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "PowerBI Dataset Table",
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.postgres_test_table,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "let\n    Source = PostgreSQL.Database(\"localhost\"  ,   \"mics\"      ),\n  public_order_date =    Source{[Schema=\"public\",Item=\"order_date\"]}[Data] \n in \n public_order_date",
+            "viewLanguage": "m_query"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.postgres_test_table,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445"
+            },
+            "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+            "name": "postgres_test_table",
+            "description": "Library dataset description",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.postgres_test_table,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.postgres_test_table,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "PowerBI Dataset Table",
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.dbo_book_issue,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "let\n    Source = Sql.Database(\"localhost\", \"library\"),\n dbo_book_issue = Source{[Schema=\"dbo\",Item=\"book_issue\"]}[Data]\n in dbo_book_issue",
+            "viewLanguage": "m_query"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.dbo_book_issue,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "datasetId": "ba0130a1-5b03-40de-9535-b34e778ea6ed"
+            },
+            "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/ba0130a1-5b03-40de-9535-b34e778ea6ed/details",
+            "name": "dbo_book_issue",
+            "description": "hr pbi test description",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.dbo_book_issue,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.dbo_book_issue,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "PowerBI Dataset Table",
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.ms_sql_native_table,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "let\n    Source = Sql.Database(\"AUPRDWHDB\", \"COMMOPSDB\", [Query=\"select *,#(lf)concat((UPPER(REPLACE(CLIENT_DIRECTOR,'-',''))), MONTH_WID) as CD_AGENT_KEY,#(lf)concat((UPPER(REPLACE(CLIENT_MANAGER_CLOSING_MONTH,'-',''))), MONTH_WID) as AGENT_KEY#(lf)#(lf)from V_PS_CD_RETENTION\", CommandTimeout=#duration(0, 1, 30, 0)]),\n    #\"Changed Type\" = Table.TransformColumnTypes(Source,{{\"mth_date\", type date}}),\n    #\"Added Custom\" = Table.AddColumn(#\"Changed Type\", \"Month\", each Date.Month([mth_date])),\n    #\"Added Custom1\" = Table.AddColumn(#\"Added Custom\", \"TPV Opening\", each if [Month] = 1 then [TPV_AMV_OPENING]\nelse if [Month] = 2 then 0\nelse if [Month] = 3 then 0\nelse if [Month] = 4 then [TPV_AMV_OPENING]\nelse if [Month] = 5 then 0\nelse if [Month] = 6 then 0\nelse if [Month] = 7 then [TPV_AMV_OPENING]\nelse if [Month] = 8 then 0\nelse if [Month] = 9 then 0\nelse if [Month] = 10 then [TPV_AMV_OPENING]\nelse if [Month] = 11 then 0\nelse if [Month] = 12 then 0\n\nelse 0)\nin\n    #\"Added Custom1\"",
+            "viewLanguage": "m_query"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.ms_sql_native_table,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "datasetId": "ba0130a1-5b03-40de-9535-b34e778ea6ed"
+            },
+            "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/ba0130a1-5b03-40de-9535-b34e778ea6ed/details",
+            "name": "ms_sql_native_table",
+            "description": "hr pbi test description",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.ms_sql_native_table,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.ms_sql_native_table,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "PowerBI Dataset Table",
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "corpuser",
+    "entityUrn": "urn:li:corpuser:users.User1@foo.com",
+    "changeType": "UPSERT",
+    "aspectName": "corpUserKey",
+    "aspect": {
+        "json": {
+            "username": "User1@foo.com"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "corpuser",
+    "entityUrn": "urn:li:corpuser:users.User2@foo.com",
+    "changeType": "UPSERT",
+    "aspectName": "corpUserKey",
+    "aspect": {
+        "json": {
+            "username": "User2@foo.com"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+    "changeType": "UPSERT",
+    "aspectName": "chartInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "createdFrom": "Dataset",
+                "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
+                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details"
+            },
+            "title": "test_tile",
+            "description": "test_tile",
+            "lastModified": {
+                "created": {
+                    "time": 0,
+                    "actor": "urn:li:corpuser:unknown"
+                },
+                "lastModified": {
+                    "time": 0,
+                    "actor": "urn:li:corpuser:unknown"
+                }
+            },
+            "inputs": [
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.public_issue_history,DEV)"
+                },
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.SNOWFLAKE_TESTTABLE,DEV)"
+                },
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query,DEV)"
+                },
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.big-query-with-parameter,DEV)"
+                },
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query-with-join,DEV)"
+                },
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.job-history,DEV)"
+                },
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.postgres_test_table,DEV)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "PowerBI Tile"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+    "changeType": "UPSERT",
+    "aspectName": "chartKey",
+    "aspect": {
+        "json": {
+            "dashboardTool": "powerbi",
+            "chartId": "charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePaths",
+    "aspect": {
+        "json": {
+            "paths": [
+                "/powerbi/demo-workspace"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "demo-workspace"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+    "changeType": "UPSERT",
+    "aspectName": "chartInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "createdFrom": "Dataset",
+                "datasetId": "ba0130a1-5b03-40de-9535-b34e778ea6ed",
+                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/ba0130a1-5b03-40de-9535-b34e778ea6ed/details"
+            },
+            "title": "yearly_sales",
+            "description": "yearly_sales",
+            "lastModified": {
+                "created": {
+                    "time": 0,
+                    "actor": "urn:li:corpuser:unknown"
+                },
+                "lastModified": {
+                    "time": 0,
+                    "actor": "urn:li:corpuser:unknown"
+                }
+            },
+            "inputs": [
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.dbo_book_issue,DEV)"
+                },
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.ms_sql_native_table,DEV)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "PowerBI Tile"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+    "changeType": "UPSERT",
+    "aspectName": "chartKey",
+    "aspect": {
+        "json": {
+            "dashboardTool": "powerbi",
+            "chartId": "charts.23212598-23b5-4980-87cc-5fc0ecd84385"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePaths",
+    "aspect": {
+        "json": {
+            "paths": [
+                "/powerbi/demo-workspace"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "demo-workspace"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePaths",
+    "aspect": {
+        "json": {
+            "paths": [
+                "/powerbi/demo-workspace"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
+    "changeType": "UPSERT",
+    "aspectName": "dashboardInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "chartCount": "2",
+                "workspaceName": "demo-workspace",
+                "workspaceId": "64ED5CAD-7C10-4684-8180-826122881108"
+            },
+            "title": "test_dashboard",
+            "description": "Description of test dashboard",
+            "charts": [
+                "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+                "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)"
+            ],
+            "datasets": [],
+            "lastModified": {
+                "created": {
+                    "time": 0,
+                    "actor": "urn:li:corpuser:unknown"
+                },
+                "lastModified": {
+                    "time": 0,
+                    "actor": "urn:li:corpuser:unknown"
+                }
+            },
+            "dashboardUrl": "https://localhost/dashboards/web/1"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
+    "changeType": "UPSERT",
+    "aspectName": "dashboardKey",
+    "aspect": {
+        "json": {
+            "dashboardTool": "powerbi",
+            "dashboardId": "powerbi.linkedin.com/dashboards/7D668CAD-7FFC-4505-9215-655BCA5BEBAE"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
+    "changeType": "UPSERT",
+    "aspectName": "ownership",
+    "aspect": {
+        "json": {
+            "owners": [
+                {
+                    "owner": "urn:li:corpuser:users.User1@foo.com",
+                    "type": "NONE"
+                },
+                {
+                    "owner": "urn:li:corpuser:users.User2@foo.com",
+                    "type": "NONE"
+                }
+            ],
+            "ownerTypes": {},
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "demo-workspace"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "corpuser",
+    "entityUrn": "urn:li:corpuser:users.User1@foo.com",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "corpuser",
+    "entityUrn": "urn:li:corpuser:users.User2@foo.com",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_lineage.json b/metadata-ingestion/tests/integration/powerbi/golden_test_lineage.json
index 0aea8514559ecb..9a09cb4fec64d0 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_lineage.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_lineage.json
@@ -1201,6 +1201,45 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C10-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Description of test dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+                "value": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+                "value": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_lower_case_urn_ingest.json b/metadata-ingestion/tests/integration/powerbi/golden_test_lower_case_urn_ingest.json
index 22a00236af8c61..a4eb670a4b7f94 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_lower_case_urn_ingest.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_lower_case_urn_ingest.json
@@ -1,7 +1,7 @@
 [
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.public_issue_history,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.public_issue_history,PROD)",
     "changeType": "UPSERT",
     "aspectName": "viewProperties",
     "aspect": {
@@ -17,9 +17,25 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "corpuser",
+    "entityUrn": "urn:li:corpuser:users.User1@foo.com",
+    "changeType": "UPSERT",
+    "aspectName": "corpUserKey",
+    "aspect": {
+        "json": {
+            "username": "User1@foo.com"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.public_issue_history,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.public_issue_history,PROD)",
     "changeType": "UPSERT",
     "aspectName": "datasetProperties",
     "aspect": {
@@ -40,13 +56,13 @@
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.public_issue_history,DEV)",
+    "entityType": "corpuser",
+    "entityUrn": "urn:li:corpuser:users.User2@foo.com",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "corpUserKey",
     "aspect": {
         "json": {
-            "removed": false
+            "username": "User2@foo.com"
         }
     },
     "systemMetadata": {
@@ -57,15 +73,14 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.public_issue_history,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.snowflake_testtable,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "viewProperties",
     "aspect": {
         "json": {
-            "typeNames": [
-                "PowerBI Dataset Table",
-                "View"
-            ]
+            "materialized": false,
+            "viewLogic": "let\n    Source = Snowflake.Databases(\"hp123rt5.ap-southeast-2.fakecomputing.com\",\"PBI_TEST_WAREHOUSE_PROD\",[Role=\"PBI_TEST_MEMBER\"]),\n    PBI_TEST_Database = Source{[Name=\"PBI_TEST\",Kind=\"Database\"]}[Data],\n    TEST_Schema = PBI_TEST_Database{[Name=\"TEST\",Kind=\"Schema\"]}[Data],\n    TESTTABLE_Table = TEST_Schema{[Name=\"TESTTABLE\",Kind=\"Table\"]}[Data]\nin\n    TESTTABLE_Table",
+            "viewLanguage": "m_query"
         }
     },
     "systemMetadata": {
@@ -76,14 +91,12 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_testtable,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.public_issue_history,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "viewProperties",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "materialized": false,
-            "viewLogic": "let\n    Source = Snowflake.Databases(\"hp123rt5.ap-southeast-2.fakecomputing.com\",\"PBI_TEST_WAREHOUSE_PROD\",[Role=\"PBI_TEST_MEMBER\"]),\n    PBI_TEST_Database = Source{[Name=\"PBI_TEST\",Kind=\"Database\"]}[Data],\n    TEST_Schema = PBI_TEST_Database{[Name=\"TEST\",Kind=\"Schema\"]}[Data],\n    TESTTABLE_Table = TEST_Schema{[Name=\"TESTTABLE\",Kind=\"Table\"]}[Data]\nin\n    TESTTABLE_Table",
-            "viewLanguage": "m_query"
+            "removed": false
         }
     },
     "systemMetadata": {
@@ -94,7 +107,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_testtable,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.snowflake_testtable,PROD)",
     "changeType": "UPSERT",
     "aspectName": "datasetProperties",
     "aspect": {
@@ -115,8 +128,8 @@
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_testtable,DEV)",
+    "entityType": "corpuser",
+    "entityUrn": "urn:li:corpuser:users.User1@foo.com",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -132,15 +145,12 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_testtable,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.snowflake_testtable,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "typeNames": [
-                "PowerBI Dataset Table",
-                "View"
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
@@ -151,14 +161,15 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.public_issue_history,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "viewProperties",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "materialized": false,
-            "viewLogic": "let\n    Source = Value.NativeQuery(Snowflake.Databases(\"bu20658.ap-southeast-2.snowflakecomputing.com\",\"operations_analytics_warehouse_prod\",[Role=\"OPERATIONS_ANALYTICS_MEMBER\"]){[Name=\"OPERATIONS_ANALYTICS\"]}[Data], \"SELECT#(lf)concat((UPPER(REPLACE(SELLER,'-',''))), MONTHID) as AGENT_KEY,#(lf)concat((UPPER(REPLACE(CLIENT_DIRECTOR,'-',''))), MONTHID) as CD_AGENT_KEY,#(lf) *#(lf)FROM#(lf)OPERATIONS_ANALYTICS.TRANSFORMED_PROD.V_APS_SME_UNITS_V4\", null, [EnableFolding=true]),\n    #\"Added Conditional Column\" = Table.AddColumn(Source, \"SME Units ENT\", each if [DEAL_TYPE] = \"SME Unit\" then [UNIT] else 0),\n    #\"Added Conditional Column1\" = Table.AddColumn(#\"Added Conditional Column\", \"Banklink Units\", each if [DEAL_TYPE] = \"Banklink\" then [UNIT] else 0),\n    #\"Removed Columns\" = Table.RemoveColumns(#\"Added Conditional Column1\",{\"Banklink Units\"}),\n    #\"Added Custom\" = Table.AddColumn(#\"Removed Columns\", \"Banklink Units\", each if [DEAL_TYPE] = \"Banklink\" and [SALES_TYPE] = \"3 - Upsell\"\nthen [UNIT]\n\nelse if [SALES_TYPE] = \"Adjusted BL Migration\"\nthen [UNIT]\n\nelse 0),\n    #\"Added Custom1\" = Table.AddColumn(#\"Added Custom\", \"SME Units in $ (*$361)\", each if [DEAL_TYPE] = \"SME Unit\" \nand [SALES_TYPE] <> \"4 - Renewal\"\n    then [UNIT] * 361\nelse 0),\n    #\"Added Custom2\" = Table.AddColumn(#\"Added Custom1\", \"Banklink in $ (*$148)\", each [Banklink Units] * 148)\nin\n    #\"Added Custom2\"",
-            "viewLanguage": "m_query"
+            "typeNames": [
+                "PowerBI Dataset Table",
+                "View"
+            ]
         }
     },
     "systemMetadata": {
@@ -169,18 +180,15 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.snowflake_testtable,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "datasetProperties",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "customProperties": {
-                "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445"
-            },
-            "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
-            "name": "snowflake native-query",
-            "description": "Library dataset description",
-            "tags": []
+            "typeNames": [
+                "PowerBI Dataset Table",
+                "View"
+            ]
         }
     },
     "systemMetadata": {
@@ -190,8 +198,8 @@
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query,DEV)",
+    "entityType": "corpuser",
+    "entityUrn": "urn:li:corpuser:users.User2@foo.com",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -207,15 +215,14 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.big-query-with-parameter,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "viewProperties",
     "aspect": {
         "json": {
-            "typeNames": [
-                "PowerBI Dataset Table",
-                "View"
-            ]
+            "materialized": false,
+            "viewLogic": "let\n Source = GoogleBigQuery.Database([BillingProject = #\"Parameter - Source\"]),\n#\"gcp-project\" = Source{[Name=#\"Parameter - Source\"]}[Data],\nuniversal_Schema = #\"gcp-project\"{[Name=\"universal\",Kind=\"Schema\"]}[Data],\nD_WH_DATE_Table = universal_Schema{[Name=\"D_WH_DATE\",Kind=\"Table\"]}[Data],\n#\"Filtered Rows\" = Table.SelectRows(D_WH_DATE_Table, each [D_DATE] > #datetime(2019, 9, 10, 0, 0, 0)),\n#\"Filtered Rows1\" = Table.SelectRows(#\"Filtered Rows\", each DateTime.IsInPreviousNHours([D_DATE], 87600))\n in \n#\"Filtered Rows1\"",
+            "viewLanguage": "m_query"
         }
     },
     "systemMetadata": {
@@ -226,13 +233,13 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.big-query-with-parameter,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.snowflake_native-query,PROD)",
     "changeType": "UPSERT",
     "aspectName": "viewProperties",
     "aspect": {
         "json": {
             "materialized": false,
-            "viewLogic": "let\n Source = GoogleBigQuery.Database([BillingProject = #\"Parameter - Source\"]),\n#\"gcp-project\" = Source{[Name=#\"Parameter - Source\"]}[Data],\nuniversal_Schema = #\"gcp-project\"{[Name=\"universal\",Kind=\"Schema\"]}[Data],\nD_WH_DATE_Table = universal_Schema{[Name=\"D_WH_DATE\",Kind=\"Table\"]}[Data],\n#\"Filtered Rows\" = Table.SelectRows(D_WH_DATE_Table, each [D_DATE] > #datetime(2019, 9, 10, 0, 0, 0)),\n#\"Filtered Rows1\" = Table.SelectRows(#\"Filtered Rows\", each DateTime.IsInPreviousNHours([D_DATE], 87600))\n in \n#\"Filtered Rows1\"",
+            "viewLogic": "let\n    Source = Value.NativeQuery(Snowflake.Databases(\"bu20658.ap-southeast-2.snowflakecomputing.com\",\"operations_analytics_warehouse_prod\",[Role=\"OPERATIONS_ANALYTICS_MEMBER\"]){[Name=\"OPERATIONS_ANALYTICS\"]}[Data], \"SELECT#(lf)concat((UPPER(REPLACE(SELLER,'-',''))), MONTHID) as AGENT_KEY,#(lf)concat((UPPER(REPLACE(CLIENT_DIRECTOR,'-',''))), MONTHID) as CD_AGENT_KEY,#(lf) *#(lf)FROM#(lf)OPERATIONS_ANALYTICS.TRANSFORMED_PROD.V_APS_SME_UNITS_V4\", null, [EnableFolding=true]),\n    #\"Added Conditional Column\" = Table.AddColumn(Source, \"SME Units ENT\", each if [DEAL_TYPE] = \"SME Unit\" then [UNIT] else 0),\n    #\"Added Conditional Column1\" = Table.AddColumn(#\"Added Conditional Column\", \"Banklink Units\", each if [DEAL_TYPE] = \"Banklink\" then [UNIT] else 0),\n    #\"Removed Columns\" = Table.RemoveColumns(#\"Added Conditional Column1\",{\"Banklink Units\"}),\n    #\"Added Custom\" = Table.AddColumn(#\"Removed Columns\", \"Banklink Units\", each if [DEAL_TYPE] = \"Banklink\" and [SALES_TYPE] = \"3 - Upsell\"\nthen [UNIT]\n\nelse if [SALES_TYPE] = \"Adjusted BL Migration\"\nthen [UNIT]\n\nelse 0),\n    #\"Added Custom1\" = Table.AddColumn(#\"Added Custom\", \"SME Units in $ (*$361)\", each if [DEAL_TYPE] = \"SME Unit\" \nand [SALES_TYPE] <> \"4 - Renewal\"\n    then [UNIT] * 361\nelse 0),\n    #\"Added Custom2\" = Table.AddColumn(#\"Added Custom1\", \"Banklink in $ (*$148)\", each [Banklink Units] * 148)\nin\n    #\"Added Custom2\"",
             "viewLanguage": "m_query"
         }
     },
@@ -244,7 +251,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.big-query-with-parameter,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.big-query-with-parameter,PROD)",
     "changeType": "UPSERT",
     "aspectName": "datasetProperties",
     "aspect": {
@@ -266,23 +273,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.big-query-with-parameter,DEV)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "powerbi-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.big-query-with-parameter,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.job-history,PROD)",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -301,14 +292,12 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query-with-join,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.big-query-with-parameter,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "viewProperties",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "materialized": false,
-            "viewLogic": "let\n    Source = Value.NativeQuery(Snowflake.Databases(\"xaa48144.snowflakecomputing.com\",\"GSL_TEST_WH\",[Role=\"ACCOUNTADMIN\"]){[Name=\"GSL_TEST_DB\"]}[Data], \"select A.name from GSL_TEST_DB.PUBLIC.SALES_ANALYST as A inner join GSL_TEST_DB.PUBLIC.SALES_FORECAST as B on A.name = B.name where startswith(A.name, 'mo')\", null, [EnableFolding=true])\nin\n    Source",
-            "viewLanguage": "m_query"
+            "removed": false
         }
     },
     "systemMetadata": {
@@ -319,7 +308,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query-with-join,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.snowflake_native-query,PROD)",
     "changeType": "UPSERT",
     "aspectName": "datasetProperties",
     "aspect": {
@@ -328,7 +317,7 @@
                 "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445"
             },
             "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
-            "name": "snowflake native-query-with-join",
+            "name": "snowflake native-query",
             "description": "Library dataset description",
             "tags": []
         }
@@ -341,12 +330,15 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query-with-join,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.big-query-with-parameter,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "removed": false
+            "typeNames": [
+                "PowerBI Dataset Table",
+                "View"
+            ]
         }
     },
     "systemMetadata": {
@@ -357,15 +349,12 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query-with-join,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.job-history,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "typeNames": [
-                "PowerBI Dataset Table",
-                "View"
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
@@ -376,14 +365,12 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.job-history,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.snowflake_native-query,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "viewProperties",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "materialized": false,
-            "viewLogic": "let\n    Source = Oracle.Database(\"localhost:1521/salesdb.domain.com\", [HierarchicalNavigation=true]), HR = Source{[Schema=\"HR\"]}[Data], EMPLOYEES1 = HR{[Name=\"EMPLOYEES\"]}[Data] \n in EMPLOYEES1",
-            "viewLanguage": "m_query"
+            "removed": false
         }
     },
     "systemMetadata": {
@@ -394,7 +381,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.job-history,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.job-history,PROD)",
     "changeType": "UPSERT",
     "aspectName": "datasetProperties",
     "aspect": {
@@ -416,12 +403,33 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.job-history,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.snowflake_native-query,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "removed": false
+            "typeNames": [
+                "PowerBI Dataset Table",
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.job-history,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "let\n    Source = Oracle.Database(\"localhost:1521/salesdb.domain.com\", [HierarchicalNavigation=true]), HR = Source{[Schema=\"HR\"]}[Data], EMPLOYEES1 = HR{[Name=\"EMPLOYEES\"]}[Data] \n in EMPLOYEES1",
+            "viewLanguage": "m_query"
         }
     },
     "systemMetadata": {
@@ -432,7 +440,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.job-history,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.snowflake_native-query-with-join,PROD)",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -451,14 +459,12 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.postgres_test_table,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.snowflake_native-query-with-join,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "viewProperties",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "materialized": false,
-            "viewLogic": "let\n    Source = PostgreSQL.Database(\"localhost\"  ,   \"mics\"      ),\n  public_order_date =    Source{[Schema=\"public\",Item=\"order_date\"]}[Data] \n in \n public_order_date",
-            "viewLanguage": "m_query"
+            "removed": false
         }
     },
     "systemMetadata": {
@@ -469,7 +475,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.postgres_test_table,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.snowflake_native-query-with-join,PROD)",
     "changeType": "UPSERT",
     "aspectName": "datasetProperties",
     "aspect": {
@@ -478,7 +484,7 @@
                 "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445"
             },
             "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
-            "name": "postgres_test_table",
+            "name": "snowflake native-query-with-join",
             "description": "Library dataset description",
             "tags": []
         }
@@ -491,12 +497,14 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.postgres_test_table,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.snowflake_native-query-with-join,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "viewProperties",
     "aspect": {
         "json": {
-            "removed": false
+            "materialized": false,
+            "viewLogic": "let\n    Source = Value.NativeQuery(Snowflake.Databases(\"xaa48144.snowflakecomputing.com\",\"GSL_TEST_WH\",[Role=\"ACCOUNTADMIN\"]){[Name=\"GSL_TEST_DB\"]}[Data], \"select A.name from GSL_TEST_DB.PUBLIC.SALES_ANALYST as A inner join GSL_TEST_DB.PUBLIC.SALES_FORECAST as B on A.name = B.name where startswith(A.name, 'mo')\", null, [EnableFolding=true])\nin\n    Source",
+            "viewLanguage": "m_query"
         }
     },
     "systemMetadata": {
@@ -507,15 +515,14 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.postgres_test_table,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.postgres_test_table,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "viewProperties",
     "aspect": {
         "json": {
-            "typeNames": [
-                "PowerBI Dataset Table",
-                "View"
-            ]
+            "materialized": false,
+            "viewLogic": "let\n    Source = PostgreSQL.Database(\"localhost\"  ,   \"mics\"      ),\n  public_order_date =    Source{[Schema=\"public\",Item=\"order_date\"]}[Data] \n in \n public_order_date",
+            "viewLanguage": "m_query"
         }
     },
     "systemMetadata": {
@@ -525,15 +532,52 @@
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.dbo_book_issue,DEV)",
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,myPlatformInstance.charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
     "changeType": "UPSERT",
-    "aspectName": "viewProperties",
+    "aspectName": "chartInfo",
     "aspect": {
         "json": {
-            "materialized": false,
-            "viewLogic": "let\n    Source = Sql.Database(\"localhost\", \"library\"),\n dbo_book_issue = Source{[Schema=\"dbo\",Item=\"book_issue\"]}[Data]\n in dbo_book_issue",
-            "viewLanguage": "m_query"
+            "customProperties": {
+                "createdFrom": "Dataset",
+                "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
+                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details"
+            },
+            "title": "test_tile",
+            "description": "test_tile",
+            "lastModified": {
+                "created": {
+                    "time": 0,
+                    "actor": "urn:li:corpuser:unknown"
+                },
+                "lastModified": {
+                    "time": 0,
+                    "actor": "urn:li:corpuser:unknown"
+                }
+            },
+            "inputs": [
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.public_issue_history,PROD)"
+                },
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.snowflake_testtable,PROD)"
+                },
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.snowflake_native-query,PROD)"
+                },
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.big-query-with-parameter,PROD)"
+                },
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.snowflake_native-query-with-join,PROD)"
+                },
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.job-history,PROD)"
+                },
+                {
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.postgres_test_table,PROD)"
+                }
+            ]
         }
     },
     "systemMetadata": {
@@ -544,17 +588,17 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.dbo_book_issue,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.postgres_test_table,PROD)",
     "changeType": "UPSERT",
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
             "customProperties": {
-                "datasetId": "ba0130a1-5b03-40de-9535-b34e778ea6ed"
+                "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445"
             },
-            "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/ba0130a1-5b03-40de-9535-b34e778ea6ed/details",
-            "name": "dbo_book_issue",
-            "description": "hr pbi test description",
+            "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+            "name": "postgres_test_table",
+            "description": "Library dataset description",
             "tags": []
         }
     },
@@ -565,13 +609,15 @@
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.dbo_book_issue,DEV)",
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,myPlatformInstance.charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "removed": false
+            "typeNames": [
+                "PowerBI Tile"
+            ]
         }
     },
     "systemMetadata": {
@@ -582,15 +628,12 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.dbo_book_issue,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.postgres_test_table,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "typeNames": [
-                "PowerBI Dataset Table",
-                "View"
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
@@ -600,15 +643,15 @@
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.ms_sql_native_table,DEV)",
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,myPlatformInstance.charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
     "changeType": "UPSERT",
-    "aspectName": "viewProperties",
+    "aspectName": "browsePaths",
     "aspect": {
         "json": {
-            "materialized": false,
-            "viewLogic": "let\n    Source = Sql.Database(\"AUPRDWHDB\", \"COMMOPSDB\", [Query=\"select *,#(lf)concat((UPPER(REPLACE(CLIENT_DIRECTOR,'-',''))), MONTH_WID) as CD_AGENT_KEY,#(lf)concat((UPPER(REPLACE(CLIENT_MANAGER_CLOSING_MONTH,'-',''))), MONTH_WID) as AGENT_KEY#(lf)#(lf)from V_PS_CD_RETENTION\", CommandTimeout=#duration(0, 1, 30, 0)]),\n    #\"Changed Type\" = Table.TransformColumnTypes(Source,{{\"mth_date\", type date}}),\n    #\"Added Custom\" = Table.AddColumn(#\"Changed Type\", \"Month\", each Date.Month([mth_date])),\n    #\"Added Custom1\" = Table.AddColumn(#\"Added Custom\", \"TPV Opening\", each if [Month] = 1 then [TPV_AMV_OPENING]\nelse if [Month] = 2 then 0\nelse if [Month] = 3 then 0\nelse if [Month] = 4 then [TPV_AMV_OPENING]\nelse if [Month] = 5 then 0\nelse if [Month] = 6 then 0\nelse if [Month] = 7 then [TPV_AMV_OPENING]\nelse if [Month] = 8 then 0\nelse if [Month] = 9 then 0\nelse if [Month] = 10 then [TPV_AMV_OPENING]\nelse if [Month] = 11 then 0\nelse if [Month] = 12 then 0\n\nelse 0)\nin\n    #\"Added Custom1\"",
-            "viewLanguage": "m_query"
+            "paths": [
+                "/powerbi/demo-workspace"
+            ]
         }
     },
     "systemMetadata": {
@@ -619,18 +662,15 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.ms_sql_native_table,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.library-dataset.postgres_test_table,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "datasetProperties",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "customProperties": {
-                "datasetId": "ba0130a1-5b03-40de-9535-b34e778ea6ed"
-            },
-            "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/ba0130a1-5b03-40de-9535-b34e778ea6ed/details",
-            "name": "ms_sql_native_table",
-            "description": "hr pbi test description",
-            "tags": []
+            "typeNames": [
+                "PowerBI Dataset Table",
+                "View"
+            ]
         }
     },
     "systemMetadata": {
@@ -640,8 +680,49 @@
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.ms_sql_native_table,DEV)",
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,myPlatformInstance.charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+    "changeType": "UPSERT",
+    "aspectName": "chartKey",
+    "aspect": {
+        "json": {
+            "dashboardTool": "powerbi",
+            "chartId": "myPlatformInstance.charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,myPlatformInstance.charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:powerbi,myPlatformInstance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:powerbi,myPlatformInstance)"
+                },
+                {
+                    "id": "demo-workspace"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,myPlatformInstance.charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -657,7 +738,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.ms_sql_native_table,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.hr_pbi_test.dbo_book_issue,PROD)",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -675,13 +756,13 @@
     }
 },
 {
-    "entityType": "corpuser",
-    "entityUrn": "urn:li:corpuser:users.User1@foo.com",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.hr_pbi_test.dbo_book_issue,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "corpUserKey",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "username": "User1@foo.com"
+            "removed": false
         }
     },
     "systemMetadata": {
@@ -691,13 +772,19 @@
     }
 },
 {
-    "entityType": "corpuser",
-    "entityUrn": "urn:li:corpuser:users.User2@foo.com",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.hr_pbi_test.dbo_book_issue,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "corpUserKey",
+    "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "username": "User2@foo.com"
+            "customProperties": {
+                "datasetId": "ba0130a1-5b03-40de-9535-b34e778ea6ed"
+            },
+            "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/ba0130a1-5b03-40de-9535-b34e778ea6ed/details",
+            "name": "dbo_book_issue",
+            "description": "hr pbi test description",
+            "tags": []
         }
     },
     "systemMetadata": {
@@ -707,51 +794,33 @@
     }
 },
 {
-    "entityType": "chart",
-    "entityUrn": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.hr_pbi_test.dbo_book_issue,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "chartInfo",
+    "aspectName": "viewProperties",
     "aspect": {
         "json": {
-            "customProperties": {
-                "createdFrom": "Dataset",
-                "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
-                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details"
-            },
-            "title": "test_tile",
-            "description": "test_tile",
-            "lastModified": {
-                "created": {
-                    "time": 0,
-                    "actor": "urn:li:corpuser:unknown"
-                },
-                "lastModified": {
-                    "time": 0,
-                    "actor": "urn:li:corpuser:unknown"
-                }
-            },
-            "inputs": [
-                {
-                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.public_issue_history,DEV)"
-                },
-                {
-                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_testtable,DEV)"
-                },
-                {
-                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query,DEV)"
-                },
-                {
-                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.big-query-with-parameter,DEV)"
-                },
-                {
-                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.snowflake_native-query-with-join,DEV)"
-                },
-                {
-                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.job-history,DEV)"
-                },
-                {
-                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,library-dataset.postgres_test_table,DEV)"
-                }
+            "materialized": false,
+            "viewLogic": "let\n    Source = Sql.Database(\"localhost\", \"library\"),\n dbo_book_issue = Source{[Schema=\"dbo\",Item=\"book_issue\"]}[Data]\n in dbo_book_issue",
+            "viewLanguage": "m_query"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.hr_pbi_test.ms_sql_native_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "PowerBI Dataset Table",
+                "View"
             ]
         }
     },
@@ -762,8 +831,8 @@
     }
 },
 {
-    "entityType": "chart",
-    "entityUrn": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.hr_pbi_test.ms_sql_native_table,PROD)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -778,15 +847,19 @@
     }
 },
 {
-    "entityType": "chart",
-    "entityUrn": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.hr_pbi_test.ms_sql_native_table,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "typeNames": [
-                "PowerBI Tile"
-            ]
+            "customProperties": {
+                "datasetId": "ba0130a1-5b03-40de-9535-b34e778ea6ed"
+            },
+            "externalUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/ba0130a1-5b03-40de-9535-b34e778ea6ed/details",
+            "name": "ms_sql_native_table",
+            "description": "hr pbi test description",
+            "tags": []
         }
     },
     "systemMetadata": {
@@ -796,14 +869,15 @@
     }
 },
 {
-    "entityType": "chart",
-    "entityUrn": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.hr_pbi_test.ms_sql_native_table,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "chartKey",
+    "aspectName": "viewProperties",
     "aspect": {
         "json": {
-            "dashboardTool": "powerbi",
-            "chartId": "charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0"
+            "materialized": false,
+            "viewLogic": "let\n    Source = Sql.Database(\"AUPRDWHDB\", \"COMMOPSDB\", [Query=\"select *,#(lf)concat((UPPER(REPLACE(CLIENT_DIRECTOR,'-',''))), MONTH_WID) as CD_AGENT_KEY,#(lf)concat((UPPER(REPLACE(CLIENT_MANAGER_CLOSING_MONTH,'-',''))), MONTH_WID) as AGENT_KEY#(lf)#(lf)from V_PS_CD_RETENTION\", CommandTimeout=#duration(0, 1, 30, 0)]),\n    #\"Changed Type\" = Table.TransformColumnTypes(Source,{{\"mth_date\", type date}}),\n    #\"Added Custom\" = Table.AddColumn(#\"Changed Type\", \"Month\", each Date.Month([mth_date])),\n    #\"Added Custom1\" = Table.AddColumn(#\"Added Custom\", \"TPV Opening\", each if [Month] = 1 then [TPV_AMV_OPENING]\nelse if [Month] = 2 then 0\nelse if [Month] = 3 then 0\nelse if [Month] = 4 then [TPV_AMV_OPENING]\nelse if [Month] = 5 then 0\nelse if [Month] = 6 then 0\nelse if [Month] = 7 then [TPV_AMV_OPENING]\nelse if [Month] = 8 then 0\nelse if [Month] = 9 then 0\nelse if [Month] = 10 then [TPV_AMV_OPENING]\nelse if [Month] = 11 then 0\nelse if [Month] = 12 then 0\n\nelse 0)\nin\n    #\"Added Custom1\"",
+            "viewLanguage": "m_query"
         }
     },
     "systemMetadata": {
@@ -813,15 +887,27 @@
     }
 },
 {
-    "entityType": "chart",
-    "entityUrn": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(powerbi,myPlatformInstance.dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
     "changeType": "UPSERT",
-    "aspectName": "browsePaths",
+    "aspectName": "ownership",
     "aspect": {
         "json": {
-            "paths": [
-                "/powerbi/demo-workspace"
-            ]
+            "owners": [
+                {
+                    "owner": "urn:li:corpuser:users.User1@foo.com",
+                    "type": "NONE"
+                },
+                {
+                    "owner": "urn:li:corpuser:users.User2@foo.com",
+                    "type": "NONE"
+                }
+            ],
+            "ownerTypes": {},
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            }
         }
     },
     "systemMetadata": {
@@ -831,17 +917,14 @@
     }
 },
 {
-    "entityType": "chart",
-    "entityUrn": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(powerbi,myPlatformInstance.dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "dashboardKey",
     "aspect": {
         "json": {
-            "path": [
-                {
-                    "id": "demo-workspace"
-                }
-            ]
+            "dashboardTool": "powerbi",
+            "dashboardId": "powerbi.linkedin.com/dashboards/7D668CAD-7FFC-4505-9215-655BCA5BEBAE"
         }
     },
     "systemMetadata": {
@@ -852,7 +935,7 @@
 },
 {
     "entityType": "chart",
-    "entityUrn": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+    "entityUrn": "urn:li:chart:(powerbi,myPlatformInstance.charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
     "changeType": "UPSERT",
     "aspectName": "chartInfo",
     "aspect": {
@@ -876,10 +959,10 @@
             },
             "inputs": [
                 {
-                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.dbo_book_issue,DEV)"
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.hr_pbi_test.dbo_book_issue,PROD)"
                 },
                 {
-                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,hr_pbi_test.ms_sql_native_table,DEV)"
+                    "string": "urn:li:dataset:(urn:li:dataPlatform:powerbi,myplatforminstance.hr_pbi_test.ms_sql_native_table,PROD)"
                 }
             ]
         }
@@ -892,7 +975,7 @@
 },
 {
     "entityType": "chart",
-    "entityUrn": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+    "entityUrn": "urn:li:chart:(powerbi,myPlatformInstance.charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -907,43 +990,8 @@
     }
 },
 {
-    "entityType": "chart",
-    "entityUrn": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
-    "changeType": "UPSERT",
-    "aspectName": "chartKey",
-    "aspect": {
-        "json": {
-            "dashboardTool": "powerbi",
-            "chartId": "charts.23212598-23b5-4980-87cc-5fc0ecd84385"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "powerbi-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "chart",
-    "entityUrn": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
-    "changeType": "UPSERT",
-    "aspectName": "subTypes",
-    "aspect": {
-        "json": {
-            "typeNames": [
-                "PowerBI Tile"
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "powerbi-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "chart",
-    "entityUrn": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(powerbi,myPlatformInstance.dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
     "changeType": "UPSERT",
     "aspectName": "browsePaths",
     "aspect": {
@@ -961,15 +1009,13 @@
 },
 {
     "entityType": "chart",
-    "entityUrn": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+    "entityUrn": "urn:li:chart:(powerbi,myPlatformInstance.charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "path": [
-                {
-                    "id": "demo-workspace"
-                }
+            "typeNames": [
+                "PowerBI Tile"
             ]
         }
     },
@@ -980,15 +1026,14 @@
     }
 },
 {
-    "entityType": "dashboard",
-    "entityUrn": "urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,myPlatformInstance.charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
     "changeType": "UPSERT",
-    "aspectName": "browsePaths",
+    "aspectName": "chartKey",
     "aspect": {
         "json": {
-            "paths": [
-                "/powerbi/demo-workspace"
-            ]
+            "dashboardTool": "powerbi",
+            "chartId": "myPlatformInstance.charts.23212598-23b5-4980-87cc-5fc0ecd84385"
         }
     },
     "systemMetadata": {
@@ -999,7 +1044,7 @@
 },
 {
     "entityType": "dashboard",
-    "entityUrn": "urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
+    "entityUrn": "urn:li:dashboard:(powerbi,myPlatformInstance.dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
     "changeType": "PATCH",
     "aspectName": "dashboardInfo",
     "aspect": {
@@ -1018,6 +1063,45 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C10-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Description of test dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,myPlatformInstance.charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+                "value": "urn:li:chart:(powerbi,myPlatformInstance.charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,myPlatformInstance.charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+                "value": "urn:li:chart:(powerbi,myPlatformInstance.charts.23212598-23b5-4980-87cc-5fc0ecd84385)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
@@ -1028,30 +1112,21 @@
     }
 },
 {
-    "entityType": "dashboard",
-    "entityUrn": "urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "powerbi-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dashboard",
-    "entityUrn": "urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,myPlatformInstance.charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
     "changeType": "UPSERT",
-    "aspectName": "dashboardKey",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "dashboardTool": "powerbi",
-            "dashboardId": "powerbi.linkedin.com/dashboards/7D668CAD-7FFC-4505-9215-655BCA5BEBAE"
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:powerbi,myPlatformInstance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:powerbi,myPlatformInstance)"
+                },
+                {
+                    "id": "demo-workspace"
+                }
+            ]
         }
     },
     "systemMetadata": {
@@ -1061,27 +1136,15 @@
     }
 },
 {
-    "entityType": "dashboard",
-    "entityUrn": "urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
+    "entityType": "chart",
+    "entityUrn": "urn:li:chart:(powerbi,myPlatformInstance.charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
     "changeType": "UPSERT",
-    "aspectName": "ownership",
+    "aspectName": "browsePaths",
     "aspect": {
         "json": {
-            "owners": [
-                {
-                    "owner": "urn:li:corpuser:users.User1@foo.com",
-                    "type": "NONE"
-                },
-                {
-                    "owner": "urn:li:corpuser:users.User2@foo.com",
-                    "type": "NONE"
-                }
-            ],
-            "ownerTypes": {},
-            "lastModified": {
-                "time": 0,
-                "actor": "urn:li:corpuser:unknown"
-            }
+            "paths": [
+                "/powerbi/demo-workspace"
+            ]
         }
     },
     "systemMetadata": {
@@ -1092,12 +1155,16 @@
 },
 {
     "entityType": "dashboard",
-    "entityUrn": "urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
+    "entityUrn": "urn:li:dashboard:(powerbi,myPlatformInstance.dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:powerbi,myPlatformInstance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:powerbi,myPlatformInstance)"
+                },
                 {
                     "id": "demo-workspace"
                 }
@@ -1111,24 +1178,8 @@
     }
 },
 {
-    "entityType": "corpuser",
-    "entityUrn": "urn:li:corpuser:users.User1@foo.com",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1643871600000,
-        "runId": "powerbi-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "corpuser",
-    "entityUrn": "urn:li:corpuser:users.User2@foo.com",
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(powerbi,myPlatformInstance.dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_most_config_and_modified_since_admin_only.json b/metadata-ingestion/tests/integration/powerbi/golden_test_most_config_and_modified_since_admin_only.json
index 11a7fed6030cec..66e87952bf1416 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_most_config_and_modified_since_admin_only.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_most_config_and_modified_since_admin_only.json
@@ -1028,6 +1028,40 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C10-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+                "value": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+                "value": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
@@ -1257,6 +1291,50 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(powerbi,reports.5b218778-e7a5-4d73-8187-f10824047715)",
+    "changeType": "PATCH",
+    "aspectName": "dashboardInfo",
+    "aspect": {
+        "json": [
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://app.powerbi.com/groups/f089354e-8366-4e18-aea3-4cb4a3a50b48/reports/5b218778-e7a5-4d73-8187-f10824047715"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Acryl sales marketing report"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "SalesMarketing"
+            }
+        ]
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:977b804137a1d2bf897ff1bbf440a1cc",
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_platform_instance_ingest.json b/metadata-ingestion/tests/integration/powerbi/golden_test_platform_instance_ingest.json
index cf5d4df460e231..ea1ee0df4b1057 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_platform_instance_ingest.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_platform_instance_ingest.json
@@ -1026,6 +1026,45 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C10-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Description of test dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,aws-ap-south-1.charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+                "value": "urn:li:chart:(powerbi,aws-ap-south-1.charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,aws-ap-south-1.charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+                "value": "urn:li:chart:(powerbi,aws-ap-south-1.charts.23212598-23b5-4980-87cc-5fc0ecd84385)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_report.json b/metadata-ingestion/tests/integration/powerbi/golden_test_report.json
index cce9e3f8755ba5..094869bfd24f1d 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_report.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_report.json
@@ -1018,6 +1018,45 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C10-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Description of test dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+                "value": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+                "value": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
@@ -1935,6 +1974,60 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(powerbi,reports.5b218778-e7a5-4d73-8187-f10824047715)",
+    "changeType": "PATCH",
+    "aspectName": "dashboardInfo",
+    "aspect": {
+        "json": [
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "SalesMarketing"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Acryl sales marketing report"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,pages.5b218778-e7a5-4d73-8187-f10824047715.ReportSection)",
+                "value": "urn:li:chart:(powerbi,pages.5b218778-e7a5-4d73-8187-f10824047715.ReportSection)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,pages.5b218778-e7a5-4d73-8187-f10824047715.ReportSection1)",
+                "value": "urn:li:chart:(powerbi,pages.5b218778-e7a5-4d73-8187-f10824047715.ReportSection1)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://app.powerbi.com/groups/f089354e-8366-4e18-aea3-4cb4a3a50b48/reports/5b218778-e7a5-4d73-8187-f10824047715"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
+            }
+        ]
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dashboard",
     "entityUrn": "urn:li:dashboard:(powerbi,reports.5b218778-e7a5-4d73-8187-f10824047715)",
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_scan_all_workspaces.json b/metadata-ingestion/tests/integration/powerbi/golden_test_scan_all_workspaces.json
index 5e244e0e0f93f7..dcaa518a3c3237 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_scan_all_workspaces.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_scan_all_workspaces.json
@@ -986,6 +986,45 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C10-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Description of test dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+                "value": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+                "value": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
@@ -1087,6 +1126,30 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C22-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard2"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_server_to_platform_instance.json b/metadata-ingestion/tests/integration/powerbi/golden_test_server_to_platform_instance.json
index 8fd8989b81122b..bc5e844f679c71 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_server_to_platform_instance.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_server_to_platform_instance.json
@@ -1226,6 +1226,45 @@
                 "op": "add",
                 "path": "/customProperties/workspaceId",
                 "value": "64ED5CAD-7C10-4684-8180-826122881108"
+            },
+            {
+                "op": "add",
+                "path": "/title",
+                "value": "test_dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Description of test dashboard"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)",
+                "value": "urn:li:chart:(powerbi,charts.B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0)"
+            },
+            {
+                "op": "add",
+                "path": "/charts/urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)",
+                "value": "urn:li:chart:(powerbi,charts.23212598-23b5-4980-87cc-5fc0ecd84385)"
+            },
+            {
+                "op": "add",
+                "path": "/dashboardUrl",
+                "value": "https://localhost/dashboards/web/1"
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "lastModified": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    }
+                }
             }
         ]
     },
diff --git a/metadata-ingestion/tests/integration/powerbi/test_powerbi.py b/metadata-ingestion/tests/integration/powerbi/test_powerbi.py
index 06cc40fe7b24c1..23b23ecada0d49 100644
--- a/metadata-ingestion/tests/integration/powerbi/test_powerbi.py
+++ b/metadata-ingestion/tests/integration/powerbi/test_powerbi.py
@@ -683,6 +683,52 @@ def test_powerbi_ingest(
     )
 
 
+@freeze_time(FROZEN_TIME)
+@mock.patch("msal.ConfidentialClientApplication", side_effect=mock_msal_cca)
+@pytest.mark.integration
+def test_powerbi_ingest_patch_disabled(
+    mock_msal: MagicMock,
+    pytestconfig: pytest.Config,
+    tmp_path: str,
+    mock_time: datetime.datetime,
+    requests_mock: Any,
+) -> None:
+    enable_logging()
+
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/powerbi"
+
+    register_mock_api(request_mock=requests_mock)
+
+    pipeline = Pipeline.create(
+        {
+            "run_id": "powerbi-test",
+            "source": {
+                "type": "powerbi",
+                "config": {
+                    **default_source_config(),
+                    "patch_metadata": False,
+                },
+            },
+            "sink": {
+                "type": "file",
+                "config": {
+                    "filename": f"{tmp_path}/powerbi_mces.json",
+                },
+            },
+        }
+    )
+
+    pipeline.run()
+    pipeline.raise_from_status()
+    golden_file = "golden_test_ingest_patch_disabled.json"
+
+    mce_helpers.check_golden_file(
+        pytestconfig,
+        output_path=f"{tmp_path}/powerbi_mces.json",
+        golden_path=f"{test_resources_dir}/{golden_file}",
+    )
+
+
 @freeze_time(FROZEN_TIME)
 @mock.patch("msal.ConfidentialClientApplication", side_effect=mock_msal_cca)
 @pytest.mark.integration
@@ -773,6 +819,8 @@ def test_powerbi_ingest_urn_lower_case(
                 "type": "powerbi",
                 "config": {
                     **default_source_config(),
+                    "env": "PROD",
+                    "platform_instance": "myPlatformInstance",
                     "convert_urns_to_lowercase": True,
                     "convert_lineage_urns_to_lowercase": True,
                 },
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_no_partition.json b/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_no_partition.json
index 51a8ef60849a9f..03d2ac38cf7d2b 100644
--- a/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_no_partition.json
+++ b/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_no_partition.json
@@ -7,9 +7,9 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "schema_inferred_from": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv/part2.csv",
+                "schema_inferred_from": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv/part3.csv",
                 "number_of_files": "3",
-                "size_in_bytes": "3446"
+                "size_in_bytes": "3539"
             },
             "name": "food_csv",
             "description": "",
@@ -18,7 +18,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -58,18 +59,6 @@
                     "recursive": false,
                     "isPartOfKey": false
                 },
-                {
-                    "fieldPath": "healthy",
-                    "nullable": false,
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.BooleanType": {}
-                        }
-                    },
-                    "nativeDataType": "boolean",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
                 {
                     "fieldPath": "height",
                     "nullable": false,
@@ -111,7 +100,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -123,8 +113,8 @@
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "operationType": "UPDATE",
             "lastUpdatedTimestamp": 1688445089021
@@ -132,7 +122,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -152,7 +143,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -167,7 +159,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -182,7 +175,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -199,7 +193,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -214,7 +209,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -234,7 +230,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -249,7 +246,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -264,7 +262,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -281,7 +280,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -296,7 +296,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -316,7 +317,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -336,7 +338,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -351,7 +354,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -366,7 +370,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -383,7 +388,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -398,7 +404,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -422,7 +429,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -442,7 +450,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -457,7 +466,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -472,7 +482,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -489,7 +500,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -504,7 +516,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -532,7 +545,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -552,7 +566,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -567,7 +582,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -582,7 +598,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -599,7 +616,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -614,7 +632,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -646,7 +665,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -666,7 +686,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -681,7 +702,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -696,7 +718,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -713,7 +736,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -728,7 +752,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -764,7 +789,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -784,7 +810,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -799,7 +826,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -814,7 +842,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -831,7 +860,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -846,7 +876,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -886,7 +917,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -906,7 +938,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -921,7 +954,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -936,7 +970,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -953,7 +988,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -968,7 +1004,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1012,7 +1049,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1027,7 +1065,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1039,299 +1078,127 @@
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
-            "rowCount": 70,
-            "columnCount": 5,
+            "rowCount": 4,
+            "columnCount": 4,
             "fieldProfiles": [
                 {
                     "fieldPath": "name",
-                    "uniqueCount": 9,
-                    "uniqueProportion": 0.13043478260869565,
-                    "nullCount": 1,
-                    "nullProportion": 0.014285714285714285,
+                    "uniqueCount": 4,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
                     "distinctValueFrequencies": [
-                        {
-                            "value": "NullValue",
-                            "frequency": 1
-                        },
                         {
                             "value": "apple",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "chicken",
-                            "frequency": 7
+                            "frequency": 1
                         },
                         {
                             "value": "cookie",
-                            "frequency": 6
-                        },
-                        {
-                            "value": "hamburger",
-                            "frequency": 7
+                            "frequency": 1
                         },
                         {
                             "value": "lasagna",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "orange",
-                            "frequency": 7
+                            "frequency": 1
                         },
                         {
                             "value": "pasta",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "spinach",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "sushi",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "water",
-                            "frequency": 7
+                            "frequency": 1
                         }
                     ],
                     "sampleValues": [
                         "apple",
-                        "apple",
-                        "apple",
-                        "chicken",
-                        "cookie",
                         "cookie",
-                        "cookie",
-                        "lasagna",
                         "lasagna",
-                        "orange",
-                        "orange",
-                        "pasta",
-                        "pasta",
-                        "pasta",
-                        "pasta",
-                        "spinach",
-                        "spinach",
-                        "spinach",
-                        "water",
-                        "water"
+                        "pasta"
                     ]
                 },
                 {
                     "fieldPath": "weight",
-                    "uniqueCount": 9,
-                    "uniqueProportion": 0.12857142857142856,
+                    "uniqueCount": 4,
+                    "uniqueProportion": 1.0,
                     "nullCount": 0,
                     "nullProportion": 0.0,
                     "distinctValueFrequencies": [
-                        {
-                            "value": "10",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "2",
-                            "frequency": 7
-                        },
                         {
                             "value": "23",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "32",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "36",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "43",
-                            "frequency": 7
+                            "frequency": 1
                         },
                         {
                             "value": "49",
-                            "frequency": 7
+                            "frequency": 1
                         },
                         {
                             "value": "50",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "53",
-                            "frequency": 7
+                            "frequency": 1
                         },
                         {
                             "value": "72",
-                            "frequency": 7
+                            "frequency": 1
                         }
                     ],
                     "sampleValues": [
-                        "10",
-                        "10",
-                        "10",
-                        "23",
-                        "23",
                         "23",
-                        "32",
-                        "32",
-                        "36",
-                        "43",
-                        "43",
-                        "49",
                         "49",
                         "50",
-                        "50",
-                        "50",
-                        "72",
-                        "72",
-                        "72",
                         "72"
                     ]
                 },
                 {
                     "fieldPath": "height",
-                    "uniqueCount": 4,
-                    "uniqueProportion": 0.05714285714285714,
+                    "uniqueCount": 1,
+                    "uniqueProportion": 0.25,
                     "nullCount": 0,
                     "nullProportion": 0.0,
                     "distinctValueFrequencies": [
                         {
                             "value": "4",
-                            "frequency": 24
-                        },
-                        {
-                            "value": "5",
-                            "frequency": 15
-                        },
-                        {
-                            "value": "6",
-                            "frequency": 23
-                        },
-                        {
-                            "value": "7",
-                            "frequency": 8
+                            "frequency": 4
                         }
                     ],
                     "sampleValues": [
                         "4",
                         "4",
                         "4",
-                        "4",
-                        "4",
-                        "4",
-                        "4",
-                        "5",
-                        "5",
-                        "5",
-                        "5",
-                        "5",
-                        "6",
-                        "6",
-                        "6",
-                        "6",
-                        "6",
-                        "6",
-                        "7",
-                        "7"
+                        "4"
                     ]
                 },
                 {
                     "fieldPath": "color",
-                    "uniqueCount": 7,
-                    "uniqueProportion": 0.1,
+                    "uniqueCount": 3,
+                    "uniqueProportion": 0.75,
                     "nullCount": 0,
                     "nullProportion": 0.0,
                     "distinctValueFrequencies": [
-                        {
-                            "value": "blue",
-                            "frequency": 7
-                        },
                         {
                             "value": "brown",
-                            "frequency": 14
-                        },
-                        {
-                            "value": "green",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "orange",
-                            "frequency": 14
+                            "frequency": 1
                         },
                         {
                             "value": "red",
-                            "frequency": 14
-                        },
-                        {
-                            "value": "white",
-                            "frequency": 7
+                            "frequency": 2
                         },
                         {
                             "value": "yellow",
-                            "frequency": 7
+                            "frequency": 1
                         }
                     ],
                     "sampleValues": [
-                        "blue",
-                        "blue",
-                        "brown",
-                        "brown",
                         "brown",
-                        "green",
-                        "green",
-                        "green",
-                        "orange",
-                        "orange",
-                        "red",
-                        "red",
                         "red",
                         "red",
-                        "red",
-                        "white",
-                        "yellow",
-                        "yellow",
-                        "yellow",
                         "yellow"
                     ]
-                },
-                {
-                    "fieldPath": "healthy",
-                    "uniqueCount": 2,
-                    "uniqueProportion": 0.028985507246376812,
-                    "nullCount": 1,
-                    "nullProportion": 0.014285714285714285,
-                    "sampleValues": [
-                        "False",
-                        "False",
-                        "False",
-                        "False",
-                        "False",
-                        "False",
-                        "False",
-                        "False",
-                        "False",
-                        "None",
-                        "True",
-                        "True",
-                        "True",
-                        "True",
-                        "True",
-                        "True",
-                        "True",
-                        "True",
-                        "True",
-                        "True"
-                    ]
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1379,7 +1246,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1401,7 +1269,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1494,7 +1363,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1506,8 +1376,8 @@
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "operationType": "UPDATE",
             "lastUpdatedTimestamp": 1688445119021
@@ -1515,7 +1385,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1530,7 +1401,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1542,8 +1414,8 @@
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "rowCount": 70,
             "columnCount": 5,
@@ -1834,7 +1706,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1882,7 +1755,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1897,7 +1771,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1912,7 +1787,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_no_partition_filename.json b/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_no_partition_filename.json
index 8e67bbf10bd6dd..48c59753fcaff3 100644
--- a/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_no_partition_filename.json
+++ b/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_no_partition_filename.json
@@ -7,9 +7,9 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "schema_inferred_from": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv/part2.csv",
+                "schema_inferred_from": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv/part3.csv",
                 "number_of_files": "3",
-                "size_in_bytes": "3446"
+                "size_in_bytes": "3539"
             },
             "name": "folder_aaa.food_csv",
             "description": "",
@@ -18,7 +18,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -58,18 +59,6 @@
                     "recursive": false,
                     "isPartOfKey": false
                 },
-                {
-                    "fieldPath": "healthy",
-                    "nullable": false,
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.BooleanType": {}
-                        }
-                    },
-                    "nativeDataType": "boolean",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
                 {
                     "fieldPath": "height",
                     "nullable": false,
@@ -111,7 +100,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -123,8 +113,8 @@
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "operationType": "UPDATE",
             "lastUpdatedTimestamp": 1688445089021
@@ -132,7 +122,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -152,7 +143,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -167,7 +159,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -182,7 +175,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -199,7 +193,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -214,7 +209,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -234,7 +230,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -249,7 +246,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -264,7 +262,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -281,7 +280,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -296,7 +296,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -316,7 +317,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -336,7 +338,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -351,7 +354,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -366,7 +370,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -383,7 +388,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -398,7 +404,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -422,7 +429,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -442,7 +450,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -457,7 +466,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -472,7 +482,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -489,7 +500,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -504,7 +516,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -532,7 +545,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -552,7 +566,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -567,7 +582,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -582,7 +598,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -599,7 +616,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -614,7 +632,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -646,7 +665,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -666,7 +686,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -681,7 +702,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -696,7 +718,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -713,7 +736,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -728,7 +752,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -764,7 +789,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -784,7 +810,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -799,7 +826,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -814,7 +842,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -831,7 +860,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -846,7 +876,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -886,7 +917,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -906,7 +938,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -921,7 +954,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -936,7 +970,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -953,7 +988,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -968,7 +1004,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1012,7 +1049,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1027,7 +1065,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1039,299 +1078,127 @@
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
-            "rowCount": 70,
-            "columnCount": 5,
+            "rowCount": 4,
+            "columnCount": 4,
             "fieldProfiles": [
                 {
                     "fieldPath": "name",
-                    "uniqueCount": 9,
-                    "uniqueProportion": 0.13043478260869565,
-                    "nullCount": 1,
-                    "nullProportion": 0.014285714285714285,
+                    "uniqueCount": 4,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
                     "distinctValueFrequencies": [
-                        {
-                            "value": "NullValue",
-                            "frequency": 1
-                        },
                         {
                             "value": "apple",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "chicken",
-                            "frequency": 7
+                            "frequency": 1
                         },
                         {
                             "value": "cookie",
-                            "frequency": 6
-                        },
-                        {
-                            "value": "hamburger",
-                            "frequency": 7
+                            "frequency": 1
                         },
                         {
                             "value": "lasagna",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "orange",
-                            "frequency": 7
+                            "frequency": 1
                         },
                         {
                             "value": "pasta",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "spinach",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "sushi",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "water",
-                            "frequency": 7
+                            "frequency": 1
                         }
                     ],
                     "sampleValues": [
                         "apple",
-                        "apple",
-                        "apple",
-                        "chicken",
-                        "cookie",
                         "cookie",
-                        "cookie",
-                        "lasagna",
                         "lasagna",
-                        "orange",
-                        "orange",
-                        "pasta",
-                        "pasta",
-                        "pasta",
-                        "pasta",
-                        "spinach",
-                        "spinach",
-                        "spinach",
-                        "water",
-                        "water"
+                        "pasta"
                     ]
                 },
                 {
                     "fieldPath": "weight",
-                    "uniqueCount": 9,
-                    "uniqueProportion": 0.12857142857142856,
+                    "uniqueCount": 4,
+                    "uniqueProportion": 1.0,
                     "nullCount": 0,
                     "nullProportion": 0.0,
                     "distinctValueFrequencies": [
-                        {
-                            "value": "10",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "2",
-                            "frequency": 7
-                        },
                         {
                             "value": "23",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "32",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "36",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "43",
-                            "frequency": 7
+                            "frequency": 1
                         },
                         {
                             "value": "49",
-                            "frequency": 7
+                            "frequency": 1
                         },
                         {
                             "value": "50",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "53",
-                            "frequency": 7
+                            "frequency": 1
                         },
                         {
                             "value": "72",
-                            "frequency": 7
+                            "frequency": 1
                         }
                     ],
                     "sampleValues": [
-                        "10",
-                        "10",
-                        "10",
-                        "23",
-                        "23",
                         "23",
-                        "32",
-                        "32",
-                        "36",
-                        "43",
-                        "43",
-                        "49",
                         "49",
                         "50",
-                        "50",
-                        "50",
-                        "72",
-                        "72",
-                        "72",
                         "72"
                     ]
                 },
                 {
                     "fieldPath": "height",
-                    "uniqueCount": 4,
-                    "uniqueProportion": 0.05714285714285714,
+                    "uniqueCount": 1,
+                    "uniqueProportion": 0.25,
                     "nullCount": 0,
                     "nullProportion": 0.0,
                     "distinctValueFrequencies": [
                         {
                             "value": "4",
-                            "frequency": 24
-                        },
-                        {
-                            "value": "5",
-                            "frequency": 15
-                        },
-                        {
-                            "value": "6",
-                            "frequency": 23
-                        },
-                        {
-                            "value": "7",
-                            "frequency": 8
+                            "frequency": 4
                         }
                     ],
                     "sampleValues": [
                         "4",
                         "4",
                         "4",
-                        "4",
-                        "4",
-                        "4",
-                        "4",
-                        "5",
-                        "5",
-                        "5",
-                        "5",
-                        "5",
-                        "6",
-                        "6",
-                        "6",
-                        "6",
-                        "6",
-                        "6",
-                        "7",
-                        "7"
+                        "4"
                     ]
                 },
                 {
                     "fieldPath": "color",
-                    "uniqueCount": 7,
-                    "uniqueProportion": 0.1,
+                    "uniqueCount": 3,
+                    "uniqueProportion": 0.75,
                     "nullCount": 0,
                     "nullProportion": 0.0,
                     "distinctValueFrequencies": [
-                        {
-                            "value": "blue",
-                            "frequency": 7
-                        },
                         {
                             "value": "brown",
-                            "frequency": 14
-                        },
-                        {
-                            "value": "green",
-                            "frequency": 7
-                        },
-                        {
-                            "value": "orange",
-                            "frequency": 14
+                            "frequency": 1
                         },
                         {
                             "value": "red",
-                            "frequency": 14
-                        },
-                        {
-                            "value": "white",
-                            "frequency": 7
+                            "frequency": 2
                         },
                         {
                             "value": "yellow",
-                            "frequency": 7
+                            "frequency": 1
                         }
                     ],
                     "sampleValues": [
-                        "blue",
-                        "blue",
-                        "brown",
-                        "brown",
                         "brown",
-                        "green",
-                        "green",
-                        "green",
-                        "orange",
-                        "orange",
-                        "red",
-                        "red",
                         "red",
                         "red",
-                        "red",
-                        "white",
-                        "yellow",
-                        "yellow",
-                        "yellow",
                         "yellow"
                     ]
-                },
-                {
-                    "fieldPath": "healthy",
-                    "uniqueCount": 2,
-                    "uniqueProportion": 0.028985507246376812,
-                    "nullCount": 1,
-                    "nullProportion": 0.014285714285714285,
-                    "sampleValues": [
-                        "False",
-                        "False",
-                        "False",
-                        "False",
-                        "False",
-                        "False",
-                        "False",
-                        "False",
-                        "False",
-                        "None",
-                        "True",
-                        "True",
-                        "True",
-                        "True",
-                        "True",
-                        "True",
-                        "True",
-                        "True",
-                        "True",
-                        "True"
-                    ]
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1379,7 +1246,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1401,7 +1269,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1494,7 +1363,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1506,8 +1376,8 @@
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "operationType": "UPDATE",
             "lastUpdatedTimestamp": 1688445119021
@@ -1515,7 +1385,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1530,7 +1401,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1542,8 +1414,8 @@
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "rowCount": 70,
             "columnCount": 5,
@@ -1834,7 +1706,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1882,7 +1755,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1897,7 +1771,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1912,7 +1787,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_partition_update_schema_with_partition_autodetect.json b/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_partition_update_schema_with_partition_autodetect.json
new file mode 100644
index 00000000000000..adb3686309e6c4
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_partition_update_schema_with_partition_autodetect.json
@@ -0,0 +1,2572 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv/part3.csv",
+                "number_of_files": "3",
+                "size_in_bytes": "3539"
+            },
+            "name": "folder_aaa.food_csv",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.food_csv",
+            "platform": "urn:li:dataPlatform:file",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "color",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "height",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "weight",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586833420000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests"
+            },
+            "name": "tests"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration"
+            },
+            "name": "integration"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3"
+            },
+            "name": "s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3/test_data"
+            },
+            "name": "test_data"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3/test_data/local_system"
+            },
+            "name": "local_system"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3/test_data/local_system/folder_a"
+            },
+            "name": "folder_a"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3/test_data/local_system/folder_a/folder_aa"
+            },
+            "name": "folder_aa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                },
+                {
+                    "id": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+                    "urn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa"
+            },
+            "name": "folder_aaa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:98a716614da5246426edd48260406364"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                },
+                {
+                    "id": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+                    "urn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+                },
+                {
+                    "id": "urn:li:container:98a716614da5246426edd48260406364",
+                    "urn": "urn:li:container:98a716614da5246426edd48260406364"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProfile",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "rowCount": 4,
+            "columnCount": 4,
+            "fieldProfiles": [
+                {
+                    "fieldPath": "name",
+                    "uniqueCount": 4,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "apple",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "cookie",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "lasagna",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "pasta",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "apple",
+                        "cookie",
+                        "lasagna",
+                        "pasta"
+                    ]
+                },
+                {
+                    "fieldPath": "weight",
+                    "uniqueCount": 4,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "23",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "49",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "50",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "72",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "23",
+                        "49",
+                        "50",
+                        "72"
+                    ]
+                },
+                {
+                    "fieldPath": "height",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 0.25,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "4",
+                            "frequency": 4
+                        }
+                    ],
+                    "sampleValues": [
+                        "4",
+                        "4",
+                        "4",
+                        "4"
+                    ]
+                },
+                {
+                    "fieldPath": "color",
+                    "uniqueCount": 3,
+                    "uniqueProportion": 0.75,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "brown",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "red",
+                            "frequency": 2
+                        },
+                        {
+                            "value": "yellow",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "brown",
+                        "red",
+                        "red",
+                        "yellow"
+                    ]
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                },
+                {
+                    "id": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+                    "urn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+                },
+                {
+                    "id": "urn:li:container:98a716614da5246426edd48260406364",
+                    "urn": "urn:li:container:98a716614da5246426edd48260406364"
+                },
+                {
+                    "id": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+                    "urn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet/part2.parquet",
+                "number_of_files": "2",
+                "size_in_bytes": "8412"
+            },
+            "name": "folder_aaa.food_parquet",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.food_parquet",
+            "platform": "urn:li:dataPlatform:file",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "color",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "healthy",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "height",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int64",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "weight",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int64",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586833440000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProfile",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "rowCount": 70,
+            "columnCount": 5,
+            "fieldProfiles": [
+                {
+                    "fieldPath": "name",
+                    "uniqueCount": 9,
+                    "uniqueProportion": 0.13043478260869565,
+                    "nullCount": 1,
+                    "nullProportion": 0.014285714285714285,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "NullValue",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "apple",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "chicken",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "cookie",
+                            "frequency": 6
+                        },
+                        {
+                            "value": "hamburger",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "lasagna",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "orange",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "pasta",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "spinach",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "sushi",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "water",
+                            "frequency": 7
+                        }
+                    ],
+                    "sampleValues": [
+                        "apple",
+                        "apple",
+                        "apple",
+                        "chicken",
+                        "cookie",
+                        "cookie",
+                        "cookie",
+                        "lasagna",
+                        "lasagna",
+                        "orange",
+                        "orange",
+                        "pasta",
+                        "pasta",
+                        "pasta",
+                        "pasta",
+                        "spinach",
+                        "spinach",
+                        "spinach",
+                        "water",
+                        "water"
+                    ]
+                },
+                {
+                    "fieldPath": "weight",
+                    "uniqueCount": 10,
+                    "uniqueProportion": 0.14285714285714285,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "10",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "2",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "23",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "32",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "36",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "43",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "49",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "50",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "53",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "72",
+                            "frequency": 7
+                        }
+                    ],
+                    "sampleValues": [
+                        "10",
+                        "10",
+                        "10",
+                        "23",
+                        "23",
+                        "23",
+                        "32",
+                        "32",
+                        "36",
+                        "43",
+                        "43",
+                        "49",
+                        "49",
+                        "50",
+                        "50",
+                        "50",
+                        "72",
+                        "72",
+                        "72",
+                        "72"
+                    ]
+                },
+                {
+                    "fieldPath": "height",
+                    "uniqueCount": 4,
+                    "uniqueProportion": 0.05714285714285714,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "4",
+                            "frequency": 24
+                        },
+                        {
+                            "value": "5",
+                            "frequency": 15
+                        },
+                        {
+                            "value": "6",
+                            "frequency": 23
+                        },
+                        {
+                            "value": "7",
+                            "frequency": 8
+                        }
+                    ],
+                    "sampleValues": [
+                        "4",
+                        "4",
+                        "4",
+                        "4",
+                        "4",
+                        "4",
+                        "4",
+                        "5",
+                        "5",
+                        "5",
+                        "5",
+                        "5",
+                        "6",
+                        "6",
+                        "6",
+                        "6",
+                        "6",
+                        "6",
+                        "7",
+                        "7"
+                    ]
+                },
+                {
+                    "fieldPath": "color",
+                    "uniqueCount": 7,
+                    "uniqueProportion": 0.1,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "blue",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "brown",
+                            "frequency": 14
+                        },
+                        {
+                            "value": "green",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "orange",
+                            "frequency": 14
+                        },
+                        {
+                            "value": "red",
+                            "frequency": 14
+                        },
+                        {
+                            "value": "white",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "yellow",
+                            "frequency": 7
+                        }
+                    ],
+                    "sampleValues": [
+                        "blue",
+                        "blue",
+                        "brown",
+                        "brown",
+                        "brown",
+                        "green",
+                        "green",
+                        "green",
+                        "orange",
+                        "orange",
+                        "red",
+                        "red",
+                        "red",
+                        "red",
+                        "red",
+                        "white",
+                        "yellow",
+                        "yellow",
+                        "yellow",
+                        "yellow"
+                    ]
+                },
+                {
+                    "fieldPath": "healthy",
+                    "uniqueCount": 2,
+                    "uniqueProportion": 0.028985507246376812,
+                    "nullCount": 1,
+                    "nullProportion": 0.014285714285714285,
+                    "sampleValues": [
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "None",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True"
+                    ]
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                },
+                {
+                    "id": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+                    "urn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+                },
+                {
+                    "id": "urn:li:container:98a716614da5246426edd48260406364",
+                    "urn": "urn:li:container:98a716614da5246426edd48260406364"
+                },
+                {
+                    "id": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+                    "urn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2022/month=jan/part3.json",
+                "number_of_files": "13",
+                "size_in_bytes": "188600"
+            },
+            "name": "folder_aaa.pokemon_abilities_json",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.pokemon_abilities_json",
+            "platform": "urn:li:dataPlatform:file",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "effect_changes",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.is_native",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.short_effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.flavor_text",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "id",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "is_main_series",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.is_hidden",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.slot",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586833590000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProfile",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "rowCount": 1,
+            "columnCount": 9,
+            "fieldProfiles": [
+                {
+                    "fieldPath": "effect_changes",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "[Row(effect_entries=[Row(effect='Hat im Kampf keinen Effekt.', language=Row(is_native='no', name='de', url='https://pokeapi.co/api/v2/language/6/')), Row(effect='Has no effect in battle.', language=Row(is_native='yes', name='en', url='https://pokeapi.co/api/v2/language/9/'))], version_group=Row(name='black-white', url='https://pokeapi.co/api/v2/version-group/11/'))]"
+                    ]
+                },
+                {
+                    "fieldPath": "effect_entries",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "[Row(effect='Attacken die Schaden verursachen haben mit jedem Treffer eine 10% Chance das Ziel zur\u00fcckschrecken zu lassen, wenn die Attacke dies nicht bereits als Nebeneffekt hat.\\n\\nDer Effekt stapelt nicht mit dem von getragenen Items.\\n\\nAu\u00dferhalb vom Kampf: Wenn ein Pok\u00e9mon mit dieser F\u00e4higkeit an erster Stelle im Team steht, tauchen wilde Pok\u00e9mon nur halb so oft auf.', language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), short_effect='Mit jedem Treffer besteht eine 10% Chance das Ziel zur\u00fcckschrecken zu lassen.'), Row(effect=\"This Pok\u00e9mon's damaging moves have a 10% chance to make the target flinch with each hit if they do not already cause flinching as a secondary effect.\\n\\nThis ability does not stack with a held item.\\n\\nOverworld: The wild encounter rate is halved while this Pok\u00e9mon is first in the party.\", language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), short_effect='Has a 10% chance of making target Pok\u00e9mon flinch with each hit.')]"
+                    ]
+                },
+                {
+                    "fieldPath": "flavor_text_entries",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "[Row(flavor_text='Helps repel wild POK\u00e9MON.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='ruby-sapphire', url='https://pokeapi.co/api/v2/version-group/5/')), Row(flavor_text='Helps repel wild POK\u00e9MON.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='emerald', url='https://pokeapi.co/api/v2/version-group/6/')), Row(flavor_text='Helps repel wild POK\u00e9MON.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='firered-leafgreen', url='https://pokeapi.co/api/v2/version-group/7/')), Row(flavor_text='The stench helps keep\\nwild Pok\u00e9mon away.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='diamond-pearl', url='https://pokeapi.co/api/v2/version-group/8/')), Row(flavor_text='The stench helps keep\\nwild Pok\u00e9mon away.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='platinum', url='https://pokeapi.co/api/v2/version-group/9/')), Row(flavor_text='The stench helps keep\\nwild Pok\u00e9mon away.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='heartgold-soulsilver', url='https://pokeapi.co/api/v2/version-group/10/')), Row(flavor_text='La puanteur peut\\neffrayer l\u2019adversaire.', language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), version_group=Row(name='black-white', url='https://pokeapi.co/api/v2/version-group/11/')), Row(flavor_text='The stench may cause\\nthe target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='black-white', url='https://pokeapi.co/api/v2/version-group/11/')), Row(flavor_text='The stench may cause\\nthe target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='black-2-white-2', url='https://pokeapi.co/api/v2/version-group/14/')), Row(flavor_text='\u304f\u3055\u304f\u3066\\u3000\u3042\u3044\u3066\u304c\\n\u3072\u308b\u3080\\u3000\u3053\u3068\u304c\u3042\u308b\u3002', language=Row(name='ja-Hrkt', url='https://pokeapi.co/api/v2/language/1/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='\uc545\ucde8 \ub54c\ubb38\uc5d0 \uc0c1\ub300\uac00\\n\ud480\uc8fd\uc744 \ub54c\uac00 \uc788\ub2e4.', language=Row(name='ko', url='https://pokeapi.co/api/v2/language/3/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='La puanteur peut effrayer\\nl\u2019adversaire.', language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='L\u00e4sst den Gegner durch Gestank\\nzur\u00fcckschrecken.', language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='Es posible que el rival retroceda\\npor el mal olor.', language=Row(name='es', url='https://pokeapi.co/api/v2/language/7/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='A volte il cattivo odore\\nfa tentennare i nemici.', language=Row(name='it', url='https://pokeapi.co/api/v2/language/8/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='The stench may cause\\nthe target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='\u81ed\u304f\u3066\\u3000\u76f8\u624b\u304c\\n\u3072\u308b\u3080\\u3000\u3053\u3068\u304c\u3042\u308b\u3002', language=Row(name='ja', url='https://pokeapi.co/api/v2/language/11/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='\u304f\u3055\u304f\u3066\\u3000\u3042\u3044\u3066\u304c\\n\u3072\u308b\u3080\\u3000\u3053\u3068\u304c\u3042\u308b\u3002', language=Row(name='ja-Hrkt', url='https://pokeapi.co/api/v2/language/1/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='\uc545\ucde8 \ub54c\ubb38\uc5d0 \uc0c1\ub300\uac00\\n\ud480\uc8fd\uc744 \ub54c\uac00 \uc788\ub2e4.', language=Row(name='ko', url='https://pokeapi.co/api/v2/language/3/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='La puanteur peut effrayer\\nl\u2019adversaire.', language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='L\u00e4sst den Gegner durch Gestank\\nzur\u00fcckschrecken.', language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='Es posible que el rival retroceda\\npor el mal olor.', language=Row(name='es', url='https://pokeapi.co/api/v2/language/7/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='A volte il cattivo odore\\nfa tentennare i nemici.', language=Row(name='it', url='https://pokeapi.co/api/v2/language/8/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='The stench may cause\\nthe target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='\u81ed\u304f\u3066\\u3000\u76f8\u624b\u304c\\n\u3072\u308b\u3080\\u3000\u3053\u3068\u304c\u3042\u308b\u3002', language=Row(name='ja', url='https://pokeapi.co/api/v2/language/11/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='\u304f\u3055\u3044\\u3000\u306b\u304a\u3044\u3092\\u3000\u306f\u306a\u3064\u3053\u3068\u306b\u3088\u3063\u3066\\n\u3053\u3046\u3052\u304d\u3057\u305f\\u3000\u3068\u304d\u306b\\u3000\u3042\u3044\u3066\u3092\\n\u3072\u308b\u307e\u305b\u308b\u3053\u3068\u304c\\u3000\u3042\u308b\u3002', language=Row(name='ja-Hrkt', url='https://pokeapi.co/api/v2/language/1/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='\uc545\ucde8\ub97c \ud48d\uaca8\uc11c\\n\uacf5\uaca9\ud588\uc744 \ub54c \uc0c1\ub300\uac00\\n\ud480\uc8fd\uc744 \ub54c\uac00 \uc788\ub2e4.', language=Row(name='ko', url='https://pokeapi.co/api/v2/language/3/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='\u767c\u51fa\u81ed\u6c23\uff0c\\n\u5728\u653b\u64ca\u7684\u6642\u5019\uff0c\\n\u6709\u6642\u6703\u4f7f\u5c0d\u624b\u754f\u7e2e\u3002', language=Row(name='zh-Hant', url='https://pokeapi.co/api/v2/language/4/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='Le Pok\u00e9mon \u00e9met une odeur si naus\u00e9abonde\\nqu\u2019il peut effrayer sa cible.', language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='L\u00e4sst das Ziel beim Angriff eventuell durch Gestank\\nzur\u00fcckschrecken.', language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='Debido al mal olor que emana, al atacar al rival puede\\nhacerlo retroceder.', language=Row(name='es', url='https://pokeapi.co/api/v2/language/7/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='A volte il cattivo odore emesso dal Pok\u00e9mon\\nfa tentennare i nemici quando attacca.', language=Row(name='it', url='https://pokeapi.co/api/v2/language/8/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='By releasing stench when attacking, this Pok\u00e9mon\\nmay cause the target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='\u81ed\u3044\\u3000\u306b\u304a\u3044\u3092\\u3000\u653e\u3064\u3053\u3068\u306b\u3088\u3063\u3066\\n\u653b\u6483\u3057\u305f\\u3000\u3068\u304d\u306b\\u3000\u76f8\u624b\u3092\\n\u3072\u308b\u307e\u305b\u308b\u3053\u3068\u304c\\u3000\u3042\u308b\u3002', language=Row(name='ja', url='https://pokeapi.co/api/v2/language/11/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='\u901a\u8fc7\u91ca\u653e\u81ed\u81ed\u7684\u6c14\u5473\uff0c\\n\u5728\u653b\u51fb\u7684\u65f6\u5019\uff0c\\n\u6709\u65f6\u4f1a\u4f7f\u5bf9\u624b\u754f\u7f29\u3002', language=Row(name='zh-Hans', url='https://pokeapi.co/api/v2/language/12/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='\u304f\u3055\u3044\\u3000\u306b\u304a\u3044\u3092\\u3000\u306f\u306a\u3064\u3053\u3068\u306b\u3088\u3063\u3066\\n\u3053\u3046\u3052\u304d\u3057\u305f\\u3000\u3068\u304d\u306b\\u3000\u3042\u3044\u3066\u3092\\n\u3072\u308b\u307e\u305b\u308b\u3053\u3068\u304c\\u3000\u3042\u308b\u3002', language=Row(name='ja-Hrkt', url='https://pokeapi.co/api/v2/language/1/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='\uc545\ucde8\ub97c \ud48d\uaca8\uc11c\\n\uacf5\uaca9\ud588\uc744 \ub54c \uc0c1\ub300\uac00\\n\ud480\uc8fd\uc744 \ub54c\uac00 \uc788\ub2e4.', language=Row(name='ko', url='https://pokeapi.co/api/v2/language/3/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='\u767c\u51fa\u81ed\u6c23\uff0c\\n\u5728\u653b\u64ca\u7684\u6642\u5019\uff0c\\n\u6709\u6642\u6703\u4f7f\u5c0d\u624b\u754f\u7e2e\u3002', language=Row(name='zh-Hant', url='https://pokeapi.co/api/v2/language/4/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='Le Pok\u00e9mon \u00e9met une odeur si naus\u00e9abonde\\nqu\u2019il peut effrayer sa cible.', language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='L\u00e4sst das Ziel beim Angriff eventuell durch Gestank\\nzur\u00fcckschrecken.', language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='Debido al mal olor que emana, al atacar al rival puede\\nhacerlo retroceder.', language=Row(name='es', url='https://pokeapi.co/api/v2/language/7/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='A volte il cattivo odore emesso dal Pok\u00e9mon\\nfa tentennare i nemici quando attacca.', language=Row(name='it', url='https://pokeapi.co/api/v2/language/8/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='By releasing stench when attacking, this Pok\u00e9mon\\nmay cause the target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='\u81ed\u3044\\u3000\u306b\u304a\u3044\u3092\\u3000\u653e\u3064\u3053\u3068\u306b\u3088\u3063\u3066\\n\u653b\u6483\u3057\u305f\\u3000\u3068\u304d\u306b\\u3000\u76f8\u624b\u3092\\n\u3072\u308b\u307e\u305b\u308b\u3053\u3068\u304c\\u3000\u3042\u308b\u3002', language=Row(name='ja', url='https://pokeapi.co/api/v2/language/11/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='\u901a\u8fc7\u91ca\u653e\u81ed\u81ed\u7684\u6c14\u5473\uff0c\\n\u5728\u653b\u51fb\u7684\u65f6\u5019\uff0c\\n\u6709\u65f6\u4f1a\u4f7f\u5bf9\u624b\u754f\u7f29\u3002', language=Row(name='zh-Hans', url='https://pokeapi.co/api/v2/language/12/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/'))]"
+                    ]
+                },
+                {
+                    "fieldPath": "generation",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "Row(name='generation-iii', url='https://pokeapi.co/api/v2/generation/3/')"
+                    ]
+                },
+                {
+                    "fieldPath": "id",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "1",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "1"
+                    ]
+                },
+                {
+                    "fieldPath": "is_main_series",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "True"
+                    ]
+                },
+                {
+                    "fieldPath": "name",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "stench",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "stench"
+                    ]
+                },
+                {
+                    "fieldPath": "names",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "[Row(language=Row(name='ja-Hrkt', url='https://pokeapi.co/api/v2/language/1/'), name='\u3042\u304f\u3057\u3085\u3046'), Row(language=Row(name='ko', url='https://pokeapi.co/api/v2/language/3/'), name='\uc545\ucde8'), Row(language=Row(name='zh-Hant', url='https://pokeapi.co/api/v2/language/4/'), name='\u60e1\u81ed'), Row(language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), name='Puanteur'), Row(language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), name='Duftnote'), Row(language=Row(name='es', url='https://pokeapi.co/api/v2/language/7/'), name='Hedor'), Row(language=Row(name='it', url='https://pokeapi.co/api/v2/language/8/'), name='Tanfo'), Row(language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), name='Stench'), Row(language=Row(name='ja', url='https://pokeapi.co/api/v2/language/11/'), name='\u3042\u304f\u3057\u3085\u3046'), Row(language=Row(name='zh-Hans', url='https://pokeapi.co/api/v2/language/12/'), name='\u6076\u81ed')]"
+                    ]
+                },
+                {
+                    "fieldPath": "pokemon",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "[Row(is_hidden=True, pokemon=Row(name='gloom', url='https://pokeapi.co/api/v2/pokemon/44/'), slot=3), Row(is_hidden=False, pokemon=Row(name='grimer', url='https://pokeapi.co/api/v2/pokemon/88/'), slot=1), Row(is_hidden=False, pokemon=Row(name='muk', url='https://pokeapi.co/api/v2/pokemon/89/'), slot=1), Row(is_hidden=False, pokemon=Row(name='stunky', url='https://pokeapi.co/api/v2/pokemon/434/'), slot=1), Row(is_hidden=False, pokemon=Row(name='skuntank', url='https://pokeapi.co/api/v2/pokemon/435/'), slot=1), Row(is_hidden=False, pokemon=Row(name='trubbish', url='https://pokeapi.co/api/v2/pokemon/568/'), slot=1), Row(is_hidden=False, pokemon=Row(name='garbodor', url='https://pokeapi.co/api/v2/pokemon/569/'), slot=1), Row(is_hidden=False, pokemon=Row(name='garbodor-gmax', url='https://pokeapi.co/api/v2/pokemon/10198/'), slot=1)]"
+                    ]
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                },
+                {
+                    "id": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+                    "urn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+                },
+                {
+                    "id": "urn:li:container:98a716614da5246426edd48260406364",
+                    "urn": "urn:li:container:98a716614da5246426edd48260406364"
+                },
+                {
+                    "id": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+                    "urn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_partition_with_partition_autodetect_traverse_all.json b/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_partition_with_partition_autodetect_traverse_all.json
new file mode 100644
index 00000000000000..80f584788fdb26
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_partition_with_partition_autodetect_traverse_all.json
@@ -0,0 +1,2572 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv/part3.csv",
+                "number_of_files": "3",
+                "size_in_bytes": "3539"
+            },
+            "name": "folder_aaa.food_csv",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.food_csv",
+            "platform": "urn:li:dataPlatform:file",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "color",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "height",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "weight",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586833420000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests"
+            },
+            "name": "tests"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration"
+            },
+            "name": "integration"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3"
+            },
+            "name": "s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3/test_data"
+            },
+            "name": "test_data"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3/test_data/local_system"
+            },
+            "name": "local_system"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3/test_data/local_system/folder_a"
+            },
+            "name": "folder_a"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3/test_data/local_system/folder_a/folder_aa"
+            },
+            "name": "folder_aa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                },
+                {
+                    "id": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+                    "urn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa"
+            },
+            "name": "folder_aaa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:98a716614da5246426edd48260406364"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                },
+                {
+                    "id": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+                    "urn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+                },
+                {
+                    "id": "urn:li:container:98a716614da5246426edd48260406364",
+                    "urn": "urn:li:container:98a716614da5246426edd48260406364"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProfile",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "rowCount": 4,
+            "columnCount": 4,
+            "fieldProfiles": [
+                {
+                    "fieldPath": "name",
+                    "uniqueCount": 4,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "apple",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "cookie",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "lasagna",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "pasta",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "apple",
+                        "cookie",
+                        "lasagna",
+                        "pasta"
+                    ]
+                },
+                {
+                    "fieldPath": "weight",
+                    "uniqueCount": 4,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "23",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "49",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "50",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "72",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "23",
+                        "49",
+                        "50",
+                        "72"
+                    ]
+                },
+                {
+                    "fieldPath": "height",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 0.25,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "4",
+                            "frequency": 4
+                        }
+                    ],
+                    "sampleValues": [
+                        "4",
+                        "4",
+                        "4",
+                        "4"
+                    ]
+                },
+                {
+                    "fieldPath": "color",
+                    "uniqueCount": 3,
+                    "uniqueProportion": 0.75,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "brown",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "red",
+                            "frequency": 2
+                        },
+                        {
+                            "value": "yellow",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "brown",
+                        "red",
+                        "red",
+                        "yellow"
+                    ]
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                },
+                {
+                    "id": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+                    "urn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+                },
+                {
+                    "id": "urn:li:container:98a716614da5246426edd48260406364",
+                    "urn": "urn:li:container:98a716614da5246426edd48260406364"
+                },
+                {
+                    "id": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+                    "urn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet/part2.parquet",
+                "number_of_files": "2",
+                "size_in_bytes": "8412"
+            },
+            "name": "folder_aaa.food_parquet",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.food_parquet",
+            "platform": "urn:li:dataPlatform:file",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "color",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "healthy",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "height",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int64",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "weight",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int64",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586833440000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProfile",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "rowCount": 70,
+            "columnCount": 5,
+            "fieldProfiles": [
+                {
+                    "fieldPath": "name",
+                    "uniqueCount": 9,
+                    "uniqueProportion": 0.13043478260869565,
+                    "nullCount": 1,
+                    "nullProportion": 0.014285714285714285,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "NullValue",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "apple",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "chicken",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "cookie",
+                            "frequency": 6
+                        },
+                        {
+                            "value": "hamburger",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "lasagna",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "orange",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "pasta",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "spinach",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "sushi",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "water",
+                            "frequency": 7
+                        }
+                    ],
+                    "sampleValues": [
+                        "apple",
+                        "apple",
+                        "apple",
+                        "chicken",
+                        "cookie",
+                        "cookie",
+                        "cookie",
+                        "lasagna",
+                        "lasagna",
+                        "orange",
+                        "orange",
+                        "pasta",
+                        "pasta",
+                        "pasta",
+                        "pasta",
+                        "spinach",
+                        "spinach",
+                        "spinach",
+                        "water",
+                        "water"
+                    ]
+                },
+                {
+                    "fieldPath": "weight",
+                    "uniqueCount": 10,
+                    "uniqueProportion": 0.14285714285714285,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "10",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "2",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "23",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "32",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "36",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "43",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "49",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "50",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "53",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "72",
+                            "frequency": 7
+                        }
+                    ],
+                    "sampleValues": [
+                        "10",
+                        "10",
+                        "10",
+                        "23",
+                        "23",
+                        "23",
+                        "32",
+                        "32",
+                        "36",
+                        "43",
+                        "43",
+                        "49",
+                        "49",
+                        "50",
+                        "50",
+                        "50",
+                        "72",
+                        "72",
+                        "72",
+                        "72"
+                    ]
+                },
+                {
+                    "fieldPath": "height",
+                    "uniqueCount": 4,
+                    "uniqueProportion": 0.05714285714285714,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "4",
+                            "frequency": 24
+                        },
+                        {
+                            "value": "5",
+                            "frequency": 15
+                        },
+                        {
+                            "value": "6",
+                            "frequency": 23
+                        },
+                        {
+                            "value": "7",
+                            "frequency": 8
+                        }
+                    ],
+                    "sampleValues": [
+                        "4",
+                        "4",
+                        "4",
+                        "4",
+                        "4",
+                        "4",
+                        "4",
+                        "5",
+                        "5",
+                        "5",
+                        "5",
+                        "5",
+                        "6",
+                        "6",
+                        "6",
+                        "6",
+                        "6",
+                        "6",
+                        "7",
+                        "7"
+                    ]
+                },
+                {
+                    "fieldPath": "color",
+                    "uniqueCount": 7,
+                    "uniqueProportion": 0.1,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "blue",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "brown",
+                            "frequency": 14
+                        },
+                        {
+                            "value": "green",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "orange",
+                            "frequency": 14
+                        },
+                        {
+                            "value": "red",
+                            "frequency": 14
+                        },
+                        {
+                            "value": "white",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "yellow",
+                            "frequency": 7
+                        }
+                    ],
+                    "sampleValues": [
+                        "blue",
+                        "blue",
+                        "brown",
+                        "brown",
+                        "brown",
+                        "green",
+                        "green",
+                        "green",
+                        "orange",
+                        "orange",
+                        "red",
+                        "red",
+                        "red",
+                        "red",
+                        "red",
+                        "white",
+                        "yellow",
+                        "yellow",
+                        "yellow",
+                        "yellow"
+                    ]
+                },
+                {
+                    "fieldPath": "healthy",
+                    "uniqueCount": 2,
+                    "uniqueProportion": 0.028985507246376812,
+                    "nullCount": 1,
+                    "nullProportion": 0.014285714285714285,
+                    "sampleValues": [
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "None",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True"
+                    ]
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                },
+                {
+                    "id": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+                    "urn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+                },
+                {
+                    "id": "urn:li:container:98a716614da5246426edd48260406364",
+                    "urn": "urn:li:container:98a716614da5246426edd48260406364"
+                },
+                {
+                    "id": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+                    "urn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2022/month=jan/part3.json",
+                "number_of_files": "13",
+                "size_in_bytes": "188600"
+            },
+            "name": "folder_aaa.pokemon_abilities_json",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.pokemon_abilities_json",
+            "platform": "urn:li:dataPlatform:file",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "effect_changes",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.is_native",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.short_effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.flavor_text",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "id",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "is_main_series",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.is_hidden",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.slot",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586833590000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProfile",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "rowCount": 1,
+            "columnCount": 9,
+            "fieldProfiles": [
+                {
+                    "fieldPath": "effect_changes",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "[Row(effect_entries=[Row(effect='Hat im Kampf keinen Effekt.', language=Row(is_native='no', name='de', url='https://pokeapi.co/api/v2/language/6/')), Row(effect='Has no effect in battle.', language=Row(is_native='yes', name='en', url='https://pokeapi.co/api/v2/language/9/'))], version_group=Row(name='black-white', url='https://pokeapi.co/api/v2/version-group/11/'))]"
+                    ]
+                },
+                {
+                    "fieldPath": "effect_entries",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "[Row(effect='Attacken die Schaden verursachen haben mit jedem Treffer eine 10% Chance das Ziel zur\u00fcckschrecken zu lassen, wenn die Attacke dies nicht bereits als Nebeneffekt hat.\\n\\nDer Effekt stapelt nicht mit dem von getragenen Items.\\n\\nAu\u00dferhalb vom Kampf: Wenn ein Pok\u00e9mon mit dieser F\u00e4higkeit an erster Stelle im Team steht, tauchen wilde Pok\u00e9mon nur halb so oft auf.', language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), short_effect='Mit jedem Treffer besteht eine 10% Chance das Ziel zur\u00fcckschrecken zu lassen.'), Row(effect=\"This Pok\u00e9mon's damaging moves have a 10% chance to make the target flinch with each hit if they do not already cause flinching as a secondary effect.\\n\\nThis ability does not stack with a held item.\\n\\nOverworld: The wild encounter rate is halved while this Pok\u00e9mon is first in the party.\", language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), short_effect='Has a 10% chance of making target Pok\u00e9mon flinch with each hit.')]"
+                    ]
+                },
+                {
+                    "fieldPath": "flavor_text_entries",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "[Row(flavor_text='Helps repel wild POK\u00e9MON.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='ruby-sapphire', url='https://pokeapi.co/api/v2/version-group/5/')), Row(flavor_text='Helps repel wild POK\u00e9MON.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='emerald', url='https://pokeapi.co/api/v2/version-group/6/')), Row(flavor_text='Helps repel wild POK\u00e9MON.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='firered-leafgreen', url='https://pokeapi.co/api/v2/version-group/7/')), Row(flavor_text='The stench helps keep\\nwild Pok\u00e9mon away.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='diamond-pearl', url='https://pokeapi.co/api/v2/version-group/8/')), Row(flavor_text='The stench helps keep\\nwild Pok\u00e9mon away.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='platinum', url='https://pokeapi.co/api/v2/version-group/9/')), Row(flavor_text='The stench helps keep\\nwild Pok\u00e9mon away.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='heartgold-soulsilver', url='https://pokeapi.co/api/v2/version-group/10/')), Row(flavor_text='La puanteur peut\\neffrayer l\u2019adversaire.', language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), version_group=Row(name='black-white', url='https://pokeapi.co/api/v2/version-group/11/')), Row(flavor_text='The stench may cause\\nthe target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='black-white', url='https://pokeapi.co/api/v2/version-group/11/')), Row(flavor_text='The stench may cause\\nthe target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='black-2-white-2', url='https://pokeapi.co/api/v2/version-group/14/')), Row(flavor_text='\u304f\u3055\u304f\u3066\\u3000\u3042\u3044\u3066\u304c\\n\u3072\u308b\u3080\\u3000\u3053\u3068\u304c\u3042\u308b\u3002', language=Row(name='ja-Hrkt', url='https://pokeapi.co/api/v2/language/1/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='\uc545\ucde8 \ub54c\ubb38\uc5d0 \uc0c1\ub300\uac00\\n\ud480\uc8fd\uc744 \ub54c\uac00 \uc788\ub2e4.', language=Row(name='ko', url='https://pokeapi.co/api/v2/language/3/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='La puanteur peut effrayer\\nl\u2019adversaire.', language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='L\u00e4sst den Gegner durch Gestank\\nzur\u00fcckschrecken.', language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='Es posible que el rival retroceda\\npor el mal olor.', language=Row(name='es', url='https://pokeapi.co/api/v2/language/7/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='A volte il cattivo odore\\nfa tentennare i nemici.', language=Row(name='it', url='https://pokeapi.co/api/v2/language/8/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='The stench may cause\\nthe target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='\u81ed\u304f\u3066\\u3000\u76f8\u624b\u304c\\n\u3072\u308b\u3080\\u3000\u3053\u3068\u304c\u3042\u308b\u3002', language=Row(name='ja', url='https://pokeapi.co/api/v2/language/11/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='\u304f\u3055\u304f\u3066\\u3000\u3042\u3044\u3066\u304c\\n\u3072\u308b\u3080\\u3000\u3053\u3068\u304c\u3042\u308b\u3002', language=Row(name='ja-Hrkt', url='https://pokeapi.co/api/v2/language/1/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='\uc545\ucde8 \ub54c\ubb38\uc5d0 \uc0c1\ub300\uac00\\n\ud480\uc8fd\uc744 \ub54c\uac00 \uc788\ub2e4.', language=Row(name='ko', url='https://pokeapi.co/api/v2/language/3/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='La puanteur peut effrayer\\nl\u2019adversaire.', language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='L\u00e4sst den Gegner durch Gestank\\nzur\u00fcckschrecken.', language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='Es posible que el rival retroceda\\npor el mal olor.', language=Row(name='es', url='https://pokeapi.co/api/v2/language/7/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='A volte il cattivo odore\\nfa tentennare i nemici.', language=Row(name='it', url='https://pokeapi.co/api/v2/language/8/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='The stench may cause\\nthe target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='\u81ed\u304f\u3066\\u3000\u76f8\u624b\u304c\\n\u3072\u308b\u3080\\u3000\u3053\u3068\u304c\u3042\u308b\u3002', language=Row(name='ja', url='https://pokeapi.co/api/v2/language/11/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='\u304f\u3055\u3044\\u3000\u306b\u304a\u3044\u3092\\u3000\u306f\u306a\u3064\u3053\u3068\u306b\u3088\u3063\u3066\\n\u3053\u3046\u3052\u304d\u3057\u305f\\u3000\u3068\u304d\u306b\\u3000\u3042\u3044\u3066\u3092\\n\u3072\u308b\u307e\u305b\u308b\u3053\u3068\u304c\\u3000\u3042\u308b\u3002', language=Row(name='ja-Hrkt', url='https://pokeapi.co/api/v2/language/1/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='\uc545\ucde8\ub97c \ud48d\uaca8\uc11c\\n\uacf5\uaca9\ud588\uc744 \ub54c \uc0c1\ub300\uac00\\n\ud480\uc8fd\uc744 \ub54c\uac00 \uc788\ub2e4.', language=Row(name='ko', url='https://pokeapi.co/api/v2/language/3/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='\u767c\u51fa\u81ed\u6c23\uff0c\\n\u5728\u653b\u64ca\u7684\u6642\u5019\uff0c\\n\u6709\u6642\u6703\u4f7f\u5c0d\u624b\u754f\u7e2e\u3002', language=Row(name='zh-Hant', url='https://pokeapi.co/api/v2/language/4/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='Le Pok\u00e9mon \u00e9met une odeur si naus\u00e9abonde\\nqu\u2019il peut effrayer sa cible.', language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='L\u00e4sst das Ziel beim Angriff eventuell durch Gestank\\nzur\u00fcckschrecken.', language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='Debido al mal olor que emana, al atacar al rival puede\\nhacerlo retroceder.', language=Row(name='es', url='https://pokeapi.co/api/v2/language/7/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='A volte il cattivo odore emesso dal Pok\u00e9mon\\nfa tentennare i nemici quando attacca.', language=Row(name='it', url='https://pokeapi.co/api/v2/language/8/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='By releasing stench when attacking, this Pok\u00e9mon\\nmay cause the target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='\u81ed\u3044\\u3000\u306b\u304a\u3044\u3092\\u3000\u653e\u3064\u3053\u3068\u306b\u3088\u3063\u3066\\n\u653b\u6483\u3057\u305f\\u3000\u3068\u304d\u306b\\u3000\u76f8\u624b\u3092\\n\u3072\u308b\u307e\u305b\u308b\u3053\u3068\u304c\\u3000\u3042\u308b\u3002', language=Row(name='ja', url='https://pokeapi.co/api/v2/language/11/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='\u901a\u8fc7\u91ca\u653e\u81ed\u81ed\u7684\u6c14\u5473\uff0c\\n\u5728\u653b\u51fb\u7684\u65f6\u5019\uff0c\\n\u6709\u65f6\u4f1a\u4f7f\u5bf9\u624b\u754f\u7f29\u3002', language=Row(name='zh-Hans', url='https://pokeapi.co/api/v2/language/12/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='\u304f\u3055\u3044\\u3000\u306b\u304a\u3044\u3092\\u3000\u306f\u306a\u3064\u3053\u3068\u306b\u3088\u3063\u3066\\n\u3053\u3046\u3052\u304d\u3057\u305f\\u3000\u3068\u304d\u306b\\u3000\u3042\u3044\u3066\u3092\\n\u3072\u308b\u307e\u305b\u308b\u3053\u3068\u304c\\u3000\u3042\u308b\u3002', language=Row(name='ja-Hrkt', url='https://pokeapi.co/api/v2/language/1/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='\uc545\ucde8\ub97c \ud48d\uaca8\uc11c\\n\uacf5\uaca9\ud588\uc744 \ub54c \uc0c1\ub300\uac00\\n\ud480\uc8fd\uc744 \ub54c\uac00 \uc788\ub2e4.', language=Row(name='ko', url='https://pokeapi.co/api/v2/language/3/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='\u767c\u51fa\u81ed\u6c23\uff0c\\n\u5728\u653b\u64ca\u7684\u6642\u5019\uff0c\\n\u6709\u6642\u6703\u4f7f\u5c0d\u624b\u754f\u7e2e\u3002', language=Row(name='zh-Hant', url='https://pokeapi.co/api/v2/language/4/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='Le Pok\u00e9mon \u00e9met une odeur si naus\u00e9abonde\\nqu\u2019il peut effrayer sa cible.', language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='L\u00e4sst das Ziel beim Angriff eventuell durch Gestank\\nzur\u00fcckschrecken.', language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='Debido al mal olor que emana, al atacar al rival puede\\nhacerlo retroceder.', language=Row(name='es', url='https://pokeapi.co/api/v2/language/7/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='A volte il cattivo odore emesso dal Pok\u00e9mon\\nfa tentennare i nemici quando attacca.', language=Row(name='it', url='https://pokeapi.co/api/v2/language/8/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='By releasing stench when attacking, this Pok\u00e9mon\\nmay cause the target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='\u81ed\u3044\\u3000\u306b\u304a\u3044\u3092\\u3000\u653e\u3064\u3053\u3068\u306b\u3088\u3063\u3066\\n\u653b\u6483\u3057\u305f\\u3000\u3068\u304d\u306b\\u3000\u76f8\u624b\u3092\\n\u3072\u308b\u307e\u305b\u308b\u3053\u3068\u304c\\u3000\u3042\u308b\u3002', language=Row(name='ja', url='https://pokeapi.co/api/v2/language/11/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='\u901a\u8fc7\u91ca\u653e\u81ed\u81ed\u7684\u6c14\u5473\uff0c\\n\u5728\u653b\u51fb\u7684\u65f6\u5019\uff0c\\n\u6709\u65f6\u4f1a\u4f7f\u5bf9\u624b\u754f\u7f29\u3002', language=Row(name='zh-Hans', url='https://pokeapi.co/api/v2/language/12/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/'))]"
+                    ]
+                },
+                {
+                    "fieldPath": "generation",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "Row(name='generation-iii', url='https://pokeapi.co/api/v2/generation/3/')"
+                    ]
+                },
+                {
+                    "fieldPath": "id",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "1",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "1"
+                    ]
+                },
+                {
+                    "fieldPath": "is_main_series",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "True"
+                    ]
+                },
+                {
+                    "fieldPath": "name",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "stench",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "stench"
+                    ]
+                },
+                {
+                    "fieldPath": "names",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "[Row(language=Row(name='ja-Hrkt', url='https://pokeapi.co/api/v2/language/1/'), name='\u3042\u304f\u3057\u3085\u3046'), Row(language=Row(name='ko', url='https://pokeapi.co/api/v2/language/3/'), name='\uc545\ucde8'), Row(language=Row(name='zh-Hant', url='https://pokeapi.co/api/v2/language/4/'), name='\u60e1\u81ed'), Row(language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), name='Puanteur'), Row(language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), name='Duftnote'), Row(language=Row(name='es', url='https://pokeapi.co/api/v2/language/7/'), name='Hedor'), Row(language=Row(name='it', url='https://pokeapi.co/api/v2/language/8/'), name='Tanfo'), Row(language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), name='Stench'), Row(language=Row(name='ja', url='https://pokeapi.co/api/v2/language/11/'), name='\u3042\u304f\u3057\u3085\u3046'), Row(language=Row(name='zh-Hans', url='https://pokeapi.co/api/v2/language/12/'), name='\u6076\u81ed')]"
+                    ]
+                },
+                {
+                    "fieldPath": "pokemon",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "[Row(is_hidden=True, pokemon=Row(name='gloom', url='https://pokeapi.co/api/v2/pokemon/44/'), slot=3), Row(is_hidden=False, pokemon=Row(name='grimer', url='https://pokeapi.co/api/v2/pokemon/88/'), slot=1), Row(is_hidden=False, pokemon=Row(name='muk', url='https://pokeapi.co/api/v2/pokemon/89/'), slot=1), Row(is_hidden=False, pokemon=Row(name='stunky', url='https://pokeapi.co/api/v2/pokemon/434/'), slot=1), Row(is_hidden=False, pokemon=Row(name='skuntank', url='https://pokeapi.co/api/v2/pokemon/435/'), slot=1), Row(is_hidden=False, pokemon=Row(name='trubbish', url='https://pokeapi.co/api/v2/pokemon/568/'), slot=1), Row(is_hidden=False, pokemon=Row(name='garbodor', url='https://pokeapi.co/api/v2/pokemon/569/'), slot=1), Row(is_hidden=False, pokemon=Row(name='garbodor-gmax', url='https://pokeapi.co/api/v2/pokemon/10198/'), slot=1)]"
+                    ]
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                },
+                {
+                    "id": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+                    "urn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+                },
+                {
+                    "id": "urn:li:container:98a716614da5246426edd48260406364",
+                    "urn": "urn:li:container:98a716614da5246426edd48260406364"
+                },
+                {
+                    "id": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+                    "urn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_partition_with_partition_autodetect_traverse_min_max.json b/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_partition_with_partition_autodetect_traverse_min_max.json
new file mode 100644
index 00000000000000..a384a8f1e501de
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/golden-files/local/golden_mces_folder_partition_with_partition_autodetect_traverse_min_max.json
@@ -0,0 +1,2572 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv/part3.csv",
+                "number_of_files": "3",
+                "size_in_bytes": "3539"
+            },
+            "name": "folder_aaa.food_csv",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.food_csv",
+            "platform": "urn:li:dataPlatform:file",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "color",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "height",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "weight",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586833420000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests"
+            },
+            "name": "tests"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration"
+            },
+            "name": "integration"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3"
+            },
+            "name": "s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3/test_data"
+            },
+            "name": "test_data"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3/test_data/local_system"
+            },
+            "name": "local_system"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3/test_data/local_system/folder_a"
+            },
+            "name": "folder_a"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3/test_data/local_system/folder_a/folder_aa"
+            },
+            "name": "folder_aa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:98a716614da5246426edd48260406364",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                },
+                {
+                    "id": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+                    "urn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "file",
+                "env": "UAT",
+                "folder_abs_path": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa"
+            },
+            "name": "folder_aaa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:file"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:98a716614da5246426edd48260406364"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                },
+                {
+                    "id": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+                    "urn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+                },
+                {
+                    "id": "urn:li:container:98a716614da5246426edd48260406364",
+                    "urn": "urn:li:container:98a716614da5246426edd48260406364"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProfile",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "rowCount": 4,
+            "columnCount": 4,
+            "fieldProfiles": [
+                {
+                    "fieldPath": "name",
+                    "uniqueCount": 4,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "apple",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "cookie",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "lasagna",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "pasta",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "apple",
+                        "cookie",
+                        "lasagna",
+                        "pasta"
+                    ]
+                },
+                {
+                    "fieldPath": "weight",
+                    "uniqueCount": 4,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "23",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "49",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "50",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "72",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "23",
+                        "49",
+                        "50",
+                        "72"
+                    ]
+                },
+                {
+                    "fieldPath": "height",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 0.25,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "4",
+                            "frequency": 4
+                        }
+                    ],
+                    "sampleValues": [
+                        "4",
+                        "4",
+                        "4",
+                        "4"
+                    ]
+                },
+                {
+                    "fieldPath": "color",
+                    "uniqueCount": 3,
+                    "uniqueProportion": 0.75,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "brown",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "red",
+                            "frequency": 2
+                        },
+                        {
+                            "value": "yellow",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "brown",
+                        "red",
+                        "red",
+                        "yellow"
+                    ]
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                },
+                {
+                    "id": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+                    "urn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+                },
+                {
+                    "id": "urn:li:container:98a716614da5246426edd48260406364",
+                    "urn": "urn:li:container:98a716614da5246426edd48260406364"
+                },
+                {
+                    "id": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+                    "urn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet/part2.parquet",
+                "number_of_files": "2",
+                "size_in_bytes": "8412"
+            },
+            "name": "folder_aaa.food_parquet",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.food_parquet",
+            "platform": "urn:li:dataPlatform:file",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "color",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "healthy",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "height",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int64",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "weight",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int64",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586833440000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProfile",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "rowCount": 70,
+            "columnCount": 5,
+            "fieldProfiles": [
+                {
+                    "fieldPath": "name",
+                    "uniqueCount": 9,
+                    "uniqueProportion": 0.13043478260869565,
+                    "nullCount": 1,
+                    "nullProportion": 0.014285714285714285,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "NullValue",
+                            "frequency": 1
+                        },
+                        {
+                            "value": "apple",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "chicken",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "cookie",
+                            "frequency": 6
+                        },
+                        {
+                            "value": "hamburger",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "lasagna",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "orange",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "pasta",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "spinach",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "sushi",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "water",
+                            "frequency": 7
+                        }
+                    ],
+                    "sampleValues": [
+                        "apple",
+                        "apple",
+                        "apple",
+                        "chicken",
+                        "cookie",
+                        "cookie",
+                        "cookie",
+                        "lasagna",
+                        "lasagna",
+                        "orange",
+                        "orange",
+                        "pasta",
+                        "pasta",
+                        "pasta",
+                        "pasta",
+                        "spinach",
+                        "spinach",
+                        "spinach",
+                        "water",
+                        "water"
+                    ]
+                },
+                {
+                    "fieldPath": "weight",
+                    "uniqueCount": 10,
+                    "uniqueProportion": 0.14285714285714285,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "10",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "2",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "23",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "32",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "36",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "43",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "49",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "50",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "53",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "72",
+                            "frequency": 7
+                        }
+                    ],
+                    "sampleValues": [
+                        "10",
+                        "10",
+                        "10",
+                        "23",
+                        "23",
+                        "23",
+                        "32",
+                        "32",
+                        "36",
+                        "43",
+                        "43",
+                        "49",
+                        "49",
+                        "50",
+                        "50",
+                        "50",
+                        "72",
+                        "72",
+                        "72",
+                        "72"
+                    ]
+                },
+                {
+                    "fieldPath": "height",
+                    "uniqueCount": 4,
+                    "uniqueProportion": 0.05714285714285714,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "4",
+                            "frequency": 24
+                        },
+                        {
+                            "value": "5",
+                            "frequency": 15
+                        },
+                        {
+                            "value": "6",
+                            "frequency": 23
+                        },
+                        {
+                            "value": "7",
+                            "frequency": 8
+                        }
+                    ],
+                    "sampleValues": [
+                        "4",
+                        "4",
+                        "4",
+                        "4",
+                        "4",
+                        "4",
+                        "4",
+                        "5",
+                        "5",
+                        "5",
+                        "5",
+                        "5",
+                        "6",
+                        "6",
+                        "6",
+                        "6",
+                        "6",
+                        "6",
+                        "7",
+                        "7"
+                    ]
+                },
+                {
+                    "fieldPath": "color",
+                    "uniqueCount": 7,
+                    "uniqueProportion": 0.1,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "blue",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "brown",
+                            "frequency": 14
+                        },
+                        {
+                            "value": "green",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "orange",
+                            "frequency": 14
+                        },
+                        {
+                            "value": "red",
+                            "frequency": 14
+                        },
+                        {
+                            "value": "white",
+                            "frequency": 7
+                        },
+                        {
+                            "value": "yellow",
+                            "frequency": 7
+                        }
+                    ],
+                    "sampleValues": [
+                        "blue",
+                        "blue",
+                        "brown",
+                        "brown",
+                        "brown",
+                        "green",
+                        "green",
+                        "green",
+                        "orange",
+                        "orange",
+                        "red",
+                        "red",
+                        "red",
+                        "red",
+                        "red",
+                        "white",
+                        "yellow",
+                        "yellow",
+                        "yellow",
+                        "yellow"
+                    ]
+                },
+                {
+                    "fieldPath": "healthy",
+                    "uniqueCount": 2,
+                    "uniqueProportion": 0.028985507246376812,
+                    "nullCount": 1,
+                    "nullProportion": 0.014285714285714285,
+                    "sampleValues": [
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "False",
+                        "None",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True",
+                        "True"
+                    ]
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                },
+                {
+                    "id": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+                    "urn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+                },
+                {
+                    "id": "urn:li:container:98a716614da5246426edd48260406364",
+                    "urn": "urn:li:container:98a716614da5246426edd48260406364"
+                },
+                {
+                    "id": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+                    "urn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2022/month=jan/part3.json",
+                "number_of_files": "13",
+                "size_in_bytes": "188600"
+            },
+            "name": "folder_aaa.pokemon_abilities_json",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.pokemon_abilities_json",
+            "platform": "urn:li:dataPlatform:file",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "effect_changes",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.is_native",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.short_effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.flavor_text",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "id",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "is_main_series",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.is_hidden",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.slot",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586833590000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProfile",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "rowCount": 1,
+            "columnCount": 9,
+            "fieldProfiles": [
+                {
+                    "fieldPath": "effect_changes",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "[Row(effect_entries=[Row(effect='Hat im Kampf keinen Effekt.', language=Row(is_native='no', name='de', url='https://pokeapi.co/api/v2/language/6/')), Row(effect='Has no effect in battle.', language=Row(is_native='yes', name='en', url='https://pokeapi.co/api/v2/language/9/'))], version_group=Row(name='black-white', url='https://pokeapi.co/api/v2/version-group/11/'))]"
+                    ]
+                },
+                {
+                    "fieldPath": "effect_entries",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "[Row(effect='Attacken die Schaden verursachen haben mit jedem Treffer eine 10% Chance das Ziel zur\u00fcckschrecken zu lassen, wenn die Attacke dies nicht bereits als Nebeneffekt hat.\\n\\nDer Effekt stapelt nicht mit dem von getragenen Items.\\n\\nAu\u00dferhalb vom Kampf: Wenn ein Pok\u00e9mon mit dieser F\u00e4higkeit an erster Stelle im Team steht, tauchen wilde Pok\u00e9mon nur halb so oft auf.', language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), short_effect='Mit jedem Treffer besteht eine 10% Chance das Ziel zur\u00fcckschrecken zu lassen.'), Row(effect=\"This Pok\u00e9mon's damaging moves have a 10% chance to make the target flinch with each hit if they do not already cause flinching as a secondary effect.\\n\\nThis ability does not stack with a held item.\\n\\nOverworld: The wild encounter rate is halved while this Pok\u00e9mon is first in the party.\", language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), short_effect='Has a 10% chance of making target Pok\u00e9mon flinch with each hit.')]"
+                    ]
+                },
+                {
+                    "fieldPath": "flavor_text_entries",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "[Row(flavor_text='Helps repel wild POK\u00e9MON.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='ruby-sapphire', url='https://pokeapi.co/api/v2/version-group/5/')), Row(flavor_text='Helps repel wild POK\u00e9MON.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='emerald', url='https://pokeapi.co/api/v2/version-group/6/')), Row(flavor_text='Helps repel wild POK\u00e9MON.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='firered-leafgreen', url='https://pokeapi.co/api/v2/version-group/7/')), Row(flavor_text='The stench helps keep\\nwild Pok\u00e9mon away.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='diamond-pearl', url='https://pokeapi.co/api/v2/version-group/8/')), Row(flavor_text='The stench helps keep\\nwild Pok\u00e9mon away.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='platinum', url='https://pokeapi.co/api/v2/version-group/9/')), Row(flavor_text='The stench helps keep\\nwild Pok\u00e9mon away.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='heartgold-soulsilver', url='https://pokeapi.co/api/v2/version-group/10/')), Row(flavor_text='La puanteur peut\\neffrayer l\u2019adversaire.', language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), version_group=Row(name='black-white', url='https://pokeapi.co/api/v2/version-group/11/')), Row(flavor_text='The stench may cause\\nthe target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='black-white', url='https://pokeapi.co/api/v2/version-group/11/')), Row(flavor_text='The stench may cause\\nthe target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='black-2-white-2', url='https://pokeapi.co/api/v2/version-group/14/')), Row(flavor_text='\u304f\u3055\u304f\u3066\\u3000\u3042\u3044\u3066\u304c\\n\u3072\u308b\u3080\\u3000\u3053\u3068\u304c\u3042\u308b\u3002', language=Row(name='ja-Hrkt', url='https://pokeapi.co/api/v2/language/1/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='\uc545\ucde8 \ub54c\ubb38\uc5d0 \uc0c1\ub300\uac00\\n\ud480\uc8fd\uc744 \ub54c\uac00 \uc788\ub2e4.', language=Row(name='ko', url='https://pokeapi.co/api/v2/language/3/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='La puanteur peut effrayer\\nl\u2019adversaire.', language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='L\u00e4sst den Gegner durch Gestank\\nzur\u00fcckschrecken.', language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='Es posible que el rival retroceda\\npor el mal olor.', language=Row(name='es', url='https://pokeapi.co/api/v2/language/7/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='A volte il cattivo odore\\nfa tentennare i nemici.', language=Row(name='it', url='https://pokeapi.co/api/v2/language/8/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='The stench may cause\\nthe target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='\u81ed\u304f\u3066\\u3000\u76f8\u624b\u304c\\n\u3072\u308b\u3080\\u3000\u3053\u3068\u304c\u3042\u308b\u3002', language=Row(name='ja', url='https://pokeapi.co/api/v2/language/11/'), version_group=Row(name='x-y', url='https://pokeapi.co/api/v2/version-group/15/')), Row(flavor_text='\u304f\u3055\u304f\u3066\\u3000\u3042\u3044\u3066\u304c\\n\u3072\u308b\u3080\\u3000\u3053\u3068\u304c\u3042\u308b\u3002', language=Row(name='ja-Hrkt', url='https://pokeapi.co/api/v2/language/1/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='\uc545\ucde8 \ub54c\ubb38\uc5d0 \uc0c1\ub300\uac00\\n\ud480\uc8fd\uc744 \ub54c\uac00 \uc788\ub2e4.', language=Row(name='ko', url='https://pokeapi.co/api/v2/language/3/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='La puanteur peut effrayer\\nl\u2019adversaire.', language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='L\u00e4sst den Gegner durch Gestank\\nzur\u00fcckschrecken.', language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='Es posible que el rival retroceda\\npor el mal olor.', language=Row(name='es', url='https://pokeapi.co/api/v2/language/7/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='A volte il cattivo odore\\nfa tentennare i nemici.', language=Row(name='it', url='https://pokeapi.co/api/v2/language/8/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='The stench may cause\\nthe target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='\u81ed\u304f\u3066\\u3000\u76f8\u624b\u304c\\n\u3072\u308b\u3080\\u3000\u3053\u3068\u304c\u3042\u308b\u3002', language=Row(name='ja', url='https://pokeapi.co/api/v2/language/11/'), version_group=Row(name='omega-ruby-alpha-sapphire', url='https://pokeapi.co/api/v2/version-group/16/')), Row(flavor_text='\u304f\u3055\u3044\\u3000\u306b\u304a\u3044\u3092\\u3000\u306f\u306a\u3064\u3053\u3068\u306b\u3088\u3063\u3066\\n\u3053\u3046\u3052\u304d\u3057\u305f\\u3000\u3068\u304d\u306b\\u3000\u3042\u3044\u3066\u3092\\n\u3072\u308b\u307e\u305b\u308b\u3053\u3068\u304c\\u3000\u3042\u308b\u3002', language=Row(name='ja-Hrkt', url='https://pokeapi.co/api/v2/language/1/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='\uc545\ucde8\ub97c \ud48d\uaca8\uc11c\\n\uacf5\uaca9\ud588\uc744 \ub54c \uc0c1\ub300\uac00\\n\ud480\uc8fd\uc744 \ub54c\uac00 \uc788\ub2e4.', language=Row(name='ko', url='https://pokeapi.co/api/v2/language/3/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='\u767c\u51fa\u81ed\u6c23\uff0c\\n\u5728\u653b\u64ca\u7684\u6642\u5019\uff0c\\n\u6709\u6642\u6703\u4f7f\u5c0d\u624b\u754f\u7e2e\u3002', language=Row(name='zh-Hant', url='https://pokeapi.co/api/v2/language/4/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='Le Pok\u00e9mon \u00e9met une odeur si naus\u00e9abonde\\nqu\u2019il peut effrayer sa cible.', language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='L\u00e4sst das Ziel beim Angriff eventuell durch Gestank\\nzur\u00fcckschrecken.', language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='Debido al mal olor que emana, al atacar al rival puede\\nhacerlo retroceder.', language=Row(name='es', url='https://pokeapi.co/api/v2/language/7/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='A volte il cattivo odore emesso dal Pok\u00e9mon\\nfa tentennare i nemici quando attacca.', language=Row(name='it', url='https://pokeapi.co/api/v2/language/8/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='By releasing stench when attacking, this Pok\u00e9mon\\nmay cause the target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='\u81ed\u3044\\u3000\u306b\u304a\u3044\u3092\\u3000\u653e\u3064\u3053\u3068\u306b\u3088\u3063\u3066\\n\u653b\u6483\u3057\u305f\\u3000\u3068\u304d\u306b\\u3000\u76f8\u624b\u3092\\n\u3072\u308b\u307e\u305b\u308b\u3053\u3068\u304c\\u3000\u3042\u308b\u3002', language=Row(name='ja', url='https://pokeapi.co/api/v2/language/11/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='\u901a\u8fc7\u91ca\u653e\u81ed\u81ed\u7684\u6c14\u5473\uff0c\\n\u5728\u653b\u51fb\u7684\u65f6\u5019\uff0c\\n\u6709\u65f6\u4f1a\u4f7f\u5bf9\u624b\u754f\u7f29\u3002', language=Row(name='zh-Hans', url='https://pokeapi.co/api/v2/language/12/'), version_group=Row(name='sun-moon', url='https://pokeapi.co/api/v2/version-group/17/')), Row(flavor_text='\u304f\u3055\u3044\\u3000\u306b\u304a\u3044\u3092\\u3000\u306f\u306a\u3064\u3053\u3068\u306b\u3088\u3063\u3066\\n\u3053\u3046\u3052\u304d\u3057\u305f\\u3000\u3068\u304d\u306b\\u3000\u3042\u3044\u3066\u3092\\n\u3072\u308b\u307e\u305b\u308b\u3053\u3068\u304c\\u3000\u3042\u308b\u3002', language=Row(name='ja-Hrkt', url='https://pokeapi.co/api/v2/language/1/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='\uc545\ucde8\ub97c \ud48d\uaca8\uc11c\\n\uacf5\uaca9\ud588\uc744 \ub54c \uc0c1\ub300\uac00\\n\ud480\uc8fd\uc744 \ub54c\uac00 \uc788\ub2e4.', language=Row(name='ko', url='https://pokeapi.co/api/v2/language/3/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='\u767c\u51fa\u81ed\u6c23\uff0c\\n\u5728\u653b\u64ca\u7684\u6642\u5019\uff0c\\n\u6709\u6642\u6703\u4f7f\u5c0d\u624b\u754f\u7e2e\u3002', language=Row(name='zh-Hant', url='https://pokeapi.co/api/v2/language/4/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='Le Pok\u00e9mon \u00e9met une odeur si naus\u00e9abonde\\nqu\u2019il peut effrayer sa cible.', language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='L\u00e4sst das Ziel beim Angriff eventuell durch Gestank\\nzur\u00fcckschrecken.', language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='Debido al mal olor que emana, al atacar al rival puede\\nhacerlo retroceder.', language=Row(name='es', url='https://pokeapi.co/api/v2/language/7/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='A volte il cattivo odore emesso dal Pok\u00e9mon\\nfa tentennare i nemici quando attacca.', language=Row(name='it', url='https://pokeapi.co/api/v2/language/8/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='By releasing stench when attacking, this Pok\u00e9mon\\nmay cause the target to flinch.', language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='\u81ed\u3044\\u3000\u306b\u304a\u3044\u3092\\u3000\u653e\u3064\u3053\u3068\u306b\u3088\u3063\u3066\\n\u653b\u6483\u3057\u305f\\u3000\u3068\u304d\u306b\\u3000\u76f8\u624b\u3092\\n\u3072\u308b\u307e\u305b\u308b\u3053\u3068\u304c\\u3000\u3042\u308b\u3002', language=Row(name='ja', url='https://pokeapi.co/api/v2/language/11/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/')), Row(flavor_text='\u901a\u8fc7\u91ca\u653e\u81ed\u81ed\u7684\u6c14\u5473\uff0c\\n\u5728\u653b\u51fb\u7684\u65f6\u5019\uff0c\\n\u6709\u65f6\u4f1a\u4f7f\u5bf9\u624b\u754f\u7f29\u3002', language=Row(name='zh-Hans', url='https://pokeapi.co/api/v2/language/12/'), version_group=Row(name='ultra-sun-ultra-moon', url='https://pokeapi.co/api/v2/version-group/18/'))]"
+                    ]
+                },
+                {
+                    "fieldPath": "generation",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "Row(name='generation-iii', url='https://pokeapi.co/api/v2/generation/3/')"
+                    ]
+                },
+                {
+                    "fieldPath": "id",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "1",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "1"
+                    ]
+                },
+                {
+                    "fieldPath": "is_main_series",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "True"
+                    ]
+                },
+                {
+                    "fieldPath": "name",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "distinctValueFrequencies": [
+                        {
+                            "value": "stench",
+                            "frequency": 1
+                        }
+                    ],
+                    "sampleValues": [
+                        "stench"
+                    ]
+                },
+                {
+                    "fieldPath": "names",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "[Row(language=Row(name='ja-Hrkt', url='https://pokeapi.co/api/v2/language/1/'), name='\u3042\u304f\u3057\u3085\u3046'), Row(language=Row(name='ko', url='https://pokeapi.co/api/v2/language/3/'), name='\uc545\ucde8'), Row(language=Row(name='zh-Hant', url='https://pokeapi.co/api/v2/language/4/'), name='\u60e1\u81ed'), Row(language=Row(name='fr', url='https://pokeapi.co/api/v2/language/5/'), name='Puanteur'), Row(language=Row(name='de', url='https://pokeapi.co/api/v2/language/6/'), name='Duftnote'), Row(language=Row(name='es', url='https://pokeapi.co/api/v2/language/7/'), name='Hedor'), Row(language=Row(name='it', url='https://pokeapi.co/api/v2/language/8/'), name='Tanfo'), Row(language=Row(name='en', url='https://pokeapi.co/api/v2/language/9/'), name='Stench'), Row(language=Row(name='ja', url='https://pokeapi.co/api/v2/language/11/'), name='\u3042\u304f\u3057\u3085\u3046'), Row(language=Row(name='zh-Hans', url='https://pokeapi.co/api/v2/language/12/'), name='\u6076\u81ed')]"
+                    ]
+                },
+                {
+                    "fieldPath": "pokemon",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 1.0,
+                    "nullCount": 0,
+                    "nullProportion": 0.0,
+                    "sampleValues": [
+                        "[Row(is_hidden=True, pokemon=Row(name='gloom', url='https://pokeapi.co/api/v2/pokemon/44/'), slot=3), Row(is_hidden=False, pokemon=Row(name='grimer', url='https://pokeapi.co/api/v2/pokemon/88/'), slot=1), Row(is_hidden=False, pokemon=Row(name='muk', url='https://pokeapi.co/api/v2/pokemon/89/'), slot=1), Row(is_hidden=False, pokemon=Row(name='stunky', url='https://pokeapi.co/api/v2/pokemon/434/'), slot=1), Row(is_hidden=False, pokemon=Row(name='skuntank', url='https://pokeapi.co/api/v2/pokemon/435/'), slot=1), Row(is_hidden=False, pokemon=Row(name='trubbish', url='https://pokeapi.co/api/v2/pokemon/568/'), slot=1), Row(is_hidden=False, pokemon=Row(name='garbodor', url='https://pokeapi.co/api/v2/pokemon/569/'), slot=1), Row(is_hidden=False, pokemon=Row(name='garbodor-gmax', url='https://pokeapi.co/api/v2/pokemon/10198/'), slot=1)]"
+                    ]
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc",
+                    "urn": "urn:li:container:583fb3ef3a2b226ea2630157568eb7dc"
+                },
+                {
+                    "id": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886",
+                    "urn": "urn:li:container:bc816cf2df9acd90fcefa42dc425d886"
+                },
+                {
+                    "id": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4",
+                    "urn": "urn:li:container:d20e88ff88a6de6e53e437d342e218f4"
+                },
+                {
+                    "id": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50",
+                    "urn": "urn:li:container:f6ff9cd64806a7bb00e2e3bf37acca50"
+                },
+                {
+                    "id": "urn:li:container:93525defb812252106d3b0c08a55e39a",
+                    "urn": "urn:li:container:93525defb812252106d3b0c08a55e39a"
+                },
+                {
+                    "id": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156",
+                    "urn": "urn:li:container:48a8653fc4afb55b12cd8d0280e09156"
+                },
+                {
+                    "id": "urn:li:container:98a716614da5246426edd48260406364",
+                    "urn": "urn:li:container:98a716614da5246426edd48260406364"
+                },
+                {
+                    "id": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec",
+                    "urn": "urn:li:container:a0904d16a673fde8cbc8d0f2e167ecec"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:file,tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_file_inference_without_extension.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_file_inference_without_extension.json
new file mode 100644
index 00000000000000..d50f00efacaa06
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_file_inference_without_extension.json
@@ -0,0 +1,769 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/no_extension/small,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/no_extension/small,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/no_extension/small",
+                "number_of_files": "1",
+                "size_in_bytes": "172"
+            },
+            "name": "small",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/no_extension/small,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "small",
+            "platform": "urn:li:dataPlatform:s3",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "1st chord",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "2nd chord",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "3rd chord",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "4th chord",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "Progression Quality",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/no_extension/small,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "type": "FULL_TABLE",
+                "partition": "FULL_TABLE_SNAPSHOT"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586848010000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "instance": "test-platform-instance",
+                "env": "DEV",
+                "bucket_name": "my-test-bucket"
+            },
+            "name": "my-test-bucket"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "S3 bucket"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "instance": "test-platform-instance",
+                "env": "DEV",
+                "folder_abs_path": "my-test-bucket/folder_a"
+            },
+            "name": "folder_a"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+                },
+                {
+                    "id": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+                    "urn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "instance": "test-platform-instance",
+                "env": "DEV",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
+            },
+            "name": "folder_aa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:c8d940d2010edd365619411b385b11e4"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+                },
+                {
+                    "id": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+                    "urn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
+                },
+                {
+                    "id": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+                    "urn": "urn:li:container:c8d940d2010edd365619411b385b11e4"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "instance": "test-platform-instance",
+                "env": "DEV",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa/folder_aaa"
+            },
+            "name": "folder_aaa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:b0037296cdd497e3137aa0628b8687bc"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+                },
+                {
+                    "id": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+                    "urn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
+                },
+                {
+                    "id": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+                    "urn": "urn:li:container:c8d940d2010edd365619411b385b11e4"
+                },
+                {
+                    "id": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+                    "urn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:9b4624d58669059c9e62afb3d7341944",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "instance": "test-platform-instance",
+                "env": "DEV",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa/folder_aaa/no_extension"
+            },
+            "name": "no_extension"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:9b4624d58669059c9e62afb3d7341944",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:9b4624d58669059c9e62afb3d7341944",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:9b4624d58669059c9e62afb3d7341944",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:9b4624d58669059c9e62afb3d7341944",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:9b4624d58669059c9e62afb3d7341944",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+                },
+                {
+                    "id": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+                    "urn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
+                },
+                {
+                    "id": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+                    "urn": "urn:li:container:c8d940d2010edd365619411b385b11e4"
+                },
+                {
+                    "id": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+                    "urn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc"
+                },
+                {
+                    "id": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+                    "urn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/no_extension/small,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:9b4624d58669059c9e62afb3d7341944"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/no_extension/small,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/no_extension/small,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+                },
+                {
+                    "id": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+                    "urn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
+                },
+                {
+                    "id": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+                    "urn": "urn:li:container:c8d940d2010edd365619411b385b11e4"
+                },
+                {
+                    "id": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+                    "urn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc"
+                },
+                {
+                    "id": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+                    "urn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
+                },
+                {
+                    "id": "urn:li:container:9b4624d58669059c9e62afb3d7341944",
+                    "urn": "urn:li:container:9b4624d58669059c9e62afb3d7341944"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_file_without_extension.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_file_without_extension.json
index d50f00efacaa06..06678512199bf6 100644
--- a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_file_without_extension.json
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_file_without_extension.json
@@ -12,7 +12,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -34,7 +35,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -127,54 +129,51 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/no_extension/small,DEV)",
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
     "changeType": "UPSERT",
-    "aspectName": "operation",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "timestampMillis": 1615443388097,
-            "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+            "customProperties": {
+                "platform": "s3",
+                "instance": "test-platform-instance",
+                "env": "DEV",
+                "folder_abs_path": "my-test-bucket/folder_a"
             },
-            "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586848010000
+            "name": "folder_a"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "instance": "test-platform-instance",
-                "env": "DEV",
-                "bucket_name": "my-test-bucket"
-            },
-            "name": "my-test-bucket"
+            "container": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -184,96 +183,103 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/no_extension/small,DEV)",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "operation",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3",
-            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847850000
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
         "json": {
             "typeNames": [
-                "S3 bucket"
+                "Folder"
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "path": [
-                {
-                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
-                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
-                }
-            ]
+            "customProperties": {
+                "platform": "s3",
+                "instance": "test-platform-instance",
+                "env": "DEV",
+                "bucket_name": "my-test-bucket"
+            },
+            "name": "my-test-bucket"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "instance": "test-platform-instance",
-                "env": "DEV",
-                "folder_abs_path": "my-test-bucket/folder_a"
-            },
-            "name": "folder_a"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "removed": false
+            "platform": "urn:li:dataPlatform:s3",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -289,39 +295,47 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+                }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
+            "typeNames": [
+                "S3 bucket"
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -345,12 +359,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -359,50 +374,52 @@
                 "platform": "s3",
                 "instance": "test-platform-instance",
                 "env": "DEV",
-                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa/folder_aaa"
             },
-            "name": "folder_aa"
+            "name": "folder_aaa"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:b0037296cdd497e3137aa0628b8687bc"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3",
-            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -414,86 +431,63 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "container": "urn:li:container:c8d940d2010edd365619411b385b11e4"
+            "customProperties": {
+                "platform": "s3",
+                "instance": "test-platform-instance",
+                "env": "DEV",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
+            },
+            "name": "folder_aa"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
-                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
-                },
-                {
-                    "id": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
-                    "urn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
-                },
-                {
-                    "id": "urn:li:container:c8d940d2010edd365619411b385b11e4",
-                    "urn": "urn:li:container:c8d940d2010edd365619411b385b11e4"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
-    "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "instance": "test-platform-instance",
-                "env": "DEV",
-                "folder_abs_path": "my-test-bucket/folder_a/folder_aa/folder_aaa"
-            },
-            "name": "folder_aaa"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "removed": false
+            "platform": "urn:li:dataPlatform:s3",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -509,12 +503,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -526,22 +521,37 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b0037296cdd497e3137aa0628b8687bc"
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+                },
+                {
+                    "id": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+                    "urn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
+                },
+                {
+                    "id": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+                    "urn": "urn:li:container:c8d940d2010edd365619411b385b11e4"
+                }
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -573,7 +583,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:c8d940d2010edd365619411b385b11e4"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -594,38 +621,40 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:9b4624d58669059c9e62afb3d7341944",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:9b4624d58669059c9e62afb3d7341944",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3",
-            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -642,22 +671,25 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:9b4624d58669059c9e62afb3d7341944",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
+            "platform": "urn:li:dataPlatform:s3",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -693,7 +725,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -708,7 +741,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -723,7 +757,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -763,7 +798,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "file_without_extension.json"
+        "runId": "file_without_extension.json",
+        "lastRunId": "no-run-id-provided"
     }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition.json
index 0eefc4cafbd620..8e1daed0070f10 100644
--- a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition.json
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition.json
@@ -7,7 +7,7 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv/part2.csv"
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv/part3.csv"
             },
             "name": "food_csv",
             "description": "",
@@ -16,7 +16,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -56,18 +57,6 @@
                     "recursive": false,
                     "isPartOfKey": false
                 },
-                {
-                    "fieldPath": "healthy",
-                    "nullable": false,
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.BooleanType": {}
-                        }
-                    },
-                    "nativeDataType": "boolean",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
                 {
                     "fieldPath": "height",
                     "nullable": false,
@@ -109,28 +98,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
-    "changeType": "UPSERT",
-    "aspectName": "operation",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1615443388097,
-            "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
-            },
-            "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847990000
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -150,7 +119,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -165,22 +135,30 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "operation",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847820000
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -197,7 +175,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -212,7 +207,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -232,7 +228,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -247,7 +244,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -262,39 +260,47 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
-            ]
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
+            },
+            "name": "folder_aa"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+            "typeNames": [
+                "Folder"
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -314,27 +320,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "UAT",
-                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
-            },
-            "name": "folder_aa"
+            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -349,22 +352,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -381,22 +386,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -420,7 +427,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -440,37 +448,40 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -487,22 +498,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -530,7 +543,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -545,39 +559,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
-                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
-                },
-                {
-                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
-                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
-                },
-                {
-                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
-                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
-                },
-                {
-                    "id": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
-                    "urn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
-                }
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -597,7 +596,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -690,7 +690,41 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                },
+                {
+                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+                },
+                {
+                    "id": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+                    "urn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -702,16 +736,17 @@
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847810000
+            "lastUpdatedTimestamp": 1586847840000
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -726,7 +761,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -758,37 +810,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "folder_no_partition.json"
+        "runId": "folder_no_partition.json",
+        "lastRunId": "no-run-id-provided"
     }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition_exclude.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition_exclude.json
index 36f40cc918735a..0d4c2d14d4ac16 100644
--- a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition_exclude.json
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition_exclude.json
@@ -16,7 +16,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -109,28 +110,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
-    "changeType": "UPSERT",
-    "aspectName": "operation",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1615443388097,
-            "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
-            },
-            "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847810000
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -150,7 +131,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -165,22 +147,30 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "operation",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847840000
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -197,206 +187,219 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "path": []
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "UAT",
-                "folder_abs_path": "my-test-bucket/folder_a"
-            },
-            "name": "folder_a"
+            "path": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "removed": false
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
+            },
+            "name": "folder_aa"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a"
+            },
+            "name": "folder_a"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
-                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
-                }
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "UAT",
-                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
-            },
-            "name": "folder_aa"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "removed": false
+            "typeNames": [
+                "Folder"
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "typeNames": [
+                "Folder"
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -420,7 +423,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -440,37 +460,40 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -487,22 +510,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -530,37 +555,40 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "container": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -592,7 +620,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_exclude.json"
+        "runId": "folder_no_partition_exclude.json",
+        "lastRunId": "no-run-id-provided"
     }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition_filename.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition_filename.json
index 7a59a7f21f1180..7172bba73f01c4 100644
--- a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition_filename.json
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition_filename.json
@@ -7,7 +7,7 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv/part2.csv"
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv/part3.csv"
             },
             "name": "folder_aaa.food_csv",
             "description": "",
@@ -16,7 +16,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -56,18 +57,6 @@
                     "recursive": false,
                     "isPartOfKey": false
                 },
-                {
-                    "fieldPath": "healthy",
-                    "nullable": false,
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.BooleanType": {}
-                        }
-                    },
-                    "nativeDataType": "boolean",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
                 {
                     "fieldPath": "height",
                     "nullable": false,
@@ -109,28 +98,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
-    "changeType": "UPSERT",
-    "aspectName": "operation",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1615443388097,
-            "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
-            },
-            "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847990000
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -150,7 +119,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -165,22 +135,30 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "operation",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847820000
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -197,7 +175,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -212,7 +207,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -232,7 +228,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -247,7 +244,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -262,39 +260,47 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
-            ]
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
+            },
+            "name": "folder_aa"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+            "typeNames": [
+                "Folder"
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -314,27 +320,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "UAT",
-                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
-            },
-            "name": "folder_aa"
+            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -349,22 +352,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -381,22 +386,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -420,7 +427,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -440,37 +448,40 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -487,22 +498,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -530,7 +543,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -545,39 +559,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
-                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
-                },
-                {
-                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
-                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
-                },
-                {
-                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
-                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
-                },
-                {
-                    "id": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
-                    "urn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
-                }
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -597,7 +596,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -690,7 +690,41 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                },
+                {
+                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+                },
+                {
+                    "id": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+                    "urn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -702,16 +736,17 @@
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847810000
+            "lastUpdatedTimestamp": 1586847840000
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -726,7 +761,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -758,37 +810,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_filename.json"
+        "runId": "folder_no_partition_filename.json",
+        "lastRunId": "no-run-id-provided"
     }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition_glob.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition_glob.json
index 0dc71b900b03b6..0372a6afd94577 100644
--- a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition_glob.json
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_no_partition_glob.json
@@ -16,7 +16,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -109,28 +110,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
-    "changeType": "UPSERT",
-    "aspectName": "operation",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1615443388097,
-            "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
-            },
-            "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847810000
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -150,7 +131,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -165,22 +147,30 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "operation",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847840000
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -197,206 +187,219 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "path": []
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "UAT",
-                "folder_abs_path": "my-test-bucket/folder_a"
-            },
-            "name": "folder_a"
+            "path": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "removed": false
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
+            },
+            "name": "folder_aa"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a"
+            },
+            "name": "folder_a"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
-                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
-                }
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "UAT",
-                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
-            },
-            "name": "folder_aa"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "removed": false
+            "typeNames": [
+                "Folder"
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "typeNames": [
+                "Folder"
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -420,7 +423,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -440,37 +460,40 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -487,22 +510,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -530,37 +555,40 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "container": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -592,7 +620,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_no_partition_glob.json"
+        "runId": "folder_no_partition_glob.json",
+        "lastRunId": "no-run-id-provided"
     }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_basic.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_basic.json
index aa683a2bcd4c21..6ff3925b1afb34 100644
--- a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_basic.json
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_basic.json
@@ -7,16 +7,24 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2022/month=jan/part3.json"
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2022/month=jan/part3.json",
+                "number_of_partitions": "1"
             },
             "name": "folder_aaa.pokemon_abilities_json",
             "description": "",
+            "created": {
+                "time": 1586847980000
+            },
+            "lastModified": {
+                "time": 1586847980000
+            },
             "tags": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -541,48 +549,54 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
     "changeType": "UPSERT",
-    "aspectName": "operation",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "timestampMillis": 1615443388097,
-            "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "bucket_name": "my-test-bucket"
             },
-            "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847960000
+            "name": "my-test-bucket"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "partitionsSummary",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "UAT",
-                "bucket_name": "my-test-bucket"
+            "minPartition": {
+                "partition": "partition_0=year=2022/partition_1=month=jan",
+                "createdTime": 1586847980000,
+                "lastModifiedTime": 1586847980000
             },
-            "name": "my-test-bucket"
+            "maxPartition": {
+                "partition": "partition_0=year=2022/partition_1=month=jan",
+                "createdTime": 1586847980000,
+                "lastModifiedTime": 1586847980000
+            }
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -597,22 +611,30 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "operation",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847990000
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -629,7 +651,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -644,12 +683,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -657,49 +697,52 @@
             "customProperties": {
                 "platform": "s3",
                 "env": "UAT",
-                "folder_abs_path": "my-test-bucket/folder_a"
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
             },
-            "name": "folder_a"
+            "name": "folder_aa"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -711,77 +754,61 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a"
+            },
+            "name": "folder_a"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
-                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
-    "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "UAT",
-                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
-            },
-            "name": "folder_aa"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "removed": false
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -796,12 +823,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -813,22 +841,29 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                }
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -852,7 +887,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -872,37 +908,56 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -919,22 +974,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -962,7 +1019,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -977,7 +1035,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -992,7 +1051,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1024,7 +1084,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_basic.json"
+        "runId": "folder_partition_basic.json",
+        "lastRunId": "no-run-id-provided"
     }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_keyval.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_keyval.json
index 095c1cbe3152b9..86fa7835008dd4 100644
--- a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_keyval.json
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_keyval.json
@@ -7,16 +7,24 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2022/month=jan/part3.json"
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2022/month=jan/part3.json",
+                "number_of_partitions": "1"
             },
             "name": "folder_aaa.pokemon_abilities_json",
             "description": "",
+            "created": {
+                "time": 1586847980000
+            },
+            "lastModified": {
+                "time": 1586847980000
+            },
             "tags": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -541,48 +549,54 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
     "changeType": "UPSERT",
-    "aspectName": "operation",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "timestampMillis": 1615443388097,
-            "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "bucket_name": "my-test-bucket"
             },
-            "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847960000
+            "name": "my-test-bucket"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "partitionsSummary",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "UAT",
-                "bucket_name": "my-test-bucket"
+            "minPartition": {
+                "partition": "year=2022/month=jan",
+                "createdTime": 1586847980000,
+                "lastModifiedTime": 1586847980000
             },
-            "name": "my-test-bucket"
+            "maxPartition": {
+                "partition": "year=2022/month=jan",
+                "createdTime": 1586847980000,
+                "lastModifiedTime": 1586847980000
+            }
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -597,22 +611,30 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "operation",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847990000
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -629,7 +651,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -644,12 +683,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -657,49 +697,52 @@
             "customProperties": {
                 "platform": "s3",
                 "env": "UAT",
-                "folder_abs_path": "my-test-bucket/folder_a"
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
             },
-            "name": "folder_a"
+            "name": "folder_aa"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -711,77 +754,61 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a"
+            },
+            "name": "folder_a"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
-                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
-    "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "UAT",
-                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
-            },
-            "name": "folder_aa"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "removed": false
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -796,12 +823,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -813,22 +841,29 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                }
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -852,7 +887,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -872,37 +908,56 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -919,22 +974,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -962,7 +1019,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -977,7 +1035,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -992,7 +1051,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1024,7 +1084,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_keyval.json"
+        "runId": "folder_partition_keyval.json",
+        "lastRunId": "no-run-id-provided"
     }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_update_schema.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_update_schema.json
index a5f135c30369a3..95ec5e83f7991c 100644
--- a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_update_schema.json
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_update_schema.json
@@ -7,16 +7,24 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2022/month=jan/part3.json"
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2022/month=jan/part3.json",
+                "number_of_partitions": "1"
             },
             "name": "folder_aaa.pokemon_abilities_json",
             "description": "",
+            "created": {
+                "time": 1586847980000
+            },
+            "lastModified": {
+                "time": 1586847980000
+            },
             "tags": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -541,48 +549,54 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
     "changeType": "UPSERT",
-    "aspectName": "operation",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "timestampMillis": 1615443388097,
-            "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "bucket_name": "my-test-bucket"
             },
-            "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847960000
+            "name": "my-test-bucket"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "partitionsSummary",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "UAT",
-                "bucket_name": "my-test-bucket"
+            "minPartition": {
+                "partition": "partition_0=year=2022/partition_1=month=jan",
+                "createdTime": 1586847980000,
+                "lastModifiedTime": 1586847980000
             },
-            "name": "my-test-bucket"
+            "maxPartition": {
+                "partition": "partition_0=year=2022/partition_1=month=jan",
+                "createdTime": 1586847980000,
+                "lastModifiedTime": 1586847980000
+            }
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -597,22 +611,30 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "operation",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847990000
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -629,7 +651,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -644,12 +683,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -657,49 +697,52 @@
             "customProperties": {
                 "platform": "s3",
                 "env": "UAT",
-                "folder_abs_path": "my-test-bucket/folder_a"
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
             },
-            "name": "folder_a"
+            "name": "folder_aa"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -711,77 +754,61 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a"
+            },
+            "name": "folder_a"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
-                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
-    "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "UAT",
-                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
-            },
-            "name": "folder_aa"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "removed": false
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -796,12 +823,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -813,22 +841,29 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                }
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -852,7 +887,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -872,37 +908,56 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -919,22 +974,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -962,7 +1019,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -977,7 +1035,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -992,7 +1051,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1024,7 +1084,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "folder_partition_update_schema.json"
+        "runId": "folder_partition_update_schema.json",
+        "lastRunId": "no-run-id-provided"
     }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_update_schema_with_partition_autodetect.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_update_schema_with_partition_autodetect.json
new file mode 100644
index 00000000000000..4fee8fb36b13f0
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_update_schema_with_partition_autodetect.json
@@ -0,0 +1,1483 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv/part3.csv"
+            },
+            "name": "folder_aaa.food_csv",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.food_csv",
+            "platform": "urn:li:dataPlatform:s3",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "color",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "height",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "weight",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "bucket_name": "my-test-bucket"
+            },
+            "name": "my-test-bucket"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847820000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "S3 bucket"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a"
+            },
+            "name": "folder_a"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
+            },
+            "name": "folder_aa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa/folder_aaa"
+            },
+            "name": "folder_aaa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                },
+                {
+                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet/part2.parquet"
+            },
+            "name": "folder_aaa.food_parquet",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.food_parquet",
+            "platform": "urn:li:dataPlatform:s3",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "color",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "healthy",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "height",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int64",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "weight",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int64",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                },
+                {
+                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+                },
+                {
+                    "id": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+                    "urn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847840000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2022/month=jan/part3.json",
+                "number_of_partitions": "1"
+            },
+            "name": "folder_aaa.pokemon_abilities_json",
+            "description": "",
+            "created": {
+                "time": 1586847980000
+            },
+            "lastModified": {
+                "time": 1586847980000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.pokemon_abilities_json",
+            "platform": "urn:li:dataPlatform:s3",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "effect_changes",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.is_native",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.short_effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.flavor_text",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "id",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "is_main_series",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.is_hidden",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.slot",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "partitionsSummary",
+    "aspect": {
+        "json": {
+            "minPartition": {
+                "partition": "year=2022/month=jan",
+                "createdTime": 1586847980000,
+                "lastModifiedTime": 1586847980000
+            },
+            "maxPartition": {
+                "partition": "year=2022/month=jan",
+                "createdTime": 1586847980000,
+                "lastModifiedTime": 1586847980000
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                },
+                {
+                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+                },
+                {
+                    "id": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+                    "urn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847990000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                },
+                {
+                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+                },
+                {
+                    "id": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+                    "urn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_update_schema_with_partition_autodetect.json",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_with_partition_autodetect_traverse_all.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_with_partition_autodetect_traverse_all.json
new file mode 100644
index 00000000000000..13ba57f5be6717
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_with_partition_autodetect_traverse_all.json
@@ -0,0 +1,1483 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv/part3.csv"
+            },
+            "name": "folder_aaa.food_csv",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.food_csv",
+            "platform": "urn:li:dataPlatform:s3",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "color",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "height",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "weight",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "bucket_name": "my-test-bucket"
+            },
+            "name": "my-test-bucket"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847820000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "S3 bucket"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a"
+            },
+            "name": "folder_a"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
+            },
+            "name": "folder_aa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa/folder_aaa"
+            },
+            "name": "folder_aaa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                },
+                {
+                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet/part2.parquet"
+            },
+            "name": "folder_aaa.food_parquet",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.food_parquet",
+            "platform": "urn:li:dataPlatform:s3",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "color",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "healthy",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "height",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int64",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "weight",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int64",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                },
+                {
+                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+                },
+                {
+                    "id": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+                    "urn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847840000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2022/month=jan/part3.json",
+                "number_of_partitions": "7"
+            },
+            "name": "folder_aaa.pokemon_abilities_json",
+            "description": "",
+            "created": {
+                "time": 1586847860000
+            },
+            "lastModified": {
+                "time": 1586847980000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.pokemon_abilities_json",
+            "platform": "urn:li:dataPlatform:s3",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "effect_changes",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.is_native",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.short_effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.flavor_text",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "id",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "is_main_series",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.is_hidden",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.slot",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "partitionsSummary",
+    "aspect": {
+        "json": {
+            "minPartition": {
+                "partition": "year=2019/month=feb",
+                "createdTime": 1586847860000,
+                "lastModifiedTime": 1586847870000
+            },
+            "maxPartition": {
+                "partition": "year=2022/month=jan",
+                "createdTime": 1586847980000,
+                "lastModifiedTime": 1586847980000
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                },
+                {
+                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+                },
+                {
+                    "id": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+                    "urn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847990000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                },
+                {
+                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+                },
+                {
+                    "id": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+                    "urn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_all.json",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_with_partition_autodetect_traverse_min_max.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_with_partition_autodetect_traverse_min_max.json
new file mode 100644
index 00000000000000..9f45583f1d3eca
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_folder_partition_with_partition_autodetect_traverse_min_max.json
@@ -0,0 +1,1483 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv/part3.csv"
+            },
+            "name": "folder_aaa.food_csv",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.food_csv",
+            "platform": "urn:li:dataPlatform:s3",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "color",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "height",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "weight",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "bucket_name": "my-test-bucket"
+            },
+            "name": "my-test-bucket"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847820000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "S3 bucket"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a"
+            },
+            "name": "folder_a"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
+            },
+            "name": "folder_aa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "env": "UAT",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa/folder_aaa"
+            },
+            "name": "folder_aaa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                },
+                {
+                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet/part2.parquet"
+            },
+            "name": "folder_aaa.food_parquet",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.food_parquet",
+            "platform": "urn:li:dataPlatform:s3",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "color",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "healthy",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "height",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int64",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "weight",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int64",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_csv,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                },
+                {
+                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+                },
+                {
+                    "id": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+                    "urn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847840000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2022/month=jan/part3.json",
+                "number_of_partitions": "2"
+            },
+            "name": "folder_aaa.pokemon_abilities_json",
+            "description": "",
+            "created": {
+                "time": 1586847860000
+            },
+            "lastModified": {
+                "time": 1586847980000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "folder_aaa.pokemon_abilities_json",
+            "platform": "urn:li:dataPlatform:s3",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "effect_changes",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.is_native",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.effect_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_changes.version_group.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "effect_entries.short_effect",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.flavor_text",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "flavor_text_entries.version_group.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "generation.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "id",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "is_main_series",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.language.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "names.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "list",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.is_hidden",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "bool",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "dict",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.pokemon.url",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "str",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "pokemon.slot",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "partitionsSummary",
+    "aspect": {
+        "json": {
+            "minPartition": {
+                "partition": "year=2019/month=feb",
+                "createdTime": 1586847860000,
+                "lastModifiedTime": 1586847870000
+            },
+            "maxPartition": {
+                "partition": "year=2022/month=jan",
+                "createdTime": 1586847980000,
+                "lastModifiedTime": 1586847980000
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                },
+                {
+                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+                },
+                {
+                    "id": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+                    "urn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847990000
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:050fedde7a12cb8c8447db8d298f5577",
+                    "urn": "urn:li:container:050fedde7a12cb8c8447db8d298f5577"
+                },
+                {
+                    "id": "urn:li:container:86297df39321e4948dbe8b8e941de98b",
+                    "urn": "urn:li:container:86297df39321e4948dbe8b8e941de98b"
+                },
+                {
+                    "id": "urn:li:container:273fbeff7bd9ecb74982205aadd77994",
+                    "urn": "urn:li:container:273fbeff7bd9ecb74982205aadd77994"
+                },
+                {
+                    "id": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2",
+                    "urn": "urn:li:container:ec362903c4c7de60197fcc7b7a79e4c2"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/pokemon_abilities_json,UAT)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "folder_partition_with_partition_autodetect_traverse_min_max.json",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_multiple_files.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_multiple_files.json
index d7a9bca716fd60..d97cedd39d77c3 100644
--- a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_multiple_files.json
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_multiple_files.json
@@ -65,19 +65,19 @@
             },
             "fields": [
                 {
-                    "fieldPath": "Sampling Date",
+                    "fieldPath": "2",
                     "nullable": false,
                     "type": {
                         "type": {
-                            "com.linkedin.schema.DateType": {}
+                            "com.linkedin.schema.StringType": {}
                         }
                     },
-                    "nativeDataType": "date",
+                    "nativeDataType": "string",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "Site ID",
+                    "fieldPath": "3",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -89,7 +89,7 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "Park ID",
+                    "fieldPath": "Br \n(mg/L)",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -101,7 +101,7 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "Lat (\u00b0N)",
+                    "fieldPath": "Ca \n(mg/L)",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -113,7 +113,7 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "Long (\u00b0W)",
+                    "fieldPath": "Cl \n(mg/L)",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -125,7 +125,7 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "Water Temp (\u00b0C)",
+                    "fieldPath": "Cond (\u00b5S/cm)",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -137,31 +137,31 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "Cond (\u00b5S/cm)",
+                    "fieldPath": "DO (mg/L)",
                     "nullable": false,
                     "type": {
                         "type": {
-                            "com.linkedin.schema.NumberType": {}
+                            "com.linkedin.schema.StringType": {}
                         }
                     },
-                    "nativeDataType": "number",
+                    "nativeDataType": "string",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "pH",
+                    "fieldPath": "DOC [mg/L C]",
                     "nullable": false,
                     "type": {
                         "type": {
-                            "com.linkedin.schema.StringType": {}
+                            "com.linkedin.schema.NumberType": {}
                         }
                     },
-                    "nativeDataType": "string",
+                    "nativeDataType": "number",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "DO (mg/L)",
+                    "fieldPath": "F \n(mg/L)",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -173,19 +173,19 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "Secchi Depth (m)",
+                    "fieldPath": "K \n(mg/L)",
                     "nullable": false,
                     "type": {
                         "type": {
-                            "com.linkedin.schema.StringType": {}
+                            "com.linkedin.schema.NumberType": {}
                         }
                     },
-                    "nativeDataType": "string",
+                    "nativeDataType": "number",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "UV Absorbance, 254nm",
+                    "fieldPath": "Lat (\u00b0N)",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -197,7 +197,7 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "DOC [mg/L C]",
+                    "fieldPath": "Long (\u00b0W)",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -209,7 +209,7 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "SUVA, 254nm",
+                    "fieldPath": "Mg \n(mg/L)",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -245,31 +245,31 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "PO4-P \n(mg P/L)",
+                    "fieldPath": "Na \n(mg/L)",
                     "nullable": false,
                     "type": {
                         "type": {
-                            "com.linkedin.schema.StringType": {}
+                            "com.linkedin.schema.NumberType": {}
                         }
                     },
-                    "nativeDataType": "string",
+                    "nativeDataType": "number",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "TDN \n(mg N/L)",
+                    "fieldPath": "PO4-P \n(mg P/L)",
                     "nullable": false,
                     "type": {
                         "type": {
-                            "com.linkedin.schema.NumberType": {}
+                            "com.linkedin.schema.StringType": {}
                         }
                     },
-                    "nativeDataType": "number",
+                    "nativeDataType": "string",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "TDP \n(mg P/L)",
+                    "fieldPath": "Park ID",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -281,7 +281,7 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "Cl \n(mg/L)",
+                    "fieldPath": "SO4-S \n(mg/L)",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -293,7 +293,7 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "SO4-S \n(mg/L)",
+                    "fieldPath": "SUVA, 254nm",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -305,19 +305,19 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "F \n(mg/L)",
+                    "fieldPath": "Sampling Date",
                     "nullable": false,
                     "type": {
                         "type": {
-                            "com.linkedin.schema.StringType": {}
+                            "com.linkedin.schema.DateType": {}
                         }
                     },
-                    "nativeDataType": "string",
+                    "nativeDataType": "date",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "Br \n(mg/L)",
+                    "fieldPath": "Secchi Depth (m)",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -329,19 +329,19 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "Na \n(mg/L)",
+                    "fieldPath": "Site ID",
                     "nullable": false,
                     "type": {
                         "type": {
-                            "com.linkedin.schema.NumberType": {}
+                            "com.linkedin.schema.StringType": {}
                         }
                     },
-                    "nativeDataType": "number",
+                    "nativeDataType": "string",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "K \n(mg/L)",
+                    "fieldPath": "TDN \n(mg N/L)",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -353,19 +353,19 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "Ca \n(mg/L)",
+                    "fieldPath": "TDP \n(mg P/L)",
                     "nullable": false,
                     "type": {
                         "type": {
-                            "com.linkedin.schema.NumberType": {}
+                            "com.linkedin.schema.StringType": {}
                         }
                     },
-                    "nativeDataType": "number",
+                    "nativeDataType": "string",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "Mg \n(mg/L)",
+                    "fieldPath": "UV Absorbance, 254nm",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -377,19 +377,19 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "d18O",
+                    "fieldPath": "Water Temp (\u00b0C)",
                     "nullable": false,
                     "type": {
                         "type": {
-                            "com.linkedin.schema.StringType": {}
+                            "com.linkedin.schema.NumberType": {}
                         }
                     },
-                    "nativeDataType": "string",
+                    "nativeDataType": "number",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "dD",
+                    "fieldPath": "d18O",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -401,7 +401,7 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "field29",
+                    "fieldPath": "dD",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -413,7 +413,7 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "2",
+                    "fieldPath": "field29",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -425,7 +425,7 @@
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "3",
+                    "fieldPath": "pH",
                     "nullable": false,
                     "type": {
                         "type": {
@@ -447,18 +447,18 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/NPS.7.1.package_data_NPS.6.1_ARCN_Lakes_ChemistryData_v1_csv.csv,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv,DEV)",
     "changeType": "UPSERT",
     "aspectName": "operation",
     "aspect": {
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847610000
+            "lastUpdatedTimestamp": 1586847660000
         }
     },
     "systemMetadata": {
@@ -468,19 +468,13 @@
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv,DEV)",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "instance": "test-platform-instance",
-                "env": "DEV",
-                "bucket_name": "my-test-bucket"
-            },
-            "name": "my-test-bucket"
+            "container": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
         }
     },
     "systemMetadata": {
@@ -490,8 +484,8 @@
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv,DEV)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -506,14 +500,19 @@
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/NPS.7.1.package_data_NPS.6.1_ARCN_Lakes_ChemistryData_v1_csv.csv,DEV)",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "operation",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3",
-            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847610000
         }
     },
     "systemMetadata": {
@@ -523,15 +522,14 @@
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv,DEV)",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "typeNames": [
-                "S3 bucket"
-            ]
+            "platform": "urn:li:dataPlatform:s3",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
         }
     },
     "systemMetadata": {
@@ -544,27 +542,6 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
-                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_files.json",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
-    "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
         "json": {
@@ -572,9 +549,9 @@
                 "platform": "s3",
                 "instance": "test-platform-instance",
                 "env": "DEV",
-                "folder_abs_path": "my-test-bucket/folder_a"
+                "bucket_name": "my-test-bucket"
             },
-            "name": "folder_a"
+            "name": "my-test-bucket"
         }
     },
     "systemMetadata": {
@@ -585,7 +562,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -601,7 +578,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -617,31 +594,20 @@
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
-    "changeType": "UPSERT",
-    "aspectName": "subTypes",
-    "aspect": {
-        "json": {
-            "typeNames": [
-                "Folder"
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_files.json",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv,DEV)",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "container": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
+            "customProperties": {
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv",
+                "number_of_files": "1",
+                "size_in_bytes": "172"
+            },
+            "name": "small.csv",
+            "description": "",
+            "tags": []
         }
     },
     "systemMetadata": {
@@ -652,7 +618,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
@@ -661,10 +627,6 @@
                 {
                     "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
                     "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
-                },
-                {
-                    "id": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
-                    "urn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
                 }
             ]
         }
@@ -677,18 +639,14 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "entityUrn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "instance": "test-platform-instance",
-                "env": "DEV",
-                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
-            },
-            "name": "folder_aa"
+            "typeNames": [
+                "S3 bucket"
+            ]
         }
     },
     "systemMetadata": {
@@ -698,13 +656,34 @@
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv,DEV)",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "removed": false
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+                },
+                {
+                    "id": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+                    "urn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
+                },
+                {
+                    "id": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+                    "urn": "urn:li:container:c8d940d2010edd365619411b385b11e4"
+                },
+                {
+                    "id": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+                    "urn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc"
+                },
+                {
+                    "id": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+                    "urn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
+                }
+            ]
         }
     },
     "systemMetadata": {
@@ -714,14 +693,91 @@
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv,DEV)",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "schemaMetadata",
     "aspect": {
         "json": {
+            "schemaName": "small.csv",
             "platform": "urn:li:dataPlatform:s3",
-            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                    "rawSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "1st chord",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "2nd chord",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "3rd chord",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "4th chord",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "Progression Quality",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
         }
     },
     "systemMetadata": {
@@ -732,14 +788,18 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
-            ]
+            "customProperties": {
+                "platform": "s3",
+                "instance": "test-platform-instance",
+                "env": "DEV",
+                "folder_abs_path": "my-test-bucket/folder_a"
+            },
+            "name": "folder_a"
         }
     },
     "systemMetadata": {
@@ -750,12 +810,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:c8d940d2010edd365619411b385b11e4"
+            "container": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
         }
     },
     "systemMetadata": {
@@ -766,25 +826,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "path": [
-                {
-                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
-                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
-                },
-                {
-                    "id": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
-                    "urn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
-                },
-                {
-                    "id": "urn:li:container:c8d940d2010edd365619411b385b11e4",
-                    "urn": "urn:li:container:c8d940d2010edd365619411b385b11e4"
-                }
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
@@ -795,7 +842,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -804,9 +851,9 @@
                 "platform": "s3",
                 "instance": "test-platform-instance",
                 "env": "DEV",
-                "folder_abs_path": "my-test-bucket/folder_a/folder_aa/folder_aaa"
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
             },
-            "name": "folder_aaa"
+            "name": "folder_aa"
         }
     },
     "systemMetadata": {
@@ -817,7 +864,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -833,7 +880,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -850,7 +897,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -868,12 +915,14 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b0037296cdd497e3137aa0628b8687bc"
+            "typeNames": [
+                "Folder"
+            ]
         }
     },
     "systemMetadata": {
@@ -884,7 +933,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
@@ -901,10 +950,48 @@
                 {
                     "id": "urn:li:container:c8d940d2010edd365619411b385b11e4",
                     "urn": "urn:li:container:c8d940d2010edd365619411b385b11e4"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
                 },
                 {
-                    "id": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
-                    "urn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc"
+                    "id": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+                    "urn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
                 }
             ]
         }
@@ -916,13 +1003,35 @@
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/NPS.7.1.package_data_NPS.6.1_ARCN_Lakes_ChemistryData_v1_csv.csv,DEV)",
+    "entityType": "container",
+    "entityUrn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
+            "container": "urn:li:container:c8d940d2010edd365619411b385b11e4"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847620000
         }
     },
     "systemMetadata": {
@@ -972,17 +1081,42 @@
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro,DEV)",
     "changeType": "UPSERT",
-    "aspectName": "datasetProperties",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "customProperties": {
-                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro",
-                "number_of_files": "1",
-                "size_in_bytes": "619"
-            },
-            "name": "chord_progressions_avro.avro",
-            "description": "",
-            "tags": []
+            "container": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/NPS.7.1.package_data_NPS.6.1_ARCN_Lakes_ChemistryData_v1_csv.csv,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
         }
     },
     "systemMetadata": {
@@ -1012,10 +1146,73 @@
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro,DEV)",
     "changeType": "UPSERT",
-    "aspectName": "schemaMetadata",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro",
+                "number_of_files": "1",
+                "size_in_bytes": "619"
+            },
+            "name": "chord_progressions_avro.avro",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "schemaName": "chord_progressions_avro.avro",
+            "platform": "urn:li:dataPlatform:s3",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv",
+                "number_of_files": "1",
+                "size_in_bytes": "604"
+            },
+            "name": "chord_progressions_csv.csv",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "chord_progressions_csv.csv",
             "platform": "urn:li:dataPlatform:s3",
             "version": 0,
             "created": {
@@ -1034,62 +1231,62 @@
             },
             "fields": [
                 {
-                    "fieldPath": "[version=2.0].[type=Record].[type=long].FirstChord",
+                    "fieldPath": "1st chord",
                     "nullable": false,
                     "type": {
                         "type": {
                             "com.linkedin.schema.NumberType": {}
                         }
                     },
-                    "nativeDataType": "FirstChord",
+                    "nativeDataType": "integer",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "[version=2.0].[type=Record].[type=long].FourthChord",
+                    "fieldPath": "2nd chord",
                     "nullable": false,
                     "type": {
                         "type": {
                             "com.linkedin.schema.NumberType": {}
                         }
                     },
-                    "nativeDataType": "FourthChord",
+                    "nativeDataType": "integer",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "[version=2.0].[type=Record].[type=long].SecondChord",
+                    "fieldPath": "3rd chord",
                     "nullable": false,
                     "type": {
                         "type": {
                             "com.linkedin.schema.NumberType": {}
                         }
                     },
-                    "nativeDataType": "SecondChord",
+                    "nativeDataType": "integer",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "[version=2.0].[type=Record].[type=long].ThirdChord",
+                    "fieldPath": "4th chord",
                     "nullable": false,
                     "type": {
                         "type": {
                             "com.linkedin.schema.NumberType": {}
                         }
                     },
-                    "nativeDataType": "ThirdChord",
+                    "nativeDataType": "integer",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "[version=2.0].[type=Record].[type=string].ProgressionQuality",
+                    "fieldPath": "Progression Quality",
                     "nullable": false,
                     "type": {
                         "type": {
                             "com.linkedin.schema.StringType": {}
                         }
                     },
-                    "nativeDataType": "ProgressionQuality",
+                    "nativeDataType": "string",
                     "recursive": false,
                     "isPartOfKey": false
                 }
@@ -1102,44 +1299,6 @@
         "lastRunId": "no-run-id-provided"
     }
 },
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro,DEV)",
-    "changeType": "UPSERT",
-    "aspectName": "operation",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1615443388097,
-            "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
-            },
-            "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847620000
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_files.json",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro,DEV)",
-    "changeType": "UPSERT",
-    "aspectName": "container",
-    "aspect": {
-        "json": {
-            "container": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_files.json",
-        "lastRunId": "no-run-id-provided"
-    }
-},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro,DEV)",
@@ -1179,52 +1338,12 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,DEV)",
-    "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
-    "aspect": {
-        "json": {
-            "platform": "urn:li:dataPlatform:s3",
-            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_files.json",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,DEV)",
-    "changeType": "UPSERT",
-    "aspectName": "datasetProperties",
-    "aspect": {
-        "json": {
-            "customProperties": {
-                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv",
-                "number_of_files": "1",
-                "size_in_bytes": "604"
-            },
-            "name": "chord_progressions_csv.csv",
-            "description": "",
-            "tags": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_files.json",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro,DEV)",
     "changeType": "UPSERT",
     "aspectName": "schemaMetadata",
     "aspect": {
         "json": {
-            "schemaName": "chord_progressions_csv.csv",
+            "schemaName": "chord_progressions_avro.avro",
             "platform": "urn:li:dataPlatform:s3",
             "version": 0,
             "created": {
@@ -1243,62 +1362,62 @@
             },
             "fields": [
                 {
-                    "fieldPath": "1st chord",
+                    "fieldPath": "[version=2.0].[type=Record].[type=long].FirstChord",
                     "nullable": false,
                     "type": {
                         "type": {
                             "com.linkedin.schema.NumberType": {}
                         }
                     },
-                    "nativeDataType": "integer",
+                    "nativeDataType": "FirstChord",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "2nd chord",
+                    "fieldPath": "[version=2.0].[type=Record].[type=long].FourthChord",
                     "nullable": false,
                     "type": {
                         "type": {
                             "com.linkedin.schema.NumberType": {}
                         }
                     },
-                    "nativeDataType": "integer",
+                    "nativeDataType": "FourthChord",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "3rd chord",
+                    "fieldPath": "[version=2.0].[type=Record].[type=long].SecondChord",
                     "nullable": false,
                     "type": {
                         "type": {
                             "com.linkedin.schema.NumberType": {}
                         }
                     },
-                    "nativeDataType": "integer",
+                    "nativeDataType": "SecondChord",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "4th chord",
+                    "fieldPath": "[version=2.0].[type=Record].[type=long].ThirdChord",
                     "nullable": false,
                     "type": {
                         "type": {
                             "com.linkedin.schema.NumberType": {}
                         }
                     },
-                    "nativeDataType": "integer",
+                    "nativeDataType": "ThirdChord",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "Progression Quality",
+                    "fieldPath": "[version=2.0].[type=Record].[type=string].ProgressionQuality",
                     "nullable": false,
                     "type": {
                         "type": {
                             "com.linkedin.schema.StringType": {}
                         }
                     },
-                    "nativeDataType": "string",
+                    "nativeDataType": "ProgressionQuality",
                     "recursive": false,
                     "isPartOfKey": false
                 }
@@ -1312,35 +1431,19 @@
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,DEV)",
+    "entityType": "container",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
     "changeType": "UPSERT",
-    "aspectName": "operation",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "timestampMillis": 1615443388097,
-            "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+            "customProperties": {
+                "platform": "s3",
+                "instance": "test-platform-instance",
+                "env": "DEV",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa/folder_aaa"
             },
-            "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847630000
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_files.json",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,DEV)",
-    "changeType": "UPSERT",
-    "aspectName": "container",
-    "aspect": {
-        "json": {
-            "container": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
+            "name": "folder_aaa"
         }
     },
     "systemMetadata": {
@@ -1351,33 +1454,13 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/countries_json.json,DEV)",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "path": [
-                {
-                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
-                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
-                },
-                {
-                    "id": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
-                    "urn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
-                },
-                {
-                    "id": "urn:li:container:c8d940d2010edd365619411b385b11e4",
-                    "urn": "urn:li:container:c8d940d2010edd365619411b385b11e4"
-                },
-                {
-                    "id": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
-                    "urn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc"
-                },
-                {
-                    "id": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
-                    "urn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
-                }
-            ]
+            "platform": "urn:li:dataPlatform:s3",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
         }
     },
     "systemMetadata": {
@@ -1409,23 +1492,6 @@
         "lastRunId": "no-run-id-provided"
     }
 },
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/countries_json.json,DEV)",
-    "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
-    "aspect": {
-        "json": {
-            "platform": "urn:li:dataPlatform:s3",
-            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_files.json",
-        "lastRunId": "no-run-id-provided"
-    }
-},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/countries_json.json,DEV)",
@@ -1498,18 +1564,55 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/countries_json.json,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+                },
+                {
+                    "id": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+                    "urn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
+                },
+                {
+                    "id": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+                    "urn": "urn:li:container:c8d940d2010edd365619411b385b11e4"
+                },
+                {
+                    "id": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+                    "urn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc"
+                },
+                {
+                    "id": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+                    "urn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,DEV)",
     "changeType": "UPSERT",
     "aspectName": "operation",
     "aspect": {
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847640000
+            "lastUpdatedTimestamp": 1586847630000
         }
     },
     "systemMetadata": {
@@ -1520,7 +1623,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/countries_json.json,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,DEV)",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
@@ -1573,19 +1676,18 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet.parquet,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/countries_json.json,DEV)",
     "changeType": "UPSERT",
-    "aspectName": "datasetProperties",
+    "aspectName": "operation",
     "aspect": {
         "json": {
-            "customProperties": {
-                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet.parquet",
-                "number_of_files": "1",
-                "size_in_bytes": "4206"
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
-            "name": "food_parquet.parquet",
-            "description": "",
-            "tags": []
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847640000
         }
     },
     "systemMetadata": {
@@ -1596,7 +1698,55 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet.parquet,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/countries_json.json,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:b0037296cdd497e3137aa0628b8687bc"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -1612,89 +1762,46 @@
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet.parquet,DEV)",
+    "entityType": "container",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
     "changeType": "UPSERT",
-    "aspectName": "schemaMetadata",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "schemaName": "food_parquet.parquet",
-            "platform": "urn:li:dataPlatform:s3",
-            "version": 0,
-            "created": {
-                "time": 0,
-                "actor": "urn:li:corpuser:unknown"
-            },
-            "lastModified": {
-                "time": 0,
-                "actor": "urn:li:corpuser:unknown"
-            },
-            "hash": "",
-            "platformSchema": {
-                "com.linkedin.schema.OtherSchema": {
-                    "rawSchema": ""
-                }
-            },
-            "fields": [
-                {
-                    "fieldPath": "color",
-                    "nullable": false,
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.StringType": {}
-                        }
-                    },
-                    "nativeDataType": "string",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
+            "typeNames": [
+                "Folder"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
                 {
-                    "fieldPath": "healthy",
-                    "nullable": false,
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.BooleanType": {}
-                        }
-                    },
-                    "nativeDataType": "bool",
-                    "recursive": false,
-                    "isPartOfKey": false
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
                 },
                 {
-                    "fieldPath": "height",
-                    "nullable": false,
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.NumberType": {}
-                        }
-                    },
-                    "nativeDataType": "int64",
-                    "recursive": false,
-                    "isPartOfKey": false
+                    "id": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
+                    "urn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
                 },
-                {
-                    "fieldPath": "name",
-                    "nullable": false,
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.StringType": {}
-                        }
-                    },
-                    "nativeDataType": "string",
-                    "recursive": false,
-                    "isPartOfKey": false
+                {
+                    "id": "urn:li:container:c8d940d2010edd365619411b385b11e4",
+                    "urn": "urn:li:container:c8d940d2010edd365619411b385b11e4"
                 },
                 {
-                    "fieldPath": "weight",
-                    "nullable": false,
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.NumberType": {}
-                        }
-                    },
-                    "nativeDataType": "int64",
-                    "recursive": false,
-                    "isPartOfKey": false
+                    "id": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
+                    "urn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc"
                 }
             ]
         }
@@ -1707,18 +1814,18 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet.parquet,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv,DEV)",
     "changeType": "UPSERT",
     "aspectName": "operation",
     "aspect": {
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847650000
+            "lastUpdatedTimestamp": 1586847670000
         }
     },
     "systemMetadata": {
@@ -1729,7 +1836,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet.parquet,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv,DEV)",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
@@ -1745,33 +1852,12 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet.parquet,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv,DEV)",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "path": [
-                {
-                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)",
-                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
-                },
-                {
-                    "id": "urn:li:container:647eefb4dfda8695baf1aa0775d78689",
-                    "urn": "urn:li:container:647eefb4dfda8695baf1aa0775d78689"
-                },
-                {
-                    "id": "urn:li:container:c8d940d2010edd365619411b385b11e4",
-                    "urn": "urn:li:container:c8d940d2010edd365619411b385b11e4"
-                },
-                {
-                    "id": "urn:li:container:b0037296cdd497e3137aa0628b8687bc",
-                    "urn": "urn:li:container:b0037296cdd497e3137aa0628b8687bc"
-                },
-                {
-                    "id": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9",
-                    "urn": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
-                }
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
@@ -1782,7 +1868,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv,DEV)",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -1799,17 +1885,34 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet.parquet,DEV)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:s3",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet.parquet,DEV)",
     "changeType": "UPSERT",
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
             "customProperties": {
-                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv",
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet.parquet",
                 "number_of_files": "1",
-                "size_in_bytes": "172"
+                "size_in_bytes": "4206"
             },
-            "name": "small.csv",
+            "name": "food_parquet.parquet",
             "description": "",
             "tags": []
         }
@@ -1822,12 +1925,12 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet.parquet,DEV)",
     "changeType": "UPSERT",
     "aspectName": "schemaMetadata",
     "aspect": {
         "json": {
-            "schemaName": "small.csv",
+            "schemaName": "food_parquet.parquet",
             "platform": "urn:li:dataPlatform:s3",
             "version": 0,
             "created": {
@@ -1846,62 +1949,62 @@
             },
             "fields": [
                 {
-                    "fieldPath": "1st chord",
+                    "fieldPath": "color",
                     "nullable": false,
                     "type": {
                         "type": {
-                            "com.linkedin.schema.NumberType": {}
+                            "com.linkedin.schema.StringType": {}
                         }
                     },
-                    "nativeDataType": "integer",
+                    "nativeDataType": "string",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "2nd chord",
+                    "fieldPath": "healthy",
                     "nullable": false,
                     "type": {
                         "type": {
-                            "com.linkedin.schema.NumberType": {}
+                            "com.linkedin.schema.BooleanType": {}
                         }
                     },
-                    "nativeDataType": "integer",
+                    "nativeDataType": "bool",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "3rd chord",
+                    "fieldPath": "height",
                     "nullable": false,
                     "type": {
                         "type": {
                             "com.linkedin.schema.NumberType": {}
                         }
                     },
-                    "nativeDataType": "integer",
+                    "nativeDataType": "int64",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "4th chord",
+                    "fieldPath": "name",
                     "nullable": false,
                     "type": {
                         "type": {
-                            "com.linkedin.schema.NumberType": {}
+                            "com.linkedin.schema.StringType": {}
                         }
                     },
-                    "nativeDataType": "integer",
+                    "nativeDataType": "string",
                     "recursive": false,
                     "isPartOfKey": false
                 },
                 {
-                    "fieldPath": "Progression Quality",
+                    "fieldPath": "weight",
                     "nullable": false,
                     "type": {
                         "type": {
-                            "com.linkedin.schema.StringType": {}
+                            "com.linkedin.schema.NumberType": {}
                         }
                     },
-                    "nativeDataType": "string",
+                    "nativeDataType": "int64",
                     "recursive": false,
                     "isPartOfKey": false
                 }
@@ -1916,34 +2019,19 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv,DEV)",
     "changeType": "UPSERT",
-    "aspectName": "operation",
+    "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "timestampMillis": 1615443388097,
-            "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+            "customProperties": {
+                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv",
+                "number_of_files": "1",
+                "size_in_bytes": "34056"
             },
-            "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847660000
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_files.json",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv,DEV)",
-    "changeType": "UPSERT",
-    "aspectName": "container",
-    "aspect": {
-        "json": {
-            "container": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
+            "name": "wa_fn_usec_hr_employee_attrition_csv.csv",
+            "description": "",
+            "tags": []
         }
     },
     "systemMetadata": {
@@ -1954,7 +2042,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv,DEV)",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
@@ -1989,29 +2077,6 @@
         "lastRunId": "no-run-id-provided"
     }
 },
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv,DEV)",
-    "changeType": "UPSERT",
-    "aspectName": "datasetProperties",
-    "aspect": {
-        "json": {
-            "customProperties": {
-                "schema_inferred_from": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv",
-                "number_of_files": "1",
-                "size_in_bytes": "34056"
-            },
-            "name": "wa_fn_usec_hr_employee_attrition_csv.csv",
-            "description": "",
-            "tags": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_files.json",
-        "lastRunId": "no-run-id-provided"
-    }
-},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv,DEV)",
@@ -2420,62 +2485,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv,DEV)",
-    "changeType": "UPSERT",
-    "aspectName": "operation",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1615443388097,
-            "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
-            },
-            "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847670000
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_files.json",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv,DEV)",
-    "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
-    "aspect": {
-        "json": {
-            "platform": "urn:li:dataPlatform:s3",
-            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:s3,test-platform-instance)"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_files.json",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv,DEV)",
-    "changeType": "UPSERT",
-    "aspectName": "container",
-    "aspect": {
-        "json": {
-            "container": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_files.json",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet.parquet,DEV)",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
@@ -2512,28 +2522,18 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/NPS.7.1.package_data_NPS.6.1_ARCN_Lakes_ChemistryData_v1_csv.csv,DEV)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_files.json",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet.parquet,DEV)",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "operation",
     "aspect": {
         "json": {
-            "removed": false
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847650000
         }
     },
     "systemMetadata": {
@@ -2544,12 +2544,12 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/food_parquet.parquet,DEV)",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:de5780654849d6a18b66df2f9cb8e8d9"
         }
     },
     "systemMetadata": {
@@ -2560,7 +2560,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/countries_json.json,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/NPS.7.1.package_data_NPS.6.1_ARCN_Lakes_ChemistryData_v1_csv.csv,DEV)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2592,7 +2592,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/small.csv,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,DEV)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2608,7 +2608,7 @@
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv,DEV)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-platform-instance.my-test-bucket/folder_a/folder_aa/folder_aaa/countries_json.json,DEV)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_multiple_spec_for_files.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_multiple_spec_for_files.json
index 9c41bbdc80c496..5d45a2a5f696e1 100644
--- a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_multiple_spec_for_files.json
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_multiple_spec_for_files.json
@@ -18,7 +18,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -111,7 +112,45 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "env": "PROD",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
+            },
+            "name": "folder_aa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -133,7 +172,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -145,8 +185,8 @@
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "operationType": "UPDATE",
             "lastUpdatedTimestamp": 1586847620000
@@ -154,32 +194,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
-    "changeType": "UPSERT",
-    "aspectName": "containerProperties",
-    "aspect": {
-        "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "PROD",
-                "bucket_name": "my-test-bucket"
-            },
-            "name": "my-test-bucket"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
+    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -189,54 +210,47 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
-    "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
-    "aspect": {
-        "json": {
-            "platform": "urn:li:dataPlatform:s3"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
+    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
         "json": {
             "typeNames": [
-                "S3 bucket"
+                "Folder"
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "path": []
+            "customProperties": {
+                "platform": "s3",
+                "env": "PROD",
+                "bucket_name": "my-test-bucket"
+            },
+            "name": "my-test-bucket"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -256,7 +270,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -271,7 +286,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -286,39 +302,42 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c",
+    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:2151647ff17bde0f948909d19fa91b9b"
+            "typeNames": [
+                "Folder"
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -338,89 +357,90 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "PROD",
-                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
-            },
-            "name": "folder_aa"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "removed": false
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "entityUrn": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "container": "urn:li:container:2151647ff17bde0f948909d19fa91b9b"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
-            ]
+            "path": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c"
+            "typeNames": [
+                "S3 bucket"
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -444,7 +464,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -464,37 +485,40 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -511,22 +535,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -554,7 +580,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -569,39 +596,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
-                    "urn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b"
-                },
-                {
-                    "id": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c",
-                    "urn": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c"
-                },
-                {
-                    "id": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
-                    "urn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15"
-                },
-                {
-                    "id": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0",
-                    "urn": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0"
-                }
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -623,7 +635,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -716,65 +729,102 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "globalTags",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "tags": [
+            "path": [
                 {
-                    "tag": "urn:li:tag:baz:bob"
+                    "id": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
+                    "urn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b"
                 },
                 {
-                    "tag": "urn:li:tag:foo:bar"
+                    "id": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c",
+                    "urn": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c"
+                },
+                {
+                    "id": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+                    "urn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15"
+                },
+                {
+                    "id": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0",
+                    "urn": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:baz:bob",
+    "changeType": "UPSERT",
+    "aspectName": "tagKey",
+    "aspect": {
+        "json": {
+            "name": "baz:bob"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "operation",
+    "aspectName": "globalTags",
     "aspect": {
         "json": {
-            "timestampMillis": 1615443388097,
-            "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
-            },
-            "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847630000
+            "tags": [
+                {
+                    "tag": "urn:li:tag:baz:bob"
+                },
+                {
+                    "tag": "urn:li:tag:foo:bar"
+                }
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "operation",
     "aspect": {
         "json": {
-            "container": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0"
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847630000
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -806,22 +856,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -836,22 +888,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
-    }
-},
-{
-    "entityType": "tag",
-    "entityUrn": "urn:li:tag:baz:bob",
-    "changeType": "UPSERT",
-    "aspectName": "tagKey",
-    "aspect": {
-        "json": {
-            "name": "baz:bob"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -866,7 +904,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_spec_for_files.json"
+        "runId": "multiple_spec_for_files.json",
+        "lastRunId": "no-run-id-provided"
     }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_multiple_specs_of_different_buckets.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_multiple_specs_of_different_buckets.json
index 985140f774ab47..90c3e0b3850b79 100644
--- a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_multiple_specs_of_different_buckets.json
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_multiple_specs_of_different_buckets.json
@@ -18,7 +18,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -111,7 +112,45 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "env": "PROD",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
+            },
+            "name": "folder_aa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -133,7 +172,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -145,8 +185,8 @@
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "operationType": "UPDATE",
             "lastUpdatedTimestamp": 1586847620000
@@ -154,32 +194,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
-    "changeType": "UPSERT",
-    "aspectName": "containerProperties",
-    "aspect": {
-        "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "PROD",
-                "bucket_name": "my-test-bucket"
-            },
-            "name": "my-test-bucket"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
+    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -189,54 +210,47 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
-    "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
-    "aspect": {
-        "json": {
-            "platform": "urn:li:dataPlatform:s3"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
+    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
         "json": {
             "typeNames": [
-                "S3 bucket"
+                "Folder"
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "path": []
+            "customProperties": {
+                "platform": "s3",
+                "env": "PROD",
+                "bucket_name": "my-test-bucket"
+            },
+            "name": "my-test-bucket"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -256,7 +270,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -271,7 +286,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -286,39 +302,42 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c",
+    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:2151647ff17bde0f948909d19fa91b9b"
+            "typeNames": [
+                "Folder"
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -338,89 +357,90 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "PROD",
-                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
-            },
-            "name": "folder_aa"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "removed": false
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "entityUrn": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "container": "urn:li:container:2151647ff17bde0f948909d19fa91b9b"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
-            ]
+            "path": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c"
+            "typeNames": [
+                "S3 bucket"
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -444,7 +464,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -464,37 +485,40 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -511,22 +535,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -554,7 +580,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -569,39 +596,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
-                    "urn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b"
-                },
-                {
-                    "id": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c",
-                    "urn": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c"
-                },
-                {
-                    "id": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
-                    "urn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15"
-                },
-                {
-                    "id": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0",
-                    "urn": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0"
-                }
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -623,7 +635,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -716,100 +729,123 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket-2/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "globalTags",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "tags": [
+            "path": [
                 {
-                    "tag": "urn:li:tag:baz:bob"
+                    "id": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
+                    "urn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b"
                 },
                 {
-                    "tag": "urn:li:tag:foo:bar"
+                    "id": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c",
+                    "urn": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c"
+                },
+                {
+                    "id": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+                    "urn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15"
+                },
+                {
+                    "id": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0",
+                    "urn": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket-2/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,PROD)",
+    "entityType": "container",
+    "entityUrn": "urn:li:container:680e54d5e3a7705caa1d99893fab4924",
     "changeType": "UPSERT",
-    "aspectName": "operation",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "timestampMillis": 1615443388097,
-            "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+            "customProperties": {
+                "platform": "s3",
+                "env": "PROD",
+                "bucket_name": "my-test-bucket-2"
             },
-            "operationType": "UPDATE",
-            "lastUpdatedTimestamp": 1586847630000
+            "name": "my-test-bucket-2"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:680e54d5e3a7705caa1d99893fab4924",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket-2/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "globalTags",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "PROD",
-                "bucket_name": "my-test-bucket-2"
-            },
-            "name": "my-test-bucket-2"
+            "tags": [
+                {
+                    "tag": "urn:li:tag:baz:bob"
+                },
+                {
+                    "tag": "urn:li:tag:foo:bar"
+                }
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:680e54d5e3a7705caa1d99893fab4924",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket-2/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "operation",
     "aspect": {
         "json": {
-            "removed": false
+            "timestampMillis": 1615443388097,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "UPDATE",
+            "lastUpdatedTimestamp": 1586847630000
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:680e54d5e3a7705caa1d99893fab4924",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -826,22 +862,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:680e54d5e3a7705caa1d99893fab4924",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "path": []
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -861,7 +899,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -876,7 +915,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -891,39 +931,42 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f6d8484efac8152d10620c6c0699d02d",
+    "entityUrn": "urn:li:container:680e54d5e3a7705caa1d99893fab4924",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
-            ]
+            "path": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:f6d8484efac8152d10620c6c0699d02d",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:680e54d5e3a7705caa1d99893fab4924"
+            "typeNames": [
+                "Folder"
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -943,7 +986,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -963,7 +1007,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -978,7 +1023,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -993,39 +1039,42 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "container",
-    "entityUrn": "urn:li:container:6e8c28494477b4a90cf5fd395217bae0",
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:baz:bob",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "tagKey",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
-            ]
+            "name": "baz:bob"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:6e8c28494477b4a90cf5fd395217bae0",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:f6d8484efac8152d10620c6c0699d02d"
+            "typeNames": [
+                "Folder"
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1049,7 +1098,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1069,37 +1119,72 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f6d8484efac8152d10620c6c0699d02d",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:680e54d5e3a7705caa1d99893fab4924"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:6e8c28494477b4a90cf5fd395217bae0",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f6d8484efac8152d10620c6c0699d02d"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ce2eca2107ef4c0b47a8f4a65eff971c",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:6e8c28494477b4a90cf5fd395217bae0"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ce2eca2107ef4c0b47a8f4a65eff971c",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1116,22 +1201,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:ce2eca2107ef4c0b47a8f4a65eff971c",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:6e8c28494477b4a90cf5fd395217bae0"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1159,7 +1246,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1174,7 +1262,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1189,7 +1278,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1221,37 +1311,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:s3,my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
-    }
-},
-{
-    "entityType": "tag",
-    "entityUrn": "urn:li:tag:baz:bob",
-    "changeType": "UPSERT",
-    "aspectName": "tagKey",
-    "aspect": {
-        "json": {
-            "name": "baz:bob"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -1266,7 +1327,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "multiple_specs_of_different_buckets.json"
+        "runId": "multiple_specs_of_different_buckets.json",
+        "lastRunId": "no-run-id-provided"
     }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_single_file.json b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_single_file.json
index 5d87d423a6a674..5fb691c1ee4579 100644
--- a/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_single_file.json
+++ b/metadata-ingestion/tests/integration/s3/golden-files/s3/golden_mces_single_file.json
@@ -18,7 +18,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -111,7 +112,45 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "s3",
+                "env": "PROD",
+                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
+            },
+            "name": "folder_aa"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -133,7 +172,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -145,8 +185,8 @@
         "json": {
             "timestampMillis": 1615443388097,
             "partitionSpec": {
-                "type": "FULL_TABLE",
-                "partition": "FULL_TABLE_SNAPSHOT"
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
             "operationType": "UPDATE",
             "lastUpdatedTimestamp": 1586847620000
@@ -154,32 +194,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
-    "changeType": "UPSERT",
-    "aspectName": "containerProperties",
-    "aspect": {
-        "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "PROD",
-                "bucket_name": "my-test-bucket"
-            },
-            "name": "my-test-bucket"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
+    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -189,54 +210,47 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
-    "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
-    "aspect": {
-        "json": {
-            "platform": "urn:li:dataPlatform:s3"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "single_file.json"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
+    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
         "json": {
             "typeNames": [
-                "S3 bucket"
+                "Folder"
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
     "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "path": []
+            "customProperties": {
+                "platform": "s3",
+                "env": "PROD",
+                "bucket_name": "my-test-bucket"
+            },
+            "name": "my-test-bucket"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -256,7 +270,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -271,7 +286,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -286,39 +302,42 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c",
+    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
-            ]
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:2151647ff17bde0f948909d19fa91b9b"
+            "typeNames": [
+                "Folder"
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -338,89 +357,90 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "s3",
-                "env": "PROD",
-                "folder_abs_path": "my-test-bucket/folder_a/folder_aa"
-            },
-            "name": "folder_aa"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "removed": false
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "entityUrn": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "container": "urn:li:container:2151647ff17bde0f948909d19fa91b9b"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Folder"
-            ]
+            "path": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15",
+    "entityUrn": "urn:li:container:2151647ff17bde0f948909d19fa91b9b",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:a8aa32e8169b2ecc7ab4f3389c79124c"
+            "typeNames": [
+                "S3 bucket"
+            ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -444,7 +464,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -464,37 +485,40 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "removed": false
+            "container": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:s3"
+            "removed": false
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -511,22 +535,24 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:5abb7acbb8783b9e2d266c15bf7cebc0",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "container": "urn:li:container:4f62b9a3e6794ee2cd4160bc0bbd8e15"
+            "platform": "urn:li:dataPlatform:s3"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -554,7 +580,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -569,7 +596,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -584,7 +612,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -616,7 +645,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -631,7 +661,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 },
 {
@@ -646,7 +677,8 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "single_file.json"
+        "runId": "single_file.json",
+        "lastRunId": "no-run-id-provided"
     }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/sources/s3/file_inference_without_extension.json b/metadata-ingestion/tests/integration/s3/sources/s3/file_inference_without_extension.json
new file mode 100644
index 00000000000000..87f7950946780a
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/s3/file_inference_without_extension.json
@@ -0,0 +1,19 @@
+{
+  "type": "s3",
+  "config": {
+    "platform_instance": "test-platform-instance",
+    "env": "DEV",
+    "use_s3_content_type": true,
+    "path_specs": [{
+      "include": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/no_extension/*"
+    }],
+    "aws_config": {
+      "aws_region": "us-east-1",
+      "aws_access_key_id": "testing",
+      "aws_secret_access_key": "testing"
+    },
+    "profiling": {
+      "enabled": false
+    }
+  }
+}
diff --git a/metadata-ingestion/tests/integration/s3/sources/s3/folder_no_partition.json b/metadata-ingestion/tests/integration/s3/sources/s3/folder_no_partition.json
index c06e411005399e..db3eaadf300407 100644
--- a/metadata-ingestion/tests/integration/s3/sources/s3/folder_no_partition.json
+++ b/metadata-ingestion/tests/integration/s3/sources/s3/folder_no_partition.json
@@ -2,6 +2,7 @@
   "type": "s3",
   "config": {
     "env": "UAT",
+    "sort_schema_fields": true,
     "path_specs": [{
       "include": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/{table}/*.*"
     }],
diff --git a/metadata-ingestion/tests/integration/s3/sources/s3/folder_partition_update_schema_with_partition_autodetect.json b/metadata-ingestion/tests/integration/s3/sources/s3/folder_partition_update_schema_with_partition_autodetect.json
new file mode 100644
index 00000000000000..2ed1a4ae9ccd31
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/s3/folder_partition_update_schema_with_partition_autodetect.json
@@ -0,0 +1,23 @@
+{
+  "type": "s3",
+  "config": {
+    "env": "UAT",
+    "path_specs": [{
+      "include": "s3://my-test-bucket/folder_a/folder_aa/{dept}/{table}/",
+      "sample_files": true,
+      "autodetect_partitions": true,
+      "table_name": "{dept}.{table}",
+      "exclude":[
+        "**/folder_aaaa/**"
+      ]
+    }],
+    "aws_config": {
+      "aws_region": "us-east-1",
+      "aws_access_key_id": "testing",
+      "aws_secret_access_key": "testing"
+    },
+    "profiling": {
+      "enabled": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/sources/s3/folder_partition_with_partition_autodetect_traverse_all.json b/metadata-ingestion/tests/integration/s3/sources/s3/folder_partition_with_partition_autodetect_traverse_all.json
new file mode 100644
index 00000000000000..b6aa75822612a7
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/s3/folder_partition_with_partition_autodetect_traverse_all.json
@@ -0,0 +1,24 @@
+{
+  "type": "s3",
+  "config": {
+    "env": "UAT",
+    "path_specs": [{
+      "include": "s3://my-test-bucket/folder_a/folder_aa/{dept}/{table}/",
+      "sample_files": true,
+      "autodetect_partitions": true,
+      "traversal_method": "ALL",
+      "table_name": "{dept}.{table}",
+      "exclude":[
+        "**/folder_aaaa/**"
+      ]
+    }],
+    "aws_config": {
+      "aws_region": "us-east-1",
+      "aws_access_key_id": "testing",
+      "aws_secret_access_key": "testing"
+    },
+    "profiling": {
+      "enabled": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/sources/s3/folder_partition_with_partition_autodetect_traverse_min_max.json b/metadata-ingestion/tests/integration/s3/sources/s3/folder_partition_with_partition_autodetect_traverse_min_max.json
new file mode 100644
index 00000000000000..ecf4fab1f4b073
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/s3/folder_partition_with_partition_autodetect_traverse_min_max.json
@@ -0,0 +1,24 @@
+{
+  "type": "s3",
+  "config": {
+    "env": "UAT",
+    "path_specs": [{
+      "include": "s3://my-test-bucket/folder_a/folder_aa/{dept}/{table}/",
+      "sample_files": true,
+      "autodetect_partitions": true,
+      "traversal_method": "MIN_MAX",
+      "table_name": "{dept}.{table}",
+      "exclude":[
+        "**/folder_aaaa/**"
+      ]
+    }],
+    "aws_config": {
+      "aws_region": "us-east-1",
+      "aws_access_key_id": "testing",
+      "aws_secret_access_key": "testing"
+    },
+    "profiling": {
+      "enabled": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/sources/shared/file_without_extension.json b/metadata-ingestion/tests/integration/s3/sources/shared/file_without_extension.json
new file mode 100644
index 00000000000000..235b588e5719bf
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/shared/file_without_extension.json
@@ -0,0 +1,19 @@
+{
+  "type": "s3",
+  "config": {
+    "platform_instance": "test-platform-instance",
+    "env": "DEV",
+    "path_specs": [{
+      "include": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/no_extension/*",
+      "default_extension": "csv"
+    }],
+    "aws_config": {
+      "aws_region": "us-east-1",
+      "aws_access_key_id": "testing",
+      "aws_secret_access_key": "testing"
+    },
+    "profiling": {
+      "enabled": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/sources/shared/folder_no_partition.json b/metadata-ingestion/tests/integration/s3/sources/shared/folder_no_partition.json
new file mode 100644
index 00000000000000..c06e411005399e
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/shared/folder_no_partition.json
@@ -0,0 +1,17 @@
+{
+  "type": "s3",
+  "config": {
+    "env": "UAT",
+    "path_specs": [{
+      "include": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/{table}/*.*"
+    }],
+    "aws_config": {
+      "aws_region": "us-east-1",
+      "aws_access_key_id": "testing",
+      "aws_secret_access_key": "testing"
+    },
+    "profiling": {
+      "enabled": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/sources/shared/folder_no_partition_exclude.json b/metadata-ingestion/tests/integration/s3/sources/shared/folder_no_partition_exclude.json
new file mode 100644
index 00000000000000..8d05bfcc60a0c7
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/shared/folder_no_partition_exclude.json
@@ -0,0 +1,20 @@
+{
+  "type": "s3",
+  "config": {
+    "env": "UAT",
+    "path_specs": [{
+      "include": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/{table}/*.*",
+      "exclude": [
+        "**/food_csv/**"
+      ]
+    }],
+    "aws_config": {
+      "aws_region": "us-east-1",
+      "aws_access_key_id": "testing",
+      "aws_secret_access_key": "testing"
+    },
+    "profiling": {
+      "enabled": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/sources/shared/folder_no_partition_filename.json b/metadata-ingestion/tests/integration/s3/sources/shared/folder_no_partition_filename.json
new file mode 100644
index 00000000000000..421483c74a8681
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/shared/folder_no_partition_filename.json
@@ -0,0 +1,19 @@
+{
+  "type": "s3",
+  "config": {
+    "env": "UAT",
+    "path_specs": [{
+      "include": "s3://my-test-bucket/folder_a/folder_aa/{dept}/{table}/*.*",
+      "file_types": ["csv"],
+      "table_name": "{dept}.{table}"
+    }],
+    "aws_config": {
+      "aws_region": "us-east-1",
+      "aws_access_key_id": "testing",
+      "aws_secret_access_key": "testing"
+    },
+    "profiling": {
+      "enabled": false
+    }
+  }
+}
diff --git a/metadata-ingestion/tests/integration/s3/sources/shared/folder_no_partition_glob.json b/metadata-ingestion/tests/integration/s3/sources/shared/folder_no_partition_glob.json
new file mode 100644
index 00000000000000..bf3f832f9c7b4a
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/shared/folder_no_partition_glob.json
@@ -0,0 +1,20 @@
+{
+  "type": "s3",
+  "config": {
+    "env": "UAT",
+    "path_specs": [{
+      "include": "s3://my-test-bucket/*/folder_aa/*/{table}/*.*",
+      "exclude": [
+        "**/food_csv/**"
+      ]
+    }],
+    "aws_config": {
+      "aws_region": "us-east-1",
+      "aws_access_key_id": "testing",
+      "aws_secret_access_key": "testing"
+    },
+    "profiling": {
+      "enabled": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/sources/shared/folder_partition_basic.json b/metadata-ingestion/tests/integration/s3/sources/shared/folder_partition_basic.json
new file mode 100644
index 00000000000000..c6afe024f6a2c8
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/shared/folder_partition_basic.json
@@ -0,0 +1,21 @@
+{
+  "type": "s3",
+  "config": {
+    "env": "UAT",
+    "path_specs": [{
+      "include": "s3://my-test-bucket/folder_a/folder_aa/{dept}/{table}/{partition[0]}/{partition[1]}/*.*",
+      "table_name": "{dept}.{table}",
+      "exclude":[
+        "**/folder_aaaa/**"
+      ]
+    }],
+    "aws_config": {
+      "aws_region": "us-east-1",
+      "aws_access_key_id": "testing",
+      "aws_secret_access_key": "testing"
+    },
+    "profiling": {
+      "enabled": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/sources/shared/folder_partition_keyval.json b/metadata-ingestion/tests/integration/s3/sources/shared/folder_partition_keyval.json
new file mode 100644
index 00000000000000..9bb6d129858ab0
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/shared/folder_partition_keyval.json
@@ -0,0 +1,18 @@
+{
+  "type": "s3",
+  "config": {
+    "env": "UAT",
+    "path_specs": [{
+      "include": "s3://my-test-bucket/folder_a/folder_aa/{dept}/{table}/{partition_key[0]}={partition[0]}/{partition_key[1]}={partition[1]}/*.*",
+      "table_name": "{dept}.{table}"
+    }],
+    "aws_config": {
+      "aws_region": "us-east-1",
+      "aws_access_key_id": "testing",
+      "aws_secret_access_key": "testing"
+    },
+    "profiling": {
+      "enabled": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/sources/shared/folder_partition_update_schema.json b/metadata-ingestion/tests/integration/s3/sources/shared/folder_partition_update_schema.json
new file mode 100644
index 00000000000000..b542f60a6a8aa6
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/shared/folder_partition_update_schema.json
@@ -0,0 +1,22 @@
+{
+  "type": "s3",
+  "config": {
+    "env": "UAT",
+    "path_specs": [{
+      "include": "s3://my-test-bucket/folder_a/folder_aa/{dept}/{table}/{partition[0]}/{partition[1]}/*.*",
+      "sample_files": true,
+      "table_name": "{dept}.{table}",
+      "exclude":[
+        "**/folder_aaaa/**"
+      ]
+    }],
+    "aws_config": {
+      "aws_region": "us-east-1",
+      "aws_access_key_id": "testing",
+      "aws_secret_access_key": "testing"
+    },
+    "profiling": {
+      "enabled": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/sources/shared/multiple_files.json b/metadata-ingestion/tests/integration/s3/sources/shared/multiple_files.json
new file mode 100644
index 00000000000000..77be022895cfca
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/shared/multiple_files.json
@@ -0,0 +1,18 @@
+{
+  "type": "s3",
+  "config": {
+    "platform_instance": "test-platform-instance",
+    "env": "DEV",
+    "path_specs": [{
+      "include": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/*.*"
+    }],
+    "aws_config": {
+      "aws_region": "us-east-1",
+      "aws_access_key_id": "testing",
+      "aws_secret_access_key": "testing"
+    },
+    "profiling": {
+      "enabled": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/s3/sources/shared/multiple_spec_for_files.json b/metadata-ingestion/tests/integration/s3/sources/shared/multiple_spec_for_files.json
new file mode 100644
index 00000000000000..d051421e154e72
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/shared/multiple_spec_for_files.json
@@ -0,0 +1,23 @@
+{
+  "type": "s3",
+  "config": {
+    "path_specs": [
+      {
+        "include": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro"
+      },
+      {
+        "include": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv"
+      }
+    ],
+    "aws_config": {
+      "aws_region": "us-east-1",
+      "aws_access_key_id": "testing",
+      "aws_secret_access_key": "testing"
+    },
+    "profiling": {
+      "enabled": false
+    },
+    "use_s3_bucket_tags": true,
+    "use_s3_object_tags": true
+  }
+}
diff --git a/metadata-ingestion/tests/integration/s3/sources/shared/multiple_specs_of_different_buckets.json b/metadata-ingestion/tests/integration/s3/sources/shared/multiple_specs_of_different_buckets.json
new file mode 100644
index 00000000000000..d6aec502e11954
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/shared/multiple_specs_of_different_buckets.json
@@ -0,0 +1,23 @@
+{
+    "type": "s3",
+    "config": {
+      "path_specs": [
+        {
+          "include": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro"
+        },
+        {
+          "include": "s3://my-test-bucket-2/folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv"
+        }
+      ],
+      "aws_config": {
+        "aws_region": "us-east-1",
+        "aws_access_key_id": "testing",
+        "aws_secret_access_key": "testing"
+      },
+      "profiling": {
+        "enabled": false
+      },
+      "use_s3_bucket_tags": true,
+      "use_s3_object_tags": true
+    }
+}
diff --git a/metadata-ingestion/tests/integration/s3/sources/shared/single_file.json b/metadata-ingestion/tests/integration/s3/sources/shared/single_file.json
new file mode 100644
index 00000000000000..96e5eafa562dd3
--- /dev/null
+++ b/metadata-ingestion/tests/integration/s3/sources/shared/single_file.json
@@ -0,0 +1,20 @@
+{
+  "type": "s3",
+  "config": {
+    "path_specs": [
+      {
+        "include": "s3://my-test-bucket/folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro"
+      }
+    ],
+    "aws_config": {
+      "aws_region": "us-east-1",
+      "aws_access_key_id": "testing",
+      "aws_secret_access_key": "testing"
+    },
+    "profiling": {
+      "enabled": false
+    },
+    "use_s3_bucket_tags": true,
+    "use_s3_object_tags": true
+  }
+}
diff --git a/metadata-ingestion/tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv/part3.csv b/metadata-ingestion/tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv/part3.csv
index e69de29bb2d1d6..c757de4cc1d772 100644
--- a/metadata-ingestion/tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv/part3.csv
+++ b/metadata-ingestion/tests/integration/s3/test_data/local_system/folder_a/folder_aa/folder_aaa/food_csv/part3.csv
@@ -0,0 +1,5 @@
+name,weight,height,color
+apple,50,4,red
+cookie,23,4,brown
+lasagna,49,4,red
+pasta,72,4,yellow
diff --git a/metadata-ingestion/tests/integration/s3/test_s3.py b/metadata-ingestion/tests/integration/s3/test_s3.py
index d255463444b18a..b45f1f78fc55a8 100644
--- a/metadata-ingestion/tests/integration/s3/test_s3.py
+++ b/metadata-ingestion/tests/integration/s3/test_s3.py
@@ -15,6 +15,48 @@
 
 FROZEN_TIME = "2020-04-14 07:00:00"
 
+FILE_LIST_FOR_VALIDATION = [
+    "folder_a/folder_aa/folder_aaa/NPS.7.1.package_data_NPS.6.1_ARCN_Lakes_ChemistryData_v1_csv.csv",
+    "folder_a/folder_aa/folder_aaa/chord_progressions_avro.avro",
+    "folder_a/folder_aa/folder_aaa/chord_progressions_csv.csv",
+    "folder_a/folder_aa/folder_aaa/countries_json.json",
+    "folder_a/folder_aa/folder_aaa/food_parquet.parquet",
+    "folder_a/folder_aa/folder_aaa/small.csv",
+    "folder_a/folder_aa/folder_aaa/wa_fn_usec_hr_employee_attrition_csv.csv",
+    "folder_a/folder_aa/folder_aaa/folder_aaaa/pokemon_abilities_yearwise_2019/month=feb/part1.json",
+    "folder_a/folder_aa/folder_aaa/folder_aaaa/pokemon_abilities_yearwise_2019/month=feb/part2.json",
+    "folder_a/folder_aa/folder_aaa/folder_aaaa/pokemon_abilities_yearwise_2019/month=jan/part1.json",
+    "folder_a/folder_aa/folder_aaa/folder_aaaa/pokemon_abilities_yearwise_2019/month=jan/part2.json",
+    "folder_a/folder_aa/folder_aaa/folder_aaaa/pokemon_abilities_yearwise_2020/month=feb/part1.json",
+    "folder_a/folder_aa/folder_aaa/folder_aaaa/pokemon_abilities_yearwise_2020/month=feb/part2.json",
+    "folder_a/folder_aa/folder_aaa/folder_aaaa/pokemon_abilities_yearwise_2020/month=march/part1.json",
+    "folder_a/folder_aa/folder_aaa/folder_aaaa/pokemon_abilities_yearwise_2020/month=march/part2.json",
+    "folder_a/folder_aa/folder_aaa/folder_aaaa/pokemon_abilities_yearwise_2021/month=april/part1.json",
+    "folder_a/folder_aa/folder_aaa/folder_aaaa/pokemon_abilities_yearwise_2021/month=april/part2.json",
+    "folder_a/folder_aa/folder_aaa/folder_aaaa/pokemon_abilities_yearwise_2021/month=march/part1.json",
+    "folder_a/folder_aa/folder_aaa/folder_aaaa/pokemon_abilities_yearwise_2021/month=march/part2.json",
+    "folder_a/folder_aa/folder_aaa/food_csv/part1.csv",
+    "folder_a/folder_aa/folder_aaa/food_csv/part2.csv",
+    "folder_a/folder_aa/folder_aaa/food_csv/part3.csv",
+    "folder_a/folder_aa/folder_aaa/food_parquet/part1.parquet",
+    "folder_a/folder_aa/folder_aaa/food_parquet/part2.parquet",
+    "folder_a/folder_aa/folder_aaa/no_extension/small",
+    "folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2019/month=feb/part1.json",
+    "folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2019/month=feb/part2.json",
+    "folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2019/month=jan/part1.json",
+    "folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2019/month=jan/part2.json",
+    "folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2020/month=feb/part1.json",
+    "folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2020/month=feb/part2.json",
+    "folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2020/month=march/part1.json",
+    "folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2020/month=march/part2.json",
+    "folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2021/month=april/part1.json",
+    "folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2021/month=april/part2.json",
+    "folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2021/month=march/part1.json",
+    "folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2021/month=march/part2.json",
+    "folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2022/month=jan/part3.json",
+    "folder_a/folder_aa/folder_aaa/pokemon_abilities_json/year=2022/month=jan/_temporary/dummy.json",
+]
+
 
 @pytest.fixture(scope="module", autouse=True)
 def bucket_names():
@@ -60,11 +102,20 @@ def s3_populate(pytestconfig, s3_resource, s3_client, bucket_names):
         current_time_sec = datetime.strptime(
             FROZEN_TIME, "%Y-%m-%d %H:%M:%S"
         ).timestamp()
+        file_list = []
         for root, _dirs, files in os.walk(test_resources_dir):
+            _dirs.sort()
             for file in sorted(files):
                 full_path = os.path.join(root, file)
                 rel_path = os.path.relpath(full_path, test_resources_dir)
-                bkt.upload_file(full_path, rel_path)
+                file_list.append(rel_path)
+                bkt.upload_file(
+                    full_path,
+                    rel_path,  # Set content type for `no_extension/small` file to text/csv
+                    ExtraArgs={"ContentType": "text/csv"}
+                    if "." not in rel_path
+                    else {},
+                )
                 s3_client.put_object_tagging(
                     Bucket=bucket_name,
                     Key=rel_path,
@@ -77,6 +128,9 @@ def s3_populate(pytestconfig, s3_resource, s3_client, bucket_names):
                 )
                 current_time_sec += 10
                 key.last_modified = datetime.fromtimestamp(current_time_sec)
+
+        # This is used to make sure the list of files are the same in the test as locally
+        assert file_list == FILE_LIST_FOR_VALIDATION
     yield
 
 
@@ -95,18 +149,24 @@ def touch_local_files(pytestconfig):
             os.utime(full_path, times=(current_time_sec, current_time_sec))
 
 
-SOURCE_FILES_PATH = "./tests/integration/s3/sources/s3"
-source_files = os.listdir(SOURCE_FILES_PATH)
+SHARED_SOURCE_FILES_PATH = "./tests/integration/s3/sources/shared"
+shared_source_files = [
+    (SHARED_SOURCE_FILES_PATH, p) for p in os.listdir(SHARED_SOURCE_FILES_PATH)
+]
+
+S3_SOURCE_FILES_PATH = "./tests/integration/s3/sources/s3"
+s3_source_files = [(S3_SOURCE_FILES_PATH, p) for p in os.listdir(S3_SOURCE_FILES_PATH)]
 
 
 @pytest.mark.integration
-@pytest.mark.parametrize("source_file", source_files)
+@pytest.mark.parametrize("source_file_tuple", shared_source_files + s3_source_files)
 def test_data_lake_s3_ingest(
-    pytestconfig, s3_populate, source_file, tmp_path, mock_time
+    pytestconfig, s3_populate, source_file_tuple, tmp_path, mock_time
 ):
+    source_dir, source_file = source_file_tuple
     test_resources_dir = pytestconfig.rootpath / "tests/integration/s3/"
 
-    f = open(os.path.join(SOURCE_FILES_PATH, source_file))
+    f = open(os.path.join(source_dir, source_file))
     source = json.load(f)
 
     config_dict = {}
@@ -136,12 +196,13 @@ def test_data_lake_s3_ingest(
 
 
 @pytest.mark.integration
-@pytest.mark.parametrize("source_file", source_files)
+@pytest.mark.parametrize("source_file_tuple", shared_source_files)
 def test_data_lake_local_ingest(
-    pytestconfig, touch_local_files, source_file, tmp_path, mock_time
+    pytestconfig, touch_local_files, source_file_tuple, tmp_path, mock_time
 ):
+    source_dir, source_file = source_file_tuple
     test_resources_dir = pytestconfig.rootpath / "tests/integration/s3/"
-    f = open(os.path.join(SOURCE_FILES_PATH, source_file))
+    f = open(os.path.join(source_dir, source_file))
     source = json.load(f)
 
     config_dict = {}
diff --git a/metadata-ingestion/tests/integration/sac/__init__.py b/metadata-ingestion/tests/integration/sac/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/metadata-ingestion/tests/integration/sac/metadata.xml b/metadata-ingestion/tests/integration/sac/metadata.xml
new file mode 100644
index 00000000000000..203f85dd286c9b
--- /dev/null
+++ b/metadata-ingestion/tests/integration/sac/metadata.xml
@@ -0,0 +1,404 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<edmx:Edmx Version="1.0" xmlns:edmx="http://schemas.microsoft.com/ado/2007/06/edmx">
+    <edmx:DataServices xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" m:DataServiceVersion="2.0">
+        <Schema Namespace="sap.fpa.services.search.internal" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns="http://schemas.microsoft.com/ado/2008/09/edm">
+            <EntityType Name="FilterRepositoriesType">
+                <Key>
+                    <PropertyRef Name="id" />
+                </Key>
+                <Property Name="id" Type="Edm.String" Nullable="false" MaxLength="256" />
+                <Property Name="type" Type="Edm.String" MaxLength="256" />
+                <Property Name="subType" Type="Edm.String" MaxLength="256" />
+                <Property Name="name" Type="Edm.String" MaxLength="255" />
+                <Property Name="description" Type="Edm.String" MaxLength="1024" />
+                <Property Name="createdBy" Type="Edm.String" MaxLength="127" />
+                <Property Name="createdTime" Type="Edm.DateTime" />
+                <Property Name="modifiedBy" Type="Edm.String" MaxLength="127" />
+                <Property Name="modifiedTime" Type="Edm.DateTime" />
+                <Property Name="isTemplate" Type="Edm.Int32" />
+                <Property Name="isSample" Type="Edm.Int32" />
+                <Property Name="isPublic" Type="Edm.Int32" />
+                <Property Name="openURL" Type="Edm.String" MaxLength="255" />
+                <Property Name="ancestorPath" Type="Edm.String" MaxLength="5000" />
+                <Property Name="lastIndexedTime" Type="Edm.DateTime" />
+                <Property Name="isMobile" Type="Edm.Int32" />
+                <Property Name="parentId" Type="Edm.String" MaxLength="256" />
+                <NavigationProperty Name="createdByUser" Relationship="sap.fpa.services.search.internal.RepositoryCreatedByType" FromRole="FilterRepositoriesPrincipal" ToRole="createdByDependent" />
+                <NavigationProperty Name="modifiedByUser" Relationship="sap.fpa.services.search.internal.RepositoryModifiedByType" FromRole="FilterRepositoriesPrincipal" ToRole="modifiedByDependent" />
+                <NavigationProperty Name="permissions" Relationship="sap.fpa.services.search.internal.RepositoryPermissionsType" FromRole="FilterRepositoriesPrincipal" ToRole="resourcePermissionsDependent" />
+            </EntityType>
+            <EntityType Name="RepositoriesType">
+                <Key>
+                    <PropertyRef Name="id" />
+                </Key>
+                <Property Name="name" Type="Edm.String" MaxLength="255" />
+                <Property Name="description" Type="Edm.String" MaxLength="1024" />
+                <Property Name="id" Type="Edm.String" Nullable="false" MaxLength="256" />
+                <Property Name="type" Type="Edm.String" MaxLength="256" />
+                <Property Name="subType" Type="Edm.String" MaxLength="256" />
+                <Property Name="createdTime" Type="Edm.DateTime" />
+                <Property Name="createdBy" Type="Edm.String" MaxLength="127" />
+                <Property Name="modifiedBy" Type="Edm.String" MaxLength="127" />
+                <Property Name="modifiedTime" Type="Edm.DateTime" />
+                <Property Name="isTemplate" Type="Edm.Int32" />
+                <Property Name="isSample" Type="Edm.Int32" />
+                <Property Name="isPublic" Type="Edm.Int32" />
+                <Property Name="isMobile" Type="Edm.Int32" />
+                <Property Name="openURL" Type="Edm.String" MaxLength="255" />
+                <Property Name="ancestorPath" Type="Edm.String" MaxLength="5000" />
+                <Property Name="lastIndexedTime" Type="Edm.DateTime" />
+                <Property Name="parentId" Type="Edm.String" MaxLength="256" />
+                <NavigationProperty Name="createdByUser" Relationship="sap.fpa.services.search.internal.FilterRepositoryCreatedByType" FromRole="RepositoriesPrincipal" ToRole="createdByDependent" />
+                <NavigationProperty Name="modifiedByUser" Relationship="sap.fpa.services.search.internal.FilterRepositoryModifiedByType" FromRole="RepositoriesPrincipal" ToRole="modifiedByDependent" />
+                <NavigationProperty Name="permissions" Relationship="sap.fpa.services.search.internal.FilterRepositoryPermissionsType" FromRole="RepositoriesPrincipal" ToRole="resourcePermissionsDependent" />
+            </EntityType>
+            <EntityType Name="FilterResourcesType">
+                <Key>
+                    <PropertyRef Name="resourceId" />
+                </Key>
+                <Property Name="resourceId" Type="Edm.String" Nullable="false" MaxLength="256" />
+                <Property Name="resourceType" Type="Edm.String" MaxLength="256" />
+                <Property Name="resourceSubtype" Type="Edm.String" MaxLength="256" />
+                <Property Name="storyId" Type="Edm.String" MaxLength="255" />
+                <Property Name="name" Type="Edm.String" MaxLength="255" />
+                <Property Name="description" Type="Edm.String" MaxLength="1024" />
+                <Property Name="createdBy" Type="Edm.String" MaxLength="127" />
+                <Property Name="createdTime" Type="Edm.DateTime" />
+                <Property Name="modifiedBy" Type="Edm.String" MaxLength="127" />
+                <Property Name="modifiedTime" Type="Edm.DateTime" />
+                <Property Name="isTemplate" Type="Edm.Int32" />
+                <Property Name="isSample" Type="Edm.Int32" />
+                <Property Name="isPublic" Type="Edm.Int32" />
+                <Property Name="openURL" Type="Edm.String" MaxLength="255" />
+                <Property Name="ancestorPath" Type="Edm.String" MaxLength="5000" />
+                <Property Name="lastIndexedTime" Type="Edm.DateTime" />
+                <Property Name="isMobile" Type="Edm.Int32" />
+                <NavigationProperty Name="resourceModels" Relationship="sap.fpa.services.search.internal.Resources_ModelsType" FromRole="FilterResourcesPrincipal" ToRole="ModelsDependent" />
+                <NavigationProperty Name="storyPages" Relationship="sap.fpa.services.search.internal.Resources_PagesType" FromRole="FilterResourcesPrincipal" ToRole="PagesDependent" />
+                <NavigationProperty Name="createdByUser" Relationship="sap.fpa.services.search.internal.Created_ByType" FromRole="FilterResourcesPrincipal" ToRole="createdByDependent" />
+                <NavigationProperty Name="modifiedByUser" Relationship="sap.fpa.services.search.internal.Modified_ByType" FromRole="FilterResourcesPrincipal" ToRole="modifiedByDependent" />
+                <NavigationProperty Name="resourcePermissions" Relationship="sap.fpa.services.search.internal.Resource_PermissionsType" FromRole="FilterResourcesPrincipal" ToRole="resourcePermissionsDependent" />
+                <NavigationProperty Name="resourceRemoteSystems" Relationship="sap.fpa.services.search.internal.Resource_Remote_SystemsType" FromRole="FilterResourcesPrincipal" ToRole="ModelsRemoteSystemsDependent" />
+                <NavigationProperty Name="resourceQueryValidationStatusInfos" Relationship="sap.fpa.services.search.internal.Resource_Query_Validation_StatusType" FromRole="FilterResourcesPrincipal" ToRole="resourceQueryValidationStatusInfosDependent" />
+                <NavigationProperty Name="isValid" Relationship="sap.fpa.services.search.internal.Resource_Is_ValidType" FromRole="FilterResourcesPrincipal" ToRole="isValidDependent" />
+            </EntityType>
+            <EntityType Name="ResourcesType">
+                <Key>
+                    <PropertyRef Name="resourceId" />
+                </Key>
+                <Property Name="name" Type="Edm.String" MaxLength="255" />
+                <Property Name="description" Type="Edm.String" MaxLength="1024" />
+                <Property Name="resourceId" Type="Edm.String" Nullable="false" MaxLength="256" />
+                <Property Name="resourceType" Type="Edm.String" MaxLength="256" />
+                <Property Name="resourceSubtype" Type="Edm.String" MaxLength="256" />
+                <Property Name="storyId" Type="Edm.String" MaxLength="255" />
+                <Property Name="createdTime" Type="Edm.DateTime" />
+                <Property Name="createdBy" Type="Edm.String" MaxLength="127" />
+                <Property Name="modifiedBy" Type="Edm.String" MaxLength="127" />
+                <Property Name="modifiedTime" Type="Edm.DateTime" />
+                <Property Name="isTemplate" Type="Edm.Int32" />
+                <Property Name="isSample" Type="Edm.Int32" />
+                <Property Name="isPublic" Type="Edm.Int32" />
+                <Property Name="isMobile" Type="Edm.Int32" />
+                <Property Name="openURL" Type="Edm.String" MaxLength="255" />
+                <Property Name="ancestorPath" Type="Edm.String" MaxLength="5000" />
+                <Property Name="lastIndexedTime" Type="Edm.DateTime" />
+                <NavigationProperty Name="resourceModels" Relationship="sap.fpa.services.search.internal.Filter_Resources_ModelsType" FromRole="ResourcesPrincipal" ToRole="ModelsDependent" />
+                <NavigationProperty Name="storyPages" Relationship="sap.fpa.services.search.internal.Filter_Resources_PagesType" FromRole="ResourcesPrincipal" ToRole="PagesDependent" />
+                <NavigationProperty Name="createdByUser" Relationship="sap.fpa.services.search.internal.Filter_Created_ByType" FromRole="ResourcesPrincipal" ToRole="createdByDependent" />
+                <NavigationProperty Name="modifiedByUser" Relationship="sap.fpa.services.search.internal.Filter_Modified_ByType" FromRole="ResourcesPrincipal" ToRole="modifiedByDependent" />
+                <NavigationProperty Name="resourcePermissions" Relationship="sap.fpa.services.search.internal.Filter_Resource_PermissionsType" FromRole="ResourcesPrincipal" ToRole="resourcePermissionsDependent" />
+                <NavigationProperty Name="resourceRemoteSystems" Relationship="sap.fpa.services.search.internal.Filter_Resource_Remote_SystemsType" FromRole="ResourcesPrincipal" ToRole="ModelsRemoteSystemsDependent" />
+                <NavigationProperty Name="resourceQueryValidationStatusInfos" Relationship="sap.fpa.services.search.internal.Filter_Resource_Query_Validation_StatusType" FromRole="ResourcesPrincipal" ToRole="resourceQueryValidationStatusInfosDependent" />
+                <NavigationProperty Name="isValid" Relationship="sap.fpa.services.search.internal.Filter_Resource_Is_ValidType" FromRole="ResourcesPrincipal" ToRole="isValidDependent" />
+            </EntityType>
+            <EntityType Name="ModelsType">
+                <Key>
+                    <PropertyRef Name="resourceId" />
+                    <PropertyRef Name="modelId" />
+                </Key>
+                <Property Name="resourceId" Type="Edm.String" Nullable="false" MaxLength="255" />
+                <Property Name="modelId" Type="Edm.String" Nullable="false" MaxLength="400" />
+                <Property Name="name" Type="Edm.String" MaxLength="1024" />
+                <Property Name="description" Type="Edm.String" MaxLength="1024" />
+                <Property Name="externalId" Type="Edm.String" MaxLength="400" />
+                <Property Name="isPlanning" Type="Edm.Int32" DefaultValue="0" />
+                <Property Name="connectionId" Type="Edm.String" MaxLength="100" />
+                <Property Name="connectionName" Type="Edm.String" MaxLength="1024" />
+                <Property Name="connectionType" Type="Edm.String" MaxLength="10" />
+                <Property Name="systemType" Type="Edm.String" MaxLength="10" />
+                <Property Name="protocol" Type="Edm.String" MaxLength="5" />
+                <Property Name="client" Type="Edm.String" MaxLength="3" />
+                <Property Name="language" Type="Edm.String" MaxLength="10" />
+                <Property Name="hcpAccount" Type="Edm.String" MaxLength="256" />
+                <Property Name="pathPrefix" Type="Edm.String" MaxLength="2048" />
+                <Property Name="host" Type="Edm.String" MaxLength="2048" />
+                <Property Name="port" Type="Edm.String" MaxLength="5" />
+                <Property Name="lastIndexedTime" Type="Edm.DateTime" />
+            </EntityType>
+            <EntityType Name="PagesType">
+                <Key>
+                    <PropertyRef Name="storyId" />
+                    <PropertyRef Name="sequenceNumber" />
+                </Key>
+                <Property Name="storyId" Type="Edm.String" Nullable="false" MaxLength="255" />
+                <Property Name="sequenceNumber" Type="Edm.Int32" Nullable="false" />
+                <Property Name="name" Type="Edm.String" MaxLength="1024" />
+                <Property Name="type" Type="Edm.String" MaxLength="15" />
+                <Property Name="lastIndexedTime" Type="Edm.DateTime" />
+            </EntityType>
+            <EntityType Name="ModelsRemoteSystemsType">
+                <Key>
+                    <PropertyRef Name="resourceId" />
+                </Key>
+                <Property Name="resourceId" Type="Edm.String" Nullable="false" MaxLength="255" />
+                <Property Name="systemType" Type="Edm.String" MaxLength="5000" />
+            </EntityType>
+            <EntityType Name="isValidType">
+                <Key>
+                    <PropertyRef Name="resourceId" />
+                </Key>
+                <Property Name="isValid" Type="Edm.Int32" />
+                <Property Name="resourceId" Type="Edm.String" Nullable="false" MaxLength="256" />
+            </EntityType>
+            <EntityType Name="createdByType">
+                <Key>
+                    <PropertyRef Name="userId" />
+                </Key>
+                <Property Name="userId" Type="Edm.String" Nullable="false" MaxLength="127" />
+                <Property Name="firstName" Type="Edm.String" MaxLength="5000" />
+                <Property Name="lastName" Type="Edm.String" MaxLength="5000" />
+                <Property Name="displayName" Type="Edm.String" MaxLength="5000" />
+                <Property Name="samlUsername" Type="Edm.String" MaxLength="256" />
+                <Property Name="lastIndexedTime" Type="Edm.DateTime" />
+            </EntityType>
+            <EntityType Name="modifiedByType">
+                <Key>
+                    <PropertyRef Name="userId" />
+                </Key>
+                <Property Name="userId" Type="Edm.String" Nullable="false" MaxLength="127" />
+                <Property Name="firstName" Type="Edm.String" MaxLength="5000" />
+                <Property Name="lastName" Type="Edm.String" MaxLength="5000" />
+                <Property Name="displayName" Type="Edm.String" MaxLength="5000" />
+                <Property Name="samlUsername" Type="Edm.String" MaxLength="256" />
+                <Property Name="lastIndexedTime" Type="Edm.DateTime" />
+            </EntityType>
+            <EntityType Name="resourcePermissionsType">
+                <Key>
+                    <PropertyRef Name="requestId" />
+                    <PropertyRef Name="resourceId" />
+                </Key>
+                <Property Name="requestId" Type="Edm.String" Nullable="false" MaxLength="37" />
+                <Property Name="resourceId" Type="Edm.String" Nullable="false" MaxLength="256" />
+                <Property Name="isChangeable" Type="Edm.Int32" DefaultValue="0" />
+                <Property Name="isDeletable" Type="Edm.Int32" DefaultValue="0" />
+                <Property Name="isShared" Type="Edm.Int32" DefaultValue="0" />
+                <Property Name="isSharedToAny" Type="Edm.Int32" DefaultValue="0" />
+                <Property Name="isShareable" Type="Edm.Int32" DefaultValue="0" />
+            </EntityType>
+            <EntityType Name="resourceQueryValidationStatusInfosType">
+                <Key>
+                    <PropertyRef Name="id" />
+                </Key>
+                <Property Name="id" Type="Edm.String" Nullable="false" MaxLength="37" />
+                <Property Name="resourceId" Type="Edm.String" MaxLength="256" />
+                <Property Name="code" Type="Edm.String" MaxLength="128" />
+                <Property Name="baseObject" Type="Edm.String" MaxLength="256" />
+                <Property Name="columnName" Type="Edm.String" MaxLength="256" />
+                <Property Name="objectDescription" Type="Edm.String" MaxLength="5000" />
+                <Property Name="objectType" Type="Edm.String" MaxLength="32" />
+                <Property Name="lastIndexedTime" Type="Edm.DateTime" />
+            </EntityType>
+            <Association Name="Resources_ModelsType">
+                <End Type="sap.fpa.services.search.internal.FilterResourcesType" Role="FilterResourcesPrincipal" Multiplicity="1" />
+                <End Type="sap.fpa.services.search.internal.ModelsType" Role="ModelsDependent" Multiplicity="*" />
+            </Association>
+            <Association Name="Resources_PagesType">
+                <End Type="sap.fpa.services.search.internal.FilterResourcesType" Role="FilterResourcesPrincipal" Multiplicity="1" />
+                <End Type="sap.fpa.services.search.internal.PagesType" Role="PagesDependent" Multiplicity="*" />
+            </Association>
+            <Association Name="Created_ByType">
+                <End Type="sap.fpa.services.search.internal.FilterResourcesType" Role="FilterResourcesPrincipal" Multiplicity="*" />
+                <End Type="sap.fpa.services.search.internal.createdByType" Role="createdByDependent" Multiplicity="1" />
+            </Association>
+            <Association Name="Modified_ByType">
+                <End Type="sap.fpa.services.search.internal.FilterResourcesType" Role="FilterResourcesPrincipal" Multiplicity="*" />
+                <End Type="sap.fpa.services.search.internal.modifiedByType" Role="modifiedByDependent" Multiplicity="1" />
+            </Association>
+            <Association Name="Resource_PermissionsType">
+                <End Type="sap.fpa.services.search.internal.FilterResourcesType" Role="FilterResourcesPrincipal" Multiplicity="1" />
+                <End Type="sap.fpa.services.search.internal.resourcePermissionsType" Role="resourcePermissionsDependent" Multiplicity="*" />
+            </Association>
+            <Association Name="Resource_Remote_SystemsType">
+                <End Type="sap.fpa.services.search.internal.FilterResourcesType" Role="FilterResourcesPrincipal" Multiplicity="1" />
+                <End Type="sap.fpa.services.search.internal.ModelsRemoteSystemsType" Role="ModelsRemoteSystemsDependent" Multiplicity="1" />
+            </Association>
+            <Association Name="Resource_Query_Validation_StatusType">
+                <End Type="sap.fpa.services.search.internal.FilterResourcesType" Role="FilterResourcesPrincipal" Multiplicity="1" />
+                <End Type="sap.fpa.services.search.internal.resourceQueryValidationStatusInfosType" Role="resourceQueryValidationStatusInfosDependent" Multiplicity="*" />
+            </Association>
+            <Association Name="Resource_Is_ValidType">
+                <End Type="sap.fpa.services.search.internal.FilterResourcesType" Role="FilterResourcesPrincipal" Multiplicity="1" />
+                <End Type="sap.fpa.services.search.internal.isValidType" Role="isValidDependent" Multiplicity="1" />
+            </Association>
+            <Association Name="Filter_Resources_ModelsType">
+                <End Type="sap.fpa.services.search.internal.ResourcesType" Role="ResourcesPrincipal" Multiplicity="1" />
+                <End Type="sap.fpa.services.search.internal.ModelsType" Role="ModelsDependent" Multiplicity="*" />
+            </Association>
+            <Association Name="Filter_Resources_PagesType">
+                <End Type="sap.fpa.services.search.internal.ResourcesType" Role="ResourcesPrincipal" Multiplicity="1" />
+                <End Type="sap.fpa.services.search.internal.PagesType" Role="PagesDependent" Multiplicity="*" />
+            </Association>
+            <Association Name="Filter_Created_ByType">
+                <End Type="sap.fpa.services.search.internal.ResourcesType" Role="ResourcesPrincipal" Multiplicity="*" />
+                <End Type="sap.fpa.services.search.internal.createdByType" Role="createdByDependent" Multiplicity="1" />
+            </Association>
+            <Association Name="Filter_Modified_ByType">
+                <End Type="sap.fpa.services.search.internal.ResourcesType" Role="ResourcesPrincipal" Multiplicity="*" />
+                <End Type="sap.fpa.services.search.internal.modifiedByType" Role="modifiedByDependent" Multiplicity="1" />
+            </Association>
+            <Association Name="Filter_Resource_PermissionsType">
+                <End Type="sap.fpa.services.search.internal.ResourcesType" Role="ResourcesPrincipal" Multiplicity="1" />
+                <End Type="sap.fpa.services.search.internal.resourcePermissionsType" Role="resourcePermissionsDependent" Multiplicity="*" />
+            </Association>
+            <Association Name="Filter_Resource_Remote_SystemsType">
+                <End Type="sap.fpa.services.search.internal.ResourcesType" Role="ResourcesPrincipal" Multiplicity="1" />
+                <End Type="sap.fpa.services.search.internal.ModelsRemoteSystemsType" Role="ModelsRemoteSystemsDependent" Multiplicity="1" />
+            </Association>
+            <Association Name="Filter_Resource_Query_Validation_StatusType">
+                <End Type="sap.fpa.services.search.internal.ResourcesType" Role="ResourcesPrincipal" Multiplicity="1" />
+                <End Type="sap.fpa.services.search.internal.resourceQueryValidationStatusInfosType" Role="resourceQueryValidationStatusInfosDependent" Multiplicity="*" />
+            </Association>
+            <Association Name="Filter_Resource_Is_ValidType">
+                <End Type="sap.fpa.services.search.internal.ResourcesType" Role="ResourcesPrincipal" Multiplicity="1" />
+                <End Type="sap.fpa.services.search.internal.isValidType" Role="isValidDependent" Multiplicity="1" />
+            </Association>
+            <Association Name="RepositoryCreatedByType">
+                <End Type="sap.fpa.services.search.internal.FilterRepositoriesType" Role="FilterRepositoriesPrincipal" Multiplicity="*" />
+                <End Type="sap.fpa.services.search.internal.createdByType" Role="createdByDependent" Multiplicity="1" />
+            </Association>
+            <Association Name="RepositoryModifiedByType">
+                <End Type="sap.fpa.services.search.internal.FilterRepositoriesType" Role="FilterRepositoriesPrincipal" Multiplicity="*" />
+                <End Type="sap.fpa.services.search.internal.modifiedByType" Role="modifiedByDependent" Multiplicity="1" />
+            </Association>
+            <Association Name="RepositoryPermissionsType">
+                <End Type="sap.fpa.services.search.internal.FilterRepositoriesType" Role="FilterRepositoriesPrincipal" Multiplicity="1" />
+                <End Type="sap.fpa.services.search.internal.resourcePermissionsType" Role="resourcePermissionsDependent" Multiplicity="*" />
+            </Association>
+            <Association Name="FilterRepositoryCreatedByType">
+                <End Type="sap.fpa.services.search.internal.RepositoriesType" Role="RepositoriesPrincipal" Multiplicity="*" />
+                <End Type="sap.fpa.services.search.internal.createdByType" Role="createdByDependent" Multiplicity="1" />
+            </Association>
+            <Association Name="FilterRepositoryModifiedByType">
+                <End Type="sap.fpa.services.search.internal.RepositoriesType" Role="RepositoriesPrincipal" Multiplicity="*" />
+                <End Type="sap.fpa.services.search.internal.modifiedByType" Role="modifiedByDependent" Multiplicity="1" />
+            </Association>
+            <Association Name="FilterRepositoryPermissionsType">
+                <End Type="sap.fpa.services.search.internal.RepositoriesType" Role="RepositoriesPrincipal" Multiplicity="1" />
+                <End Type="sap.fpa.services.search.internal.resourcePermissionsType" Role="resourcePermissionsDependent" Multiplicity="*" />
+            </Association>
+            <EntityContainer Name="SearchMetadata" m:IsDefaultEntityContainer="true">
+                <EntitySet Name="FilterRepositories" EntityType="sap.fpa.services.search.internal.FilterRepositoriesType" />
+                <EntitySet Name="Repositories" EntityType="sap.fpa.services.search.internal.RepositoriesType" />
+                <EntitySet Name="FilterResources" EntityType="sap.fpa.services.search.internal.FilterResourcesType" />
+                <EntitySet Name="Resources" EntityType="sap.fpa.services.search.internal.ResourcesType" />
+                <EntitySet Name="Models" EntityType="sap.fpa.services.search.internal.ModelsType" />
+                <EntitySet Name="Pages" EntityType="sap.fpa.services.search.internal.PagesType" />
+                <EntitySet Name="ModelsRemoteSystems" EntityType="sap.fpa.services.search.internal.ModelsRemoteSystemsType" />
+                <EntitySet Name="isValid" EntityType="sap.fpa.services.search.internal.isValidType" />
+                <EntitySet Name="createdBy" EntityType="sap.fpa.services.search.internal.createdByType" />
+                <EntitySet Name="modifiedBy" EntityType="sap.fpa.services.search.internal.modifiedByType" />
+                <EntitySet Name="resourcePermissions" EntityType="sap.fpa.services.search.internal.resourcePermissionsType" />
+                <EntitySet Name="resourceQueryValidationStatusInfos" EntityType="sap.fpa.services.search.internal.resourceQueryValidationStatusInfosType" />
+                <AssociationSet Name="Resources_Models" Association="sap.fpa.services.search.internal.Resources_ModelsType">
+                    <End Role="FilterResourcesPrincipal" EntitySet="FilterResources" />
+                    <End Role="ModelsDependent" EntitySet="Models" />
+                </AssociationSet>
+                <AssociationSet Name="Resources_Pages" Association="sap.fpa.services.search.internal.Resources_PagesType">
+                    <End Role="FilterResourcesPrincipal" EntitySet="FilterResources" />
+                    <End Role="PagesDependent" EntitySet="Pages" />
+                </AssociationSet>
+                <AssociationSet Name="Created_By" Association="sap.fpa.services.search.internal.Created_ByType">
+                    <End Role="FilterResourcesPrincipal" EntitySet="FilterResources" />
+                    <End Role="createdByDependent" EntitySet="createdBy" />
+                </AssociationSet>
+                <AssociationSet Name="Modified_By" Association="sap.fpa.services.search.internal.Modified_ByType">
+                    <End Role="FilterResourcesPrincipal" EntitySet="FilterResources" />
+                    <End Role="modifiedByDependent" EntitySet="modifiedBy" />
+                </AssociationSet>
+                <AssociationSet Name="Resource_Permissions" Association="sap.fpa.services.search.internal.Resource_PermissionsType">
+                    <End Role="FilterResourcesPrincipal" EntitySet="FilterResources" />
+                    <End Role="resourcePermissionsDependent" EntitySet="resourcePermissions" />
+                </AssociationSet>
+                <AssociationSet Name="Resource_Remote_Systems" Association="sap.fpa.services.search.internal.Resource_Remote_SystemsType">
+                    <End Role="FilterResourcesPrincipal" EntitySet="FilterResources" />
+                    <End Role="ModelsRemoteSystemsDependent" EntitySet="ModelsRemoteSystems" />
+                </AssociationSet>
+                <AssociationSet Name="Resource_Query_Validation_Status" Association="sap.fpa.services.search.internal.Resource_Query_Validation_StatusType">
+                    <End Role="FilterResourcesPrincipal" EntitySet="FilterResources" />
+                    <End Role="resourceQueryValidationStatusInfosDependent" EntitySet="resourceQueryValidationStatusInfos" />
+                </AssociationSet>
+                <AssociationSet Name="Resource_Is_Valid" Association="sap.fpa.services.search.internal.Resource_Is_ValidType">
+                    <End Role="FilterResourcesPrincipal" EntitySet="FilterResources" />
+                    <End Role="isValidDependent" EntitySet="isValid" />
+                </AssociationSet>
+                <AssociationSet Name="Filter_Resources_Models" Association="sap.fpa.services.search.internal.Filter_Resources_ModelsType">
+                    <End Role="ResourcesPrincipal" EntitySet="Resources" />
+                    <End Role="ModelsDependent" EntitySet="Models" />
+                </AssociationSet>
+                <AssociationSet Name="Filter_Resources_Pages" Association="sap.fpa.services.search.internal.Filter_Resources_PagesType">
+                    <End Role="ResourcesPrincipal" EntitySet="Resources" />
+                    <End Role="PagesDependent" EntitySet="Pages" />
+                </AssociationSet>
+                <AssociationSet Name="Filter_Created_By" Association="sap.fpa.services.search.internal.Filter_Created_ByType">
+                    <End Role="ResourcesPrincipal" EntitySet="Resources" />
+                    <End Role="createdByDependent" EntitySet="createdBy" />
+                </AssociationSet>
+                <AssociationSet Name="Filter_Modified_By" Association="sap.fpa.services.search.internal.Filter_Modified_ByType">
+                    <End Role="ResourcesPrincipal" EntitySet="Resources" />
+                    <End Role="modifiedByDependent" EntitySet="modifiedBy" />
+                </AssociationSet>
+                <AssociationSet Name="Filter_Resource_Permissions" Association="sap.fpa.services.search.internal.Filter_Resource_PermissionsType">
+                    <End Role="ResourcesPrincipal" EntitySet="Resources" />
+                    <End Role="resourcePermissionsDependent" EntitySet="resourcePermissions" />
+                </AssociationSet>
+                <AssociationSet Name="Filter_Resource_Remote_Systems" Association="sap.fpa.services.search.internal.Filter_Resource_Remote_SystemsType">
+                    <End Role="ResourcesPrincipal" EntitySet="Resources" />
+                    <End Role="ModelsRemoteSystemsDependent" EntitySet="ModelsRemoteSystems" />
+                </AssociationSet>
+                <AssociationSet Name="Filter_Resource_Query_Validation_Status" Association="sap.fpa.services.search.internal.Filter_Resource_Query_Validation_StatusType">
+                    <End Role="ResourcesPrincipal" EntitySet="Resources" />
+                    <End Role="resourceQueryValidationStatusInfosDependent" EntitySet="resourceQueryValidationStatusInfos" />
+                </AssociationSet>
+                <AssociationSet Name="Filter_Resource_Is_Valid" Association="sap.fpa.services.search.internal.Filter_Resource_Is_ValidType">
+                    <End Role="ResourcesPrincipal" EntitySet="Resources" />
+                    <End Role="isValidDependent" EntitySet="isValid" />
+                </AssociationSet>
+                <AssociationSet Name="RepositoryCreatedBy" Association="sap.fpa.services.search.internal.RepositoryCreatedByType">
+                    <End Role="FilterRepositoriesPrincipal" EntitySet="FilterRepositories" />
+                    <End Role="createdByDependent" EntitySet="createdBy" />
+                </AssociationSet>
+                <AssociationSet Name="RepositoryModifiedBy" Association="sap.fpa.services.search.internal.RepositoryModifiedByType">
+                    <End Role="FilterRepositoriesPrincipal" EntitySet="FilterRepositories" />
+                    <End Role="modifiedByDependent" EntitySet="modifiedBy" />
+                </AssociationSet>
+                <AssociationSet Name="RepositoryPermissions" Association="sap.fpa.services.search.internal.RepositoryPermissionsType">
+                    <End Role="FilterRepositoriesPrincipal" EntitySet="FilterRepositories" />
+                    <End Role="resourcePermissionsDependent" EntitySet="resourcePermissions" />
+                </AssociationSet>
+                <AssociationSet Name="FilterRepositoryCreatedBy" Association="sap.fpa.services.search.internal.FilterRepositoryCreatedByType">
+                    <End Role="RepositoriesPrincipal" EntitySet="Repositories" />
+                    <End Role="createdByDependent" EntitySet="createdBy" />
+                </AssociationSet>
+                <AssociationSet Name="FilterRepositoryModifiedBy" Association="sap.fpa.services.search.internal.FilterRepositoryModifiedByType">
+                    <End Role="RepositoriesPrincipal" EntitySet="Repositories" />
+                    <End Role="modifiedByDependent" EntitySet="modifiedBy" />
+                </AssociationSet>
+                <AssociationSet Name="FilterRepositoryPermissions" Association="sap.fpa.services.search.internal.FilterRepositoryPermissionsType">
+                    <End Role="RepositoriesPrincipal" EntitySet="Repositories" />
+                    <End Role="resourcePermissionsDependent" EntitySet="resourcePermissions" />
+                </AssociationSet>
+            </EntityContainer>
+        </Schema>
+    </edmx:DataServices>
+</edmx:Edmx>
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/sac/sac_mces_golden.json b/metadata-ingestion/tests/integration/sac/sac_mces_golden.json
new file mode 100644
index 00000000000000..c88ded368711fb
--- /dev/null
+++ b/metadata-ingestion/tests/integration/sac/sac_mces_golden.json
@@ -0,0 +1,663 @@
+[
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(sac,LXTH4JCE36EOYLU41PIINLYPU9XRYM26)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePaths",
+    "aspect": {
+        "json": {
+            "paths": [
+                "/sac/Public/Folder 1/Folder 2"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(sac,LXTH4JCE36EOYLU41PIINLYPU9XRYM26)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Public"
+                },
+                {
+                    "id": "Folder 1"
+                },
+                {
+                    "id": "Folder 2"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.ANL8Q577BA2F73KU3VELDXGWZK:ANL8Q577BA2F73KU3VELDXGWZK,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "namespace": "t.4.ANL8Q577BA2F73KU3VELDXGWZK",
+                "modelId": "ANL8Q577BA2F73KU3VELDXGWZK",
+                "isImport": "false"
+            },
+            "externalUrl": "http://tenant/sap/fpa/ui/tenants/3c44c#view_id=model;model_id=t.4.ANL8Q577BA2F73KU3VELDXGWZK:ANL8Q577BA2F73KU3VELDXGWZK",
+            "name": "Name of the first model (BW)",
+            "description": "Description of the first model which has a connection to a BW query",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hana,HANA.SCHEMA.CE.SCHEMA::VIEW,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetKey",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:hana",
+            "name": "HANA.SCHEMA.CE.SCHEMA::VIEW",
+            "origin": "PROD"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.ANL8Q577BA2F73KU3VELDXGWZK:ANL8Q577BA2F73KU3VELDXGWZK,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bw,BW.QUERY/QUERY_TECHNICAL_NAME,PROD)",
+                    "type": "COPY"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.ANL8Q577BA2F73KU3VELDXGWZK:ANL8Q577BA2F73KU3VELDXGWZK,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.ANL8Q577BA2F73KU3VELDXGWZK:ANL8Q577BA2F73KU3VELDXGWZK,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Live Data Model"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.ANL8Q577BA2F73KU3VELDXGWZK:ANL8Q577BA2F73KU3VELDXGWZK,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:sac"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.K73U3VELDXGWZKANL8Q577BA2F:K73U3VELDXGWZKANL8Q577BA2F,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "namespace": "t.4.K73U3VELDXGWZKANL8Q577BA2F",
+                "modelId": "K73U3VELDXGWZKANL8Q577BA2F",
+                "isImport": "false"
+            },
+            "externalUrl": "http://tenant/sap/fpa/ui/tenants/3c44c#view_id=model;model_id=t.4.K73U3VELDXGWZKANL8Q577BA2F:K73U3VELDXGWZKANL8Q577BA2F",
+            "name": "Name of the second model (HANA)",
+            "description": "Description of the second model which has a connection to a HANA view",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.DXGWZKANLK73U3VEL8Q577BA2F:DXGWZKANLK73U3VEL8Q577BA2F,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "DXGWZKANLK73U3VEL8Q577BA2F",
+            "platform": "urn:li:dataPlatform:sac",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.Schemaless": {}
+            },
+            "fields": [
+                {
+                    "fieldPath": "Account",
+                    "nullable": false,
+                    "description": "Account",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string(256)",
+                    "recursive": false,
+                    "isPartOfKey": true
+                },
+                {
+                    "fieldPath": "FIELD1",
+                    "nullable": false,
+                    "description": "FIELD1",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string(256)",
+                    "recursive": false,
+                    "isPartOfKey": true
+                },
+                {
+                    "fieldPath": "FIELD2",
+                    "nullable": false,
+                    "description": "FIELD2",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string(256)",
+                    "recursive": false,
+                    "isPartOfKey": true
+                },
+                {
+                    "fieldPath": "FIELD3",
+                    "nullable": false,
+                    "description": "FIELD3",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.DateType": {}
+                        }
+                    },
+                    "nativeDataType": "string(256)",
+                    "recursive": false,
+                    "isPartOfKey": true
+                },
+                {
+                    "fieldPath": "Version",
+                    "nullable": false,
+                    "description": "Version",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string(300)",
+                    "recursive": false,
+                    "isPartOfKey": true
+                },
+                {
+                    "fieldPath": "SignedData",
+                    "nullable": false,
+                    "description": "SignedData",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "decimal(31, 7)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ],
+            "primaryKeys": [
+                "Account",
+                "FIELD1",
+                "FIELD2",
+                "FIELD3",
+                "Version"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.K73U3VELDXGWZKANL8Q577BA2F:K73U3VELDXGWZKANL8Q577BA2F,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:unknown"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:hana,HANA.SCHEMA.CE.SCHEMA::VIEW,PROD)",
+                    "type": "COPY"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.K73U3VELDXGWZKANL8Q577BA2F:K73U3VELDXGWZKANL8Q577BA2F,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.K73U3VELDXGWZKANL8Q577BA2F:K73U3VELDXGWZKANL8Q577BA2F,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Live Data Model"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.K73U3VELDXGWZKANL8Q577BA2F:K73U3VELDXGWZKANL8Q577BA2F,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:sac"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.DXGWZKANLK73U3VEL8Q577BA2F:DXGWZKANLK73U3VEL8Q577BA2F,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "namespace": "t.4.DXGWZKANLK73U3VEL8Q577BA2F",
+                "modelId": "DXGWZKANLK73U3VEL8Q577BA2F",
+                "isImport": "true"
+            },
+            "externalUrl": "http://tenant/sap/fpa/ui/tenants/3c44c#view_id=model;model_id=t.4.DXGWZKANLK73U3VEL8Q577BA2F:DXGWZKANLK73U3VEL8Q577BA2F",
+            "name": "Name of the third model (Import)",
+            "description": "Description of the third model which was imported",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.DXGWZKANLK73U3VEL8Q577BA2F:DXGWZKANLK73U3VEL8Q577BA2F,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bw,BW.QUERY/QUERY_TECHNICAL_NAME,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetKey",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bw",
+            "name": "BW.QUERY/QUERY_TECHNICAL_NAME",
+            "origin": "PROD"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.DXGWZKANLK73U3VEL8Q577BA2F:DXGWZKANLK73U3VEL8Q577BA2F,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Import Data Model"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.DXGWZKANLK73U3VEL8Q577BA2F:DXGWZKANLK73U3VEL8Q577BA2F,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:sac"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(sac,LXTH4JCE36EOYLU41PIINLYPU9XRYM26)",
+    "changeType": "UPSERT",
+    "aspectName": "dashboardInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "resourceType": "STORY",
+                "resourceSubtype": "",
+                "storyId": "STORY:t.4:LXTH4JCE36EOYLU41PIINLYPU9XRYM26",
+                "isMobile": "0"
+            },
+            "externalUrl": "http://tenant/sap/fpa/ui/tenants/3c44c/bo/story/LXTH4JCE36EOYLU41PIINLYPU9XRYM26",
+            "title": "Name of the story",
+            "description": "Description of the story",
+            "charts": [],
+            "datasets": [
+                "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.ANL8Q577BA2F73KU3VELDXGWZK:ANL8Q577BA2F73KU3VELDXGWZK,PROD)",
+                "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.K73U3VELDXGWZKANL8Q577BA2F:K73U3VELDXGWZKANL8Q577BA2F,PROD)",
+                "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.DXGWZKANLK73U3VEL8Q577BA2F:DXGWZKANLK73U3VEL8Q577BA2F,PROD)"
+            ],
+            "lastModified": {
+                "created": {
+                    "time": 1667544309783,
+                    "actor": "urn:li:corpuser:JOHN_DOE"
+                },
+                "lastModified": {
+                    "time": 1673067981272,
+                    "actor": "urn:li:corpuser:JOHN_DOE"
+                }
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(sac,LXTH4JCE36EOYLU41PIINLYPU9XRYM26)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(sac,LXTH4JCE36EOYLU41PIINLYPU9XRYM26)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Story"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(sac,EOYLU41PIILXTH4JCE36NLYPU9XRYM26)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePaths",
+    "aspect": {
+        "json": {
+            "paths": [
+                "/sac/Public/Folder 1/Folder 2"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(sac,EOYLU41PIILXTH4JCE36NLYPU9XRYM26)",
+    "changeType": "UPSERT",
+    "aspectName": "dashboardInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "resourceType": "STORY",
+                "resourceSubtype": "APPLICATION",
+                "storyId": "STORY:t.4:EOYLU41PIILXTH4JCE36NLYPU9XRYM26",
+                "isMobile": "0"
+            },
+            "externalUrl": "http://tenant/sap/fpa/ui/tenants/3c44c/bo/story/EOYLU41PIILXTH4JCE36NLYPU9XRYM26",
+            "title": "Name of the application",
+            "description": "Description of the application",
+            "charts": [],
+            "datasets": [
+                "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.ANL8Q577BA2F73KU3VELDXGWZK:ANL8Q577BA2F73KU3VELDXGWZK,PROD)",
+                "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.K73U3VELDXGWZKANL8Q577BA2F:K73U3VELDXGWZKANL8Q577BA2F,PROD)",
+                "urn:li:dataset:(urn:li:dataPlatform:sac,t.4.DXGWZKANLK73U3VEL8Q577BA2F:DXGWZKANLK73U3VEL8Q577BA2F,PROD)"
+            ],
+            "lastModified": {
+                "created": {
+                    "time": 1673279404272,
+                    "actor": "urn:li:corpuser:unknown"
+                },
+                "lastModified": {
+                    "time": 1673279414272,
+                    "actor": "urn:li:corpuser:unknown"
+                }
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(sac,EOYLU41PIILXTH4JCE36NLYPU9XRYM26)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(sac,EOYLU41PIILXTH4JCE36NLYPU9XRYM26)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Application"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(sac,EOYLU41PIILXTH4JCE36NLYPU9XRYM26)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Public"
+                },
+                {
+                    "id": "Folder 1"
+                },
+                {
+                    "id": "Folder 2"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "sac-integration-test",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/sac/test_sac.py b/metadata-ingestion/tests/integration/sac/test_sac.py
new file mode 100644
index 00000000000000..2b6ca81700712e
--- /dev/null
+++ b/metadata-ingestion/tests/integration/sac/test_sac.py
@@ -0,0 +1,316 @@
+from functools import partial
+from typing import Dict
+from urllib.parse import parse_qs
+
+import pytest
+
+from datahub.ingestion.run.pipeline import Pipeline
+from tests.test_helpers import mce_helpers
+
+MOCK_TENANT_URL = "http://tenant"
+MOCK_TOKEN_URL = "http://tenant.authentication/oauth/token"
+MOCK_CLIENT_ID = "foo"
+MOCK_CLIENT_SECRET = "bar"
+MOCK_ACCESS_TOKEN = "foobaraccesstoken"
+
+
+@pytest.mark.integration
+def test_sac(
+    pytestconfig,
+    tmp_path,
+    requests_mock,
+    mock_time,
+):
+    requests_mock.post(
+        MOCK_TOKEN_URL,
+        json=match_token_url,
+    )
+
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/sac"
+
+    with open(f"{test_resources_dir}/metadata.xml", mode="rb") as f:
+        content = f.read()
+        requests_mock.get(
+            f"{MOCK_TENANT_URL}/api/v1/$metadata",
+            content=partial(match_metadata, content=content),
+        )
+
+    requests_mock.get(
+        f"{MOCK_TENANT_URL}/api/v1/Resources?$format=json&$filter=isTemplate eq 0 and isSample eq 0 and isPublic eq 1 and ((resourceType eq 'STORY' and resourceSubtype eq '') or (resourceType eq 'STORY' and resourceSubtype eq 'APPLICATION'))&$select=resourceId,resourceType,resourceSubtype,storyId,name,description,createdTime,createdBy,modifiedBy,modifiedTime,openURL,ancestorPath,isMobile",
+        json=match_resources,
+    )
+
+    requests_mock.get(
+        f"{MOCK_TENANT_URL}/api/v1/Resources%28%27LXTH4JCE36EOYLU41PIINLYPU9XRYM26%27%29/resourceModels?$format=json&$select=modelId,name,description,externalId,connectionId,systemType",
+        json=partial(match_resource, resource_id="LXTH4JCE36EOYLU41PIINLYPU9XRYM26"),
+    )
+
+    requests_mock.get(
+        f"{MOCK_TENANT_URL}/api/v1/Resources%28%27EOYLU41PIILXTH4JCE36NLYPU9XRYM26%27%29/resourceModels?$format=json&$select=modelId,name,description,externalId,connectionId,systemType",
+        json=partial(match_resource, resource_id="EOYLU41PIILXTH4JCE36NLYPU9XRYM26"),
+    )
+
+    requests_mock.get(
+        f"{MOCK_TENANT_URL}/api/v1/dataimport/models",
+        json=match_models,
+    )
+
+    requests_mock.get(
+        f"{MOCK_TENANT_URL}/api/v1/dataimport/models/DXGWZKANLK73U3VEL8Q577BA2F/metadata",
+        json=match_model_metadata,
+    )
+
+    pipeline = Pipeline.create(
+        {
+            "run_id": "sac-integration-test",
+            "source": {
+                "type": "sac",
+                "config": {
+                    "tenant_url": MOCK_TENANT_URL,
+                    "token_url": MOCK_TOKEN_URL,
+                    "client_id": MOCK_CLIENT_ID,
+                    "client_secret": MOCK_CLIENT_SECRET,
+                },
+            },
+            "sink": {
+                "type": "file",
+                "config": {"filename": f"{tmp_path}/sac_mces.json"},
+            },
+        },
+    )
+
+    pipeline.run()
+    pipeline.raise_from_status()
+
+    mce_helpers.check_golden_file(
+        pytestconfig,
+        output_path=f"{tmp_path}/sac_mces.json",
+        golden_path=test_resources_dir / "sac_mces_golden.json",
+        ignore_paths=mce_helpers.IGNORE_PATH_TIMESTAMPS,
+    )
+
+
+def match_token_url(request, context):
+    form = parse_qs(request.text, strict_parsing=True)
+
+    assert "grant_type" in form
+    assert len(form["grant_type"]) == 1
+    assert form["grant_type"][0] == "client_credentials"
+
+    assert "client_id" in form
+    assert len(form["client_id"]) == 1
+    assert form["client_id"][0] == MOCK_CLIENT_ID
+
+    assert "client_secret" in form
+    assert len(form["client_secret"]) == 1
+    assert form["client_secret"][0] == MOCK_CLIENT_SECRET
+
+    json = {
+        "access_token": MOCK_ACCESS_TOKEN,
+        "expires_in": 3599,
+    }
+
+    return json
+
+
+def check_authorization(headers: Dict[str, str]) -> None:
+    assert "Authorization" in headers
+    assert headers["Authorization"] == f"Bearer {MOCK_ACCESS_TOKEN}"
+
+    assert "x-sap-sac-custom-auth" in headers
+    assert headers["x-sap-sac-custom-auth"] == "true"
+
+
+def match_metadata(request, context, content):
+    check_authorization(request.headers)
+
+    context.headers["content-type"] = "application/xml"
+
+    return content
+
+
+def match_resources(request, context):
+    check_authorization(request.headers)
+
+    json = {
+        "d": {
+            "results": [
+                {
+                    "__metadata": {
+                        "type": "sap.fpa.services.search.internal.ResourcesType",
+                        "uri": "/api/v1/Resources('LXTH4JCE36EOYLU41PIINLYPU9XRYM26')",
+                    },
+                    "name": "Name of the story",
+                    "description": "Description of the story",
+                    "resourceId": "LXTH4JCE36EOYLU41PIINLYPU9XRYM26",
+                    "resourceType": "STORY",
+                    "resourceSubtype": "",
+                    "storyId": "STORY:t.4:LXTH4JCE36EOYLU41PIINLYPU9XRYM26",
+                    "createdTime": "/Date(1667544309783)/",
+                    "createdBy": "JOHN_DOE",
+                    "modifiedBy": "JOHN_DOE",
+                    "modifiedTime": "/Date(1673067981272)/",
+                    "isMobile": 0,
+                    "openURL": "/sap/fpa/ui/tenants/3c44c/bo/story/LXTH4JCE36EOYLU41PIINLYPU9XRYM26",
+                    "ancestorPath": '["Public","Folder 1","Folder 2"]',
+                },
+                {
+                    "__metadata": {
+                        "type": "sap.fpa.services.search.internal.ResourcesType",
+                        "uri": "/api/v1/Resources('EOYLU41PIILXTH4JCE36NLYPU9XRYM26')",
+                    },
+                    "name": "Name of the application",
+                    "description": "Description of the application",
+                    "resourceId": "EOYLU41PIILXTH4JCE36NLYPU9XRYM26",
+                    "resourceType": "STORY",
+                    "resourceSubtype": "APPLICATION",
+                    "storyId": "STORY:t.4:EOYLU41PIILXTH4JCE36NLYPU9XRYM26",
+                    "createdTime": "/Date(1673279404272)/",
+                    "createdBy": "SYSTEM",
+                    "modifiedBy": "$DELETED_USER$",
+                    "modifiedTime": "/Date(1673279414272)/",
+                    "isMobile": 0,
+                    "openURL": "/sap/fpa/ui/tenants/3c44c/bo/story/EOYLU41PIILXTH4JCE36NLYPU9XRYM26",
+                    "ancestorPath": '["Public","Folder 1","Folder 2"]',
+                },
+            ],
+        },
+    }
+
+    return json
+
+
+def match_resource(request, context, resource_id):
+    check_authorization(request.headers)
+
+    json = {
+        "d": {
+            "results": [
+                {
+                    "__metadata": {
+                        "type": "sap.fpa.services.search.internal.ModelsType",
+                        "uri": f"/api/v1/Models(resourceId='{resource_id}',modelId='t.4.ANL8Q577BA2F73KU3VELDXGWZK%3AANL8Q577BA2F73KU3VELDXGWZK')",
+                    },
+                    "modelId": "t.4.ANL8Q577BA2F73KU3VELDXGWZK:ANL8Q577BA2F73KU3VELDXGWZK",
+                    "name": "Name of the first model (BW)",
+                    "description": "Description of the first model which has a connection to a BW query",
+                    "externalId": "query:[][][QUERY_TECHNICAL_NAME]",
+                    "connectionId": "BW",
+                    "systemType": "BW",
+                },
+                {
+                    "__metadata": {
+                        "type": "sap.fpa.services.search.internal.ModelsType",
+                        "uri": f"/api/v1/Models(resourceId='{resource_id}',modelId='t.4.K73U3VELDXGWZKANL8Q577BA2F%3AK73U3VELDXGWZKANL8Q577BA2F')",
+                    },
+                    "modelId": "t.4.K73U3VELDXGWZKANL8Q577BA2F:K73U3VELDXGWZKANL8Q577BA2F",
+                    "name": "Name of the second model (HANA)",
+                    "description": "Description of the second model which has a connection to a HANA view",
+                    "externalId": "view:[SCHEMA][NAMESPACE.SCHEMA][VIEW]",
+                    "connectionId": "HANA",
+                    "systemType": "HANA",
+                },
+                {
+                    "__metadata": {
+                        "type": "sap.fpa.services.search.internal.ModelsType",
+                        "uri": f"/api/v1/Models(resourceId='{resource_id}',modelId='t.4.DXGWZKANLK73U3VEL8Q577BA2F%3ADXGWZKANLK73U3VEL8Q577BA2F')",
+                    },
+                    "modelId": "t.4.DXGWZKANLK73U3VEL8Q577BA2F:DXGWZKANLK73U3VEL8Q577BA2F",
+                    "name": "Name of the third model (Import)",
+                    "description": "Description of the third model which was imported",
+                    "externalId": "",
+                    "connectionId": "",
+                    "systemType": None,
+                },
+            ],
+        },
+    }
+
+    return json
+
+
+def match_models(request, context):
+    check_authorization(request.headers)
+
+    json = {
+        "models": [
+            {
+                "modelID": "DXGWZKANLK73U3VEL8Q577BA2F",
+                "modelName": "Name of the third model (Import)",
+                "modelDescription": "Description of the third model which was imported",
+                "modelURL": f"{MOCK_TENANT_URL}/api/v1/dataimport/models/DXGWZKANLK73U3VEL8Q577BA2F",
+            },
+        ],
+    }
+
+    return json
+
+
+def match_model_metadata(request, context):
+    check_authorization(request.headers)
+
+    json = {
+        "factData": {
+            "keys": [
+                "Account",
+                "FIELD1",
+                "FIELD2",
+                "FIELD3",
+                "Version",
+            ],
+            "columns": [
+                {
+                    "columnName": "Account",
+                    "columnDataType": "string",
+                    "maxLength": 256,
+                    "isKey": True,
+                    "propertyType": "PROPERTY",
+                    "descriptionName": "Account",
+                },
+                {
+                    "columnName": "FIELD1",
+                    "columnDataType": "string",
+                    "maxLength": 256,
+                    "isKey": True,
+                    "propertyType": "PROPERTY",
+                    "descriptionName": "FIELD1",
+                },
+                {
+                    "columnName": "FIELD2",
+                    "columnDataType": "string",
+                    "maxLength": 256,
+                    "isKey": True,
+                    "propertyType": "PROPERTY",
+                    "descriptionName": "FIELD2",
+                },
+                {
+                    "columnName": "FIELD3",
+                    "columnDataType": "string",
+                    "maxLength": 256,
+                    "isKey": True,
+                    "propertyType": "DATE",
+                    "descriptionName": "FIELD3",
+                },
+                {
+                    "columnName": "Version",
+                    "columnDataType": "string",
+                    "maxLength": 300,
+                    "isKey": True,
+                    "propertyType": "PROPERTY",
+                    "descriptionName": "Version",
+                },
+                {
+                    "columnName": "SignedData",
+                    "columnDataType": "decimal",
+                    "maxLength": 32,
+                    "precision": 31,
+                    "scale": 7,
+                    "isKey": False,
+                    "propertyType": "PROPERTY",
+                    "descriptionName": "SignedData",
+                },
+            ],
+        },
+    }
+
+    return json
diff --git a/metadata-ingestion/tests/integration/salesforce/test_salesforce.py b/metadata-ingestion/tests/integration/salesforce/test_salesforce.py
index 8b6b883b2148d2..89a37a372df843 100644
--- a/metadata-ingestion/tests/integration/salesforce/test_salesforce.py
+++ b/metadata-ingestion/tests/integration/salesforce/test_salesforce.py
@@ -1,10 +1,12 @@
 import json
 import pathlib
 from unittest import mock
+from unittest.mock import Mock
 
 from freezegun import freeze_time
 
 from datahub.ingestion.run.pipeline import Pipeline
+from datahub.ingestion.source.salesforce import SalesforceConfig, SalesforceSource
 from tests.test_helpers import mce_helpers
 
 FROZEN_TIME = "2022-05-12 11:00:00"
@@ -19,15 +21,16 @@ def _read_response(file_name: str) -> dict:
         return data
 
 
-def side_effect_call_salesforce(type, url):
-    class MockResponse:
-        def __init__(self, json_data, status_code):
-            self.json_data = json_data
-            self.status_code = status_code
+class MockResponse:
+    def __init__(self, json_data, status_code):
+        self.json_data = json_data
+        self.status_code = status_code
+
+    def json(self):
+        return self.json_data
 
-        def json(self):
-            return self.json_data
 
+def side_effect_call_salesforce(type, url):
     if url.endswith("/services/data/"):
         return MockResponse(_read_response("versions_response.json"), 200)
     if url.endswith("FROM EntityDefinition WHERE IsCustomizable = true"):
@@ -55,9 +58,92 @@ def json(self):
     return MockResponse({}, 404)
 
 
+@mock.patch("datahub.ingestion.source.salesforce.Salesforce")
+def test_latest_version(mock_sdk):
+    mock_sf = mock.Mock()
+    mocked_call = mock.Mock()
+    mocked_call.side_effect = side_effect_call_salesforce
+    mock_sf._call_salesforce = mocked_call
+    mock_sdk.return_value = mock_sf
+
+    config = SalesforceConfig.parse_obj(
+        {
+            "auth": "DIRECT_ACCESS_TOKEN",
+            "instance_url": "https://mydomain.my.salesforce.com/",
+            "access_token": "access_token`",
+            "ingest_tags": True,
+            "object_pattern": {
+                "allow": [
+                    "^Account$",
+                    "^Property__c$",
+                ],
+            },
+            "domain": {"sales": {"allow": {"^Property__c$"}}},
+            "profiling": {"enabled": True},
+            "profile_pattern": {
+                "allow": [
+                    "^Property__c$",
+                ]
+            },
+        }
+    )
+    SalesforceSource(config=config, ctx=Mock())
+    calls = mock_sf._call_salesforce.mock_calls
+    assert (
+        len(calls) == 1
+    ), "We didn't specify version but source didn't call SF API to get the latest one"
+    assert calls[0].ends_with(
+        "/services/data"
+    ), "Source didn't call proper SF API endpoint to get all versions"
+    assert (
+        mock_sf.sf_version == "54.0"
+    ), "API version was not correctly set (see versions_responses.json)"
+
+
+@mock.patch("datahub.ingestion.source.salesforce.Salesforce")
+def test_custom_version(mock_sdk):
+    mock_sf = mock.Mock()
+    mocked_call = mock.Mock()
+    mocked_call.side_effect = side_effect_call_salesforce
+    mock_sf._call_salesforce = mocked_call
+    mock_sdk.return_value = mock_sf
+
+    config = SalesforceConfig.parse_obj(
+        {
+            "auth": "DIRECT_ACCESS_TOKEN",
+            "api_version": "46.0",
+            "instance_url": "https://mydomain.my.salesforce.com/",
+            "access_token": "access_token`",
+            "ingest_tags": True,
+            "object_pattern": {
+                "allow": [
+                    "^Account$",
+                    "^Property__c$",
+                ],
+            },
+            "domain": {"sales": {"allow": {"^Property__c$"}}},
+            "profiling": {"enabled": True},
+            "profile_pattern": {
+                "allow": [
+                    "^Property__c$",
+                ]
+            },
+        }
+    )
+    SalesforceSource(config=config, ctx=Mock())
+
+    calls = mock_sf._call_salesforce.mock_calls
+    assert (
+        len(calls) == 0
+    ), "Source called API to get all versions even though we specified proper version"
+    assert (
+        mock_sdk.call_args.kwargs["version"] == "46.0"
+    ), "API client object was not correctly initialized with the custom version"
+
+
 @freeze_time(FROZEN_TIME)
 def test_salesforce_ingest(pytestconfig, tmp_path):
-    with mock.patch("simple_salesforce.Salesforce") as mock_sdk:
+    with mock.patch("datahub.ingestion.source.salesforce.Salesforce") as mock_sdk:
         mock_sf = mock.Mock()
         mocked_call = mock.Mock()
         mocked_call.side_effect = side_effect_call_salesforce
diff --git a/metadata-ingestion/tests/integration/snowflake/common.py b/metadata-ingestion/tests/integration/snowflake/common.py
index 5ef2eb420b8ed5..8f45be96625a45 100644
--- a/metadata-ingestion/tests/integration/snowflake/common.py
+++ b/metadata-ingestion/tests/integration/snowflake/common.py
@@ -156,7 +156,7 @@
                 on basic_usage_counts.bucket_start_time = user_usage_counts.bucket_start_time
                 and basic_usage_counts.object_name = user_usage_counts.object_name
         where
-            basic_usage_counts.object_domain in ('Table','External table','View','Materialized view')
+            basic_usage_counts.object_domain in ('Table','External table','View','Materialized view','Iceberg table')
             and basic_usage_counts.object_name is not null
         group by
             basic_usage_counts.object_name,
@@ -235,7 +235,7 @@ def default_query_results(  # noqa: C901
                 "BYTES": 1024,
                 "ROW_COUNT": 10000,
                 "COMMENT": "Comment for Table",
-                "CLUSTERING_KEY": None,
+                "CLUSTERING_KEY": "LINEAR(COL_1)",
             }
             for tbl_idx in range(1, num_tables + 1)
         ]
diff --git a/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json b/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json
index 5cba4e8b338223..9247c4cb04e3ff 100644
--- a/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json
+++ b/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json
@@ -488,7 +488,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_1/",
             "name": "TABLE_1",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_1",
@@ -787,7 +787,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_2/",
             "name": "TABLE_2",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_2",
@@ -1086,7 +1086,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_3/",
             "name": "TABLE_3",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_3",
@@ -1385,7 +1385,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_4/",
             "name": "TABLE_4",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_4",
@@ -1684,7 +1684,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_5/",
             "name": "TABLE_5",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_5",
@@ -1983,7 +1983,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_6/",
             "name": "TABLE_6",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_6",
@@ -2282,7 +2282,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_7/",
             "name": "TABLE_7",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_7",
@@ -2581,7 +2581,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_8/",
             "name": "TABLE_8",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_8",
@@ -2880,7 +2880,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_9/",
             "name": "TABLE_9",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_9",
@@ -3179,7 +3179,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_10/",
             "name": "TABLE_10",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_10",
diff --git a/metadata-ingestion/tests/integration/snowflake/snowflake_privatelink_golden.json b/metadata-ingestion/tests/integration/snowflake/snowflake_privatelink_golden.json
index 71a74f883bf1bf..2697b7315acab3 100644
--- a/metadata-ingestion/tests/integration/snowflake/snowflake_privatelink_golden.json
+++ b/metadata-ingestion/tests/integration/snowflake/snowflake_privatelink_golden.json
@@ -141,7 +141,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.abc12345.ap-south-1.privatelink.snowflakecomputing.com/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_3/",
             "name": "TABLE_3",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_3",
@@ -810,7 +810,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.abc12345.ap-south-1.privatelink.snowflakecomputing.com/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_1/",
             "name": "TABLE_1",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_1",
@@ -1475,7 +1475,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.abc12345.ap-south-1.privatelink.snowflakecomputing.com/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_10/",
             "name": "TABLE_10",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_10",
@@ -1714,7 +1714,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.abc12345.ap-south-1.privatelink.snowflakecomputing.com/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_5/",
             "name": "TABLE_5",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_5",
@@ -1741,7 +1741,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.abc12345.ap-south-1.privatelink.snowflakecomputing.com/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_2/",
             "name": "TABLE_2",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_2",
@@ -2303,7 +2303,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.abc12345.ap-south-1.privatelink.snowflakecomputing.com/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_6/",
             "name": "TABLE_6",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_6",
@@ -2623,7 +2623,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.abc12345.ap-south-1.privatelink.snowflakecomputing.com/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_7/",
             "name": "TABLE_7",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_7",
@@ -2666,7 +2666,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.abc12345.ap-south-1.privatelink.snowflakecomputing.com/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_4/",
             "name": "TABLE_4",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_4",
@@ -3164,7 +3164,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.abc12345.ap-south-1.privatelink.snowflakecomputing.com/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_8/",
             "name": "TABLE_8",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_8",
@@ -3304,7 +3304,7 @@
     "aspectName": "datasetProperties",
     "aspect": {
         "json": {
-            "customProperties": {},
+            "customProperties": {"CLUSTERING_KEY": "LINEAR(COL_1)"},
             "externalUrl": "https://app.abc12345.ap-south-1.privatelink.snowflakecomputing.com/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_9/",
             "name": "TABLE_9",
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_9",
diff --git a/metadata-ingestion/tests/integration/snowflake/test_snowflake_tag.py b/metadata-ingestion/tests/integration/snowflake/test_snowflake_tag.py
new file mode 100644
index 00000000000000..d5e265e7838825
--- /dev/null
+++ b/metadata-ingestion/tests/integration/snowflake/test_snowflake_tag.py
@@ -0,0 +1,102 @@
+from unittest import mock
+
+from datahub.configuration.common import AllowDenyPattern, DynamicTypedConfig
+from datahub.ingestion.run.pipeline import Pipeline
+from datahub.ingestion.run.pipeline_config import PipelineConfig, SourceConfig
+from datahub.ingestion.source.snowflake.snowflake_config import (
+    SnowflakeV2Config,
+    TagOption,
+)
+from datahub.ingestion.source.snowflake.snowflake_report import SnowflakeV2Report
+from tests.integration.snowflake.common import default_query_results
+
+
+def test_snowflake_tag_pattern():
+    with mock.patch("snowflake.connector.connect") as mock_connect:
+        sf_connection = mock.MagicMock()
+        sf_cursor = mock.MagicMock()
+        mock_connect.return_value = sf_connection
+        sf_connection.cursor.return_value = sf_cursor
+        sf_cursor.execute.side_effect = default_query_results
+
+        tag_config = SnowflakeV2Config(
+            account_id="ABC12345.ap-south-1.aws",
+            username="TST_USR",
+            password="TST_PWD",
+            match_fully_qualified_names=True,
+            schema_pattern=AllowDenyPattern(allow=["test_db.test_schema"]),
+            tag_pattern=AllowDenyPattern(
+                allow=["TEST_DB.TEST_SCHEMA.my_tag_1:my_value_1"]
+            ),
+            include_technical_schema=True,
+            include_table_lineage=False,
+            include_view_lineage=False,
+            include_column_lineage=False,
+            include_usage_stats=False,
+            include_operational_stats=False,
+            extract_tags=TagOption.without_lineage,
+        )
+
+        pipeline = Pipeline(
+            config=PipelineConfig(
+                source=SourceConfig(type="snowflake", config=tag_config),
+                sink=DynamicTypedConfig(type="blackhole", config={}),
+            )
+        )
+        pipeline.run()
+        pipeline.pretty_print_summary()
+        pipeline.raise_from_status()
+
+        source_report = pipeline.source.get_report()
+        assert isinstance(source_report, SnowflakeV2Report)
+        assert source_report.tags_scanned == 5
+        assert source_report._processed_tags == {
+            "TEST_DB.TEST_SCHEMA.my_tag_1:my_value_1"
+        }
+
+
+def test_snowflake_tag_pattern_deny():
+    with mock.patch("snowflake.connector.connect") as mock_connect:
+        sf_connection = mock.MagicMock()
+        sf_cursor = mock.MagicMock()
+        mock_connect.return_value = sf_connection
+        sf_connection.cursor.return_value = sf_cursor
+        sf_cursor.execute.side_effect = default_query_results
+
+        tag_config = SnowflakeV2Config(
+            account_id="ABC12345.ap-south-1.aws",
+            username="TST_USR",
+            password="TST_PWD",
+            match_fully_qualified_names=True,
+            schema_pattern=AllowDenyPattern(allow=["test_db.test_schema"]),
+            tag_pattern=AllowDenyPattern(
+                deny=["TEST_DB.TEST_SCHEMA.my_tag_2:my_value_2"]
+            ),
+            include_technical_schema=True,
+            include_table_lineage=False,
+            include_view_lineage=False,
+            include_column_lineage=False,
+            include_usage_stats=False,
+            include_operational_stats=False,
+            extract_tags=TagOption.without_lineage,
+        )
+
+        pipeline = Pipeline(
+            config=PipelineConfig(
+                source=SourceConfig(type="snowflake", config=tag_config),
+                sink=DynamicTypedConfig(type="blackhole", config={}),
+            )
+        )
+        pipeline.run()
+        pipeline.pretty_print_summary()
+        pipeline.raise_from_status()
+
+        source_report = pipeline.source.get_report()
+        assert isinstance(source_report, SnowflakeV2Report)
+        assert source_report.tags_scanned == 5
+        assert source_report._processed_tags == {
+            "OTHER_DB.OTHER_SCHEMA.my_other_tag:other",
+            "TEST_DB.TEST_SCHEMA.my_tag_0:my_value_0",
+            "TEST_DB.TEST_SCHEMA.my_tag_1:my_value_1",
+            "TEST_DB.TEST_SCHEMA.security:pii",
+        }
diff --git a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json
index 4c0c1c6512ec77..1213f78e274868 100644
--- a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json
+++ b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json
@@ -1,7 +1,7 @@
 [
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -9,9 +9,9 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata"
+                "database": "DemoData"
             },
-            "name": "demodata"
+            "name": "DemoData"
         }
     },
     "systemMetadata": {
@@ -22,7 +22,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -38,7 +38,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -54,7 +54,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -72,7 +72,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
@@ -112,11 +112,11 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "job_id": "0565425f-2083-45d3-bb61-76e0ee5e1117",
+                "job_id": "a7684ed9-7d4c-46f2-b8bd-1dc5941345d0",
                 "job_name": "Weekly Demo Data Backup",
                 "description": "No description available.",
-                "date_created": "2024-01-19 11:45:06.667000",
-                "date_modified": "2024-01-19 11:45:06.840000",
+                "date_created": "2024-09-03 11:56:19.400000",
+                "date_modified": "2024-09-03 11:56:19.580000",
                 "step_id": "1",
                 "step_name": "Set database to read only",
                 "subsystem": "TSQL",
@@ -155,7 +155,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -163,7 +163,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_accessadmin"
             },
             "name": "db_accessadmin"
@@ -177,7 +177,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -193,7 +193,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -209,7 +209,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -227,12 +227,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -243,15 +243,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -264,7 +264,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -272,7 +272,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_backupoperator"
             },
             "name": "db_backupoperator"
@@ -286,7 +286,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -302,7 +302,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -318,7 +318,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -336,12 +336,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -352,15 +352,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -373,7 +373,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -381,7 +381,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_datareader"
             },
             "name": "db_datareader"
@@ -395,7 +395,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -411,7 +411,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -427,7 +427,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -445,12 +445,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -461,15 +461,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -482,7 +482,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -490,7 +490,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_datawriter"
             },
             "name": "db_datawriter"
@@ -504,7 +504,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -520,7 +520,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -536,7 +536,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -554,12 +554,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -570,15 +570,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -591,7 +591,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -599,7 +599,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_ddladmin"
             },
             "name": "db_ddladmin"
@@ -613,7 +613,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -629,7 +629,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -645,7 +645,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -663,12 +663,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -679,15 +679,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -700,7 +700,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -708,7 +708,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_denydatareader"
             },
             "name": "db_denydatareader"
@@ -722,7 +722,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -738,7 +738,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -754,7 +754,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -772,12 +772,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -788,15 +788,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -809,7 +809,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -817,7 +817,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_denydatawriter"
             },
             "name": "db_denydatawriter"
@@ -831,7 +831,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -847,7 +847,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -863,7 +863,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -881,12 +881,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -897,15 +897,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -918,7 +918,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -926,7 +926,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_owner"
             },
             "name": "db_owner"
@@ -940,7 +940,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -956,7 +956,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -972,7 +972,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -990,12 +990,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1006,15 +1006,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1027,7 +1027,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -1035,7 +1035,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_securityadmin"
             },
             "name": "db_securityadmin"
@@ -1049,7 +1049,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -1065,7 +1065,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -1081,7 +1081,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -1099,12 +1099,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1115,15 +1115,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1136,7 +1136,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -1144,7 +1144,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "dbo"
             },
             "name": "dbo"
@@ -1158,7 +1158,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -1174,7 +1174,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -1190,7 +1190,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -1208,12 +1208,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1224,15 +1224,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1250,7 +1250,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec"
+            "container": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1"
         }
     },
     "systemMetadata": {
@@ -1304,7 +1304,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1316,7 +1316,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "NVARCHAR()",
+                                "nativeDataType": "NVARCHAR(max) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1359,12 +1359,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
-                    "urn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec"
+                    "id": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
+                    "urn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1"
                 }
             ]
         }
@@ -1377,7 +1377,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -1385,7 +1385,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "Foo"
             },
             "name": "Foo"
@@ -1399,7 +1399,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -1415,7 +1415,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -1431,7 +1431,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -1449,12 +1449,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1465,15 +1465,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1491,7 +1491,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+            "container": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
         }
     },
     "systemMetadata": {
@@ -1546,7 +1546,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1558,7 +1558,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "NVARCHAR()",
+                                "nativeDataType": "NVARCHAR(max) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1601,12 +1601,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+                    "id": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
+                    "urn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
                 }
             ]
         }
@@ -1624,7 +1624,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+            "container": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
         }
     },
     "systemMetadata": {
@@ -1678,7 +1678,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -1691,7 +1691,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255, collation='SQL_Latin1_General_CP1_CI_AS')",
+                                "nativeDataType": "VARCHAR(255) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1703,7 +1703,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255, collation='SQL_Latin1_General_CP1_CI_AS')",
+                                "nativeDataType": "VARCHAR(255) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1715,7 +1715,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1758,12 +1758,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+                    "id": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
+                    "urn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
                 }
             ]
         }
@@ -1781,7 +1781,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+            "container": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
         }
     },
     "systemMetadata": {
@@ -1835,7 +1835,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -1847,7 +1847,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "UNIQUEIDENTIFIER()",
+                                "nativeDataType": "UNIQUEIDENTIFIER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1859,7 +1859,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "NVARCHAR(length=50)",
+                                "nativeDataType": "NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1914,12 +1914,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+                    "id": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
+                    "urn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
                 }
             ]
         }
@@ -1932,14 +1932,14 @@
 },
 {
     "entityType": "dataFlow",
-    "entityUrn": "urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD)",
+    "entityUrn": "urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD)",
     "changeType": "UPSERT",
     "aspectName": "dataFlowInfo",
     "aspect": {
         "json": {
             "customProperties": {},
             "externalUrl": "",
-            "name": "demodata.Foo.stored_procedures"
+            "name": "DemoData.Foo.stored_procedures"
         }
     },
     "systemMetadata": {
@@ -1950,7 +1950,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
     "changeType": "UPSERT",
     "aspectName": "dataJobInfo",
     "aspect": {
@@ -1961,11 +1961,11 @@
                 "code": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
                 "input parameters": "['@ID']",
                 "parameter @ID": "{'type': 'int'}",
-                "date_created": "2024-01-19 11:45:06.590000",
-                "date_modified": "2024-01-19 11:45:06.590000"
+                "date_created": "2024-09-03 11:56:19.310000",
+                "date_modified": "2024-09-03 11:56:19.310000"
             },
             "externalUrl": "",
-            "name": "demodata.Foo.Proc.With.SpecialChar",
+            "name": "DemoData.Foo.Proc.With.SpecialChar",
             "type": {
                 "string": "MSSQL_STORED_PROCEDURE"
             }
@@ -1979,7 +1979,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
     "changeType": "UPSERT",
     "aspectName": "dataJobInputOutput",
     "aspect": {
@@ -1997,7 +1997,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2005,7 +2005,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "guest"
             },
             "name": "guest"
@@ -2019,7 +2019,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2035,7 +2035,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2051,7 +2051,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2069,12 +2069,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -2085,15 +2085,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -2106,7 +2106,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2114,7 +2114,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "INFORMATION_SCHEMA"
             },
             "name": "INFORMATION_SCHEMA"
@@ -2128,7 +2128,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2144,7 +2144,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2160,7 +2160,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2178,12 +2178,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -2194,15 +2194,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -2215,7 +2215,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2223,7 +2223,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "sys"
             },
             "name": "sys"
@@ -2237,7 +2237,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2253,7 +2253,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2269,7 +2269,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2287,12 +2287,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -2303,15 +2303,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -2324,7 +2324,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
+    "entityUrn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2332,9 +2332,9 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "newdata"
+                "database": "NewData"
             },
-            "name": "newdata"
+            "name": "NewData"
         }
     },
     "systemMetadata": {
@@ -2345,7 +2345,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
+    "entityUrn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2361,7 +2361,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
+    "entityUrn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2377,7 +2377,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
+    "entityUrn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2395,7 +2395,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
+    "entityUrn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
@@ -2411,7 +2411,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:47217386c89d8b94153f6ee31e7e77ec",
+    "entityUrn": "urn:li:container:8b7691fec458d7383d5bc4e213831375",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2419,7 +2419,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "newdata",
+                "database": "NewData",
                 "schema": "db_accessadmin"
             },
             "name": "db_accessadmin"
@@ -2433,7 +2433,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:47217386c89d8b94153f6ee31e7e77ec",
+    "entityUrn": "urn:li:container:8b7691fec458d7383d5bc4e213831375",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2449,7 +2449,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:47217386c89d8b94153f6ee31e7e77ec",
+    "entityUrn": "urn:li:container:8b7691fec458d7383d5bc4e213831375",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2465,7 +2465,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:47217386c89d8b94153f6ee31e7e77ec",
+    "entityUrn": "urn:li:container:8b7691fec458d7383d5bc4e213831375",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2483,12 +2483,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:47217386c89d8b94153f6ee31e7e77ec",
+    "entityUrn": "urn:li:container:8b7691fec458d7383d5bc4e213831375",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+            "container": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
         }
     },
     "systemMetadata": {
@@ -2499,15 +2499,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:47217386c89d8b94153f6ee31e7e77ec",
+    "entityUrn": "urn:li:container:8b7691fec458d7383d5bc4e213831375",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 }
             ]
         }
@@ -2520,7 +2520,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:5eb0d61efa998d1ccd5cbdc6ce4bb4af",
+    "entityUrn": "urn:li:container:523d13eddd725607ec835a2459b05c9c",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2528,7 +2528,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "newdata",
+                "database": "NewData",
                 "schema": "db_backupoperator"
             },
             "name": "db_backupoperator"
@@ -2542,7 +2542,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:5eb0d61efa998d1ccd5cbdc6ce4bb4af",
+    "entityUrn": "urn:li:container:523d13eddd725607ec835a2459b05c9c",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2558,7 +2558,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:5eb0d61efa998d1ccd5cbdc6ce4bb4af",
+    "entityUrn": "urn:li:container:523d13eddd725607ec835a2459b05c9c",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2574,7 +2574,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:5eb0d61efa998d1ccd5cbdc6ce4bb4af",
+    "entityUrn": "urn:li:container:523d13eddd725607ec835a2459b05c9c",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2592,12 +2592,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:5eb0d61efa998d1ccd5cbdc6ce4bb4af",
+    "entityUrn": "urn:li:container:523d13eddd725607ec835a2459b05c9c",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+            "container": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
         }
     },
     "systemMetadata": {
@@ -2608,15 +2608,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:5eb0d61efa998d1ccd5cbdc6ce4bb4af",
+    "entityUrn": "urn:li:container:523d13eddd725607ec835a2459b05c9c",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 }
             ]
         }
@@ -2629,7 +2629,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2816b2cb7f90d3dce64125ba89fb1fa8",
+    "entityUrn": "urn:li:container:29bd421b2225a415df9c750e77404c66",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2637,7 +2637,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "newdata",
+                "database": "NewData",
                 "schema": "db_datareader"
             },
             "name": "db_datareader"
@@ -2651,7 +2651,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2816b2cb7f90d3dce64125ba89fb1fa8",
+    "entityUrn": "urn:li:container:29bd421b2225a415df9c750e77404c66",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2667,7 +2667,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2816b2cb7f90d3dce64125ba89fb1fa8",
+    "entityUrn": "urn:li:container:29bd421b2225a415df9c750e77404c66",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2683,7 +2683,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2816b2cb7f90d3dce64125ba89fb1fa8",
+    "entityUrn": "urn:li:container:29bd421b2225a415df9c750e77404c66",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2701,12 +2701,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2816b2cb7f90d3dce64125ba89fb1fa8",
+    "entityUrn": "urn:li:container:29bd421b2225a415df9c750e77404c66",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+            "container": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
         }
     },
     "systemMetadata": {
@@ -2717,15 +2717,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2816b2cb7f90d3dce64125ba89fb1fa8",
+    "entityUrn": "urn:li:container:29bd421b2225a415df9c750e77404c66",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 }
             ]
         }
@@ -2738,7 +2738,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:20d0f0c94e9796ff44ff32d4d0e19084",
+    "entityUrn": "urn:li:container:a3c02df4bcc7280a89f539b793b04197",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2746,7 +2746,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "newdata",
+                "database": "NewData",
                 "schema": "db_datawriter"
             },
             "name": "db_datawriter"
@@ -2760,7 +2760,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:20d0f0c94e9796ff44ff32d4d0e19084",
+    "entityUrn": "urn:li:container:a3c02df4bcc7280a89f539b793b04197",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2776,7 +2776,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:20d0f0c94e9796ff44ff32d4d0e19084",
+    "entityUrn": "urn:li:container:a3c02df4bcc7280a89f539b793b04197",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2792,7 +2792,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:20d0f0c94e9796ff44ff32d4d0e19084",
+    "entityUrn": "urn:li:container:a3c02df4bcc7280a89f539b793b04197",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2810,12 +2810,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:20d0f0c94e9796ff44ff32d4d0e19084",
+    "entityUrn": "urn:li:container:a3c02df4bcc7280a89f539b793b04197",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+            "container": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
         }
     },
     "systemMetadata": {
@@ -2826,15 +2826,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:20d0f0c94e9796ff44ff32d4d0e19084",
+    "entityUrn": "urn:li:container:a3c02df4bcc7280a89f539b793b04197",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 }
             ]
         }
@@ -2847,7 +2847,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3600d2ebb33b25dac607624d7eae7575",
+    "entityUrn": "urn:li:container:c3b5d1cdc69a7d8faf0e1981e89b89d1",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2855,7 +2855,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "newdata",
+                "database": "NewData",
                 "schema": "db_ddladmin"
             },
             "name": "db_ddladmin"
@@ -2869,7 +2869,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3600d2ebb33b25dac607624d7eae7575",
+    "entityUrn": "urn:li:container:c3b5d1cdc69a7d8faf0e1981e89b89d1",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2885,7 +2885,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3600d2ebb33b25dac607624d7eae7575",
+    "entityUrn": "urn:li:container:c3b5d1cdc69a7d8faf0e1981e89b89d1",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2901,7 +2901,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3600d2ebb33b25dac607624d7eae7575",
+    "entityUrn": "urn:li:container:c3b5d1cdc69a7d8faf0e1981e89b89d1",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2919,12 +2919,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3600d2ebb33b25dac607624d7eae7575",
+    "entityUrn": "urn:li:container:c3b5d1cdc69a7d8faf0e1981e89b89d1",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+            "container": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
         }
     },
     "systemMetadata": {
@@ -2935,15 +2935,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3600d2ebb33b25dac607624d7eae7575",
+    "entityUrn": "urn:li:container:c3b5d1cdc69a7d8faf0e1981e89b89d1",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 }
             ]
         }
@@ -2956,7 +2956,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:280f2e3aefacc346d0ce1590ec337c7d",
+    "entityUrn": "urn:li:container:2b937d85ae7545dc769766008a332f42",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2964,7 +2964,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "newdata",
+                "database": "NewData",
                 "schema": "db_denydatareader"
             },
             "name": "db_denydatareader"
@@ -2978,7 +2978,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:280f2e3aefacc346d0ce1590ec337c7d",
+    "entityUrn": "urn:li:container:2b937d85ae7545dc769766008a332f42",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2994,7 +2994,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:280f2e3aefacc346d0ce1590ec337c7d",
+    "entityUrn": "urn:li:container:2b937d85ae7545dc769766008a332f42",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -3010,7 +3010,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:280f2e3aefacc346d0ce1590ec337c7d",
+    "entityUrn": "urn:li:container:2b937d85ae7545dc769766008a332f42",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -3028,12 +3028,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:280f2e3aefacc346d0ce1590ec337c7d",
+    "entityUrn": "urn:li:container:2b937d85ae7545dc769766008a332f42",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+            "container": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
         }
     },
     "systemMetadata": {
@@ -3044,15 +3044,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:280f2e3aefacc346d0ce1590ec337c7d",
+    "entityUrn": "urn:li:container:2b937d85ae7545dc769766008a332f42",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 }
             ]
         }
@@ -3065,7 +3065,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:cba5c3ca7f028fcf749593be369d3c24",
+    "entityUrn": "urn:li:container:a399d8bb765028abb9e55ae39846ca5e",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -3073,7 +3073,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "newdata",
+                "database": "NewData",
                 "schema": "db_denydatawriter"
             },
             "name": "db_denydatawriter"
@@ -3087,7 +3087,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:cba5c3ca7f028fcf749593be369d3c24",
+    "entityUrn": "urn:li:container:a399d8bb765028abb9e55ae39846ca5e",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -3103,7 +3103,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:cba5c3ca7f028fcf749593be369d3c24",
+    "entityUrn": "urn:li:container:a399d8bb765028abb9e55ae39846ca5e",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -3119,7 +3119,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:cba5c3ca7f028fcf749593be369d3c24",
+    "entityUrn": "urn:li:container:a399d8bb765028abb9e55ae39846ca5e",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -3137,12 +3137,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:cba5c3ca7f028fcf749593be369d3c24",
+    "entityUrn": "urn:li:container:a399d8bb765028abb9e55ae39846ca5e",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+            "container": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
         }
     },
     "systemMetadata": {
@@ -3153,15 +3153,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:cba5c3ca7f028fcf749593be369d3c24",
+    "entityUrn": "urn:li:container:a399d8bb765028abb9e55ae39846ca5e",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 }
             ]
         }
@@ -3174,7 +3174,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:58c30fa72f213ca7e12fb04f5a7d150f",
+    "entityUrn": "urn:li:container:457efe38f0aec2af9ad681cf1b43b1cb",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -3182,7 +3182,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "newdata",
+                "database": "NewData",
                 "schema": "db_owner"
             },
             "name": "db_owner"
@@ -3196,7 +3196,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:58c30fa72f213ca7e12fb04f5a7d150f",
+    "entityUrn": "urn:li:container:457efe38f0aec2af9ad681cf1b43b1cb",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -3212,7 +3212,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:58c30fa72f213ca7e12fb04f5a7d150f",
+    "entityUrn": "urn:li:container:457efe38f0aec2af9ad681cf1b43b1cb",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -3228,7 +3228,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:58c30fa72f213ca7e12fb04f5a7d150f",
+    "entityUrn": "urn:li:container:457efe38f0aec2af9ad681cf1b43b1cb",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -3246,12 +3246,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:58c30fa72f213ca7e12fb04f5a7d150f",
+    "entityUrn": "urn:li:container:457efe38f0aec2af9ad681cf1b43b1cb",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+            "container": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
         }
     },
     "systemMetadata": {
@@ -3262,15 +3262,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:58c30fa72f213ca7e12fb04f5a7d150f",
+    "entityUrn": "urn:li:container:457efe38f0aec2af9ad681cf1b43b1cb",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 }
             ]
         }
@@ -3283,7 +3283,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9387ddfeb7b57672cabd761ade89c49c",
+    "entityUrn": "urn:li:container:1d87783ffe7e82210365dff4ca8ee7d1",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -3291,7 +3291,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "newdata",
+                "database": "NewData",
                 "schema": "db_securityadmin"
             },
             "name": "db_securityadmin"
@@ -3305,7 +3305,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9387ddfeb7b57672cabd761ade89c49c",
+    "entityUrn": "urn:li:container:1d87783ffe7e82210365dff4ca8ee7d1",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -3321,7 +3321,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9387ddfeb7b57672cabd761ade89c49c",
+    "entityUrn": "urn:li:container:1d87783ffe7e82210365dff4ca8ee7d1",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -3337,7 +3337,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9387ddfeb7b57672cabd761ade89c49c",
+    "entityUrn": "urn:li:container:1d87783ffe7e82210365dff4ca8ee7d1",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -3355,12 +3355,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9387ddfeb7b57672cabd761ade89c49c",
+    "entityUrn": "urn:li:container:1d87783ffe7e82210365dff4ca8ee7d1",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+            "container": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
         }
     },
     "systemMetadata": {
@@ -3371,15 +3371,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9387ddfeb7b57672cabd761ade89c49c",
+    "entityUrn": "urn:li:container:1d87783ffe7e82210365dff4ca8ee7d1",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 }
             ]
         }
@@ -3392,7 +3392,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3a5f70e0e34834d4eeeb4d5a5caf03d0",
+    "entityUrn": "urn:li:container:269d0067d130eda0399a534fc787054c",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -3400,7 +3400,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "newdata",
+                "database": "NewData",
                 "schema": "dbo"
             },
             "name": "dbo"
@@ -3414,7 +3414,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3a5f70e0e34834d4eeeb4d5a5caf03d0",
+    "entityUrn": "urn:li:container:269d0067d130eda0399a534fc787054c",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -3430,7 +3430,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3a5f70e0e34834d4eeeb4d5a5caf03d0",
+    "entityUrn": "urn:li:container:269d0067d130eda0399a534fc787054c",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -3446,7 +3446,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3a5f70e0e34834d4eeeb4d5a5caf03d0",
+    "entityUrn": "urn:li:container:269d0067d130eda0399a534fc787054c",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -3464,12 +3464,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3a5f70e0e34834d4eeeb4d5a5caf03d0",
+    "entityUrn": "urn:li:container:269d0067d130eda0399a534fc787054c",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+            "container": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
         }
     },
     "systemMetadata": {
@@ -3480,15 +3480,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3a5f70e0e34834d4eeeb4d5a5caf03d0",
+    "entityUrn": "urn:li:container:269d0067d130eda0399a534fc787054c",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 }
             ]
         }
@@ -3506,7 +3506,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:3a5f70e0e34834d4eeeb4d5a5caf03d0"
+            "container": "urn:li:container:269d0067d130eda0399a534fc787054c"
         }
     },
     "systemMetadata": {
@@ -3560,7 +3560,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3572,7 +3572,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "NVARCHAR()",
+                                "nativeDataType": "NVARCHAR(max) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3584,7 +3584,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "MONEY()",
+                                "nativeDataType": "MONEY",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -3627,12 +3627,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 },
                 {
-                    "id": "urn:li:container:3a5f70e0e34834d4eeeb4d5a5caf03d0",
-                    "urn": "urn:li:container:3a5f70e0e34834d4eeeb4d5a5caf03d0"
+                    "id": "urn:li:container:269d0067d130eda0399a534fc787054c",
+                    "urn": "urn:li:container:269d0067d130eda0399a534fc787054c"
                 }
             ]
         }
@@ -3645,7 +3645,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63",
+    "entityUrn": "urn:li:container:f721da08adde46586c0f113287cb60d1",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -3653,7 +3653,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "newdata",
+                "database": "NewData",
                 "schema": "FooNew"
             },
             "name": "FooNew"
@@ -3667,7 +3667,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63",
+    "entityUrn": "urn:li:container:f721da08adde46586c0f113287cb60d1",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -3683,7 +3683,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63",
+    "entityUrn": "urn:li:container:f721da08adde46586c0f113287cb60d1",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -3699,7 +3699,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63",
+    "entityUrn": "urn:li:container:f721da08adde46586c0f113287cb60d1",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -3717,12 +3717,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63",
+    "entityUrn": "urn:li:container:f721da08adde46586c0f113287cb60d1",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+            "container": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
         }
     },
     "systemMetadata": {
@@ -3733,15 +3733,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63",
+    "entityUrn": "urn:li:container:f721da08adde46586c0f113287cb60d1",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 }
             ]
         }
@@ -3759,7 +3759,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63"
+            "container": "urn:li:container:f721da08adde46586c0f113287cb60d1"
         }
     },
     "systemMetadata": {
@@ -3813,7 +3813,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3825,7 +3825,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "NVARCHAR()",
+                                "nativeDataType": "NVARCHAR(max) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3837,7 +3837,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "SMALLMONEY()",
+                                "nativeDataType": "SMALLMONEY",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -3880,12 +3880,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 },
                 {
-                    "id": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63",
-                    "urn": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63"
+                    "id": "urn:li:container:f721da08adde46586c0f113287cb60d1",
+                    "urn": "urn:li:container:f721da08adde46586c0f113287cb60d1"
                 }
             ]
         }
@@ -3903,7 +3903,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63"
+            "container": "urn:li:container:f721da08adde46586c0f113287cb60d1"
         }
     },
     "systemMetadata": {
@@ -3957,7 +3957,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -3969,7 +3969,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255, collation='SQL_Latin1_General_CP1_CI_AS')",
+                                "nativeDataType": "VARCHAR(255) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3981,7 +3981,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255, collation='SQL_Latin1_General_CP1_CI_AS')",
+                                "nativeDataType": "VARCHAR(255) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3993,7 +3993,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -4036,12 +4036,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 },
                 {
-                    "id": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63",
-                    "urn": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63"
+                    "id": "urn:li:container:f721da08adde46586c0f113287cb60d1",
+                    "urn": "urn:li:container:f721da08adde46586c0f113287cb60d1"
                 }
             ]
         }
@@ -4054,7 +4054,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:54727d9fd7deacef27641559125bbc56",
+    "entityUrn": "urn:li:container:f3cb304e29e178d0615ed5ee6aa4ad58",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -4062,7 +4062,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "newdata",
+                "database": "NewData",
                 "schema": "guest"
             },
             "name": "guest"
@@ -4076,7 +4076,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:54727d9fd7deacef27641559125bbc56",
+    "entityUrn": "urn:li:container:f3cb304e29e178d0615ed5ee6aa4ad58",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -4092,7 +4092,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:54727d9fd7deacef27641559125bbc56",
+    "entityUrn": "urn:li:container:f3cb304e29e178d0615ed5ee6aa4ad58",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -4108,7 +4108,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:54727d9fd7deacef27641559125bbc56",
+    "entityUrn": "urn:li:container:f3cb304e29e178d0615ed5ee6aa4ad58",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -4126,12 +4126,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:54727d9fd7deacef27641559125bbc56",
+    "entityUrn": "urn:li:container:f3cb304e29e178d0615ed5ee6aa4ad58",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+            "container": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
         }
     },
     "systemMetadata": {
@@ -4142,15 +4142,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:54727d9fd7deacef27641559125bbc56",
+    "entityUrn": "urn:li:container:f3cb304e29e178d0615ed5ee6aa4ad58",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 }
             ]
         }
@@ -4163,7 +4163,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:141b0980dcb08f48544583e47cf48807",
+    "entityUrn": "urn:li:container:752bb2abafeb2dae8f4adc7ffd547780",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -4171,7 +4171,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "newdata",
+                "database": "NewData",
                 "schema": "INFORMATION_SCHEMA"
             },
             "name": "INFORMATION_SCHEMA"
@@ -4185,7 +4185,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:141b0980dcb08f48544583e47cf48807",
+    "entityUrn": "urn:li:container:752bb2abafeb2dae8f4adc7ffd547780",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -4201,7 +4201,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:141b0980dcb08f48544583e47cf48807",
+    "entityUrn": "urn:li:container:752bb2abafeb2dae8f4adc7ffd547780",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -4217,7 +4217,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:141b0980dcb08f48544583e47cf48807",
+    "entityUrn": "urn:li:container:752bb2abafeb2dae8f4adc7ffd547780",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -4235,12 +4235,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:141b0980dcb08f48544583e47cf48807",
+    "entityUrn": "urn:li:container:752bb2abafeb2dae8f4adc7ffd547780",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+            "container": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
         }
     },
     "systemMetadata": {
@@ -4251,15 +4251,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:141b0980dcb08f48544583e47cf48807",
+    "entityUrn": "urn:li:container:752bb2abafeb2dae8f4adc7ffd547780",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 }
             ]
         }
@@ -4272,7 +4272,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c6627af82d44de89492e1a9315ae9f4b",
+    "entityUrn": "urn:li:container:46b713e3c7754c51649899f0f284ce34",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -4280,7 +4280,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "newdata",
+                "database": "NewData",
                 "schema": "sys"
             },
             "name": "sys"
@@ -4294,7 +4294,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c6627af82d44de89492e1a9315ae9f4b",
+    "entityUrn": "urn:li:container:46b713e3c7754c51649899f0f284ce34",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -4310,7 +4310,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c6627af82d44de89492e1a9315ae9f4b",
+    "entityUrn": "urn:li:container:46b713e3c7754c51649899f0f284ce34",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -4326,7 +4326,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c6627af82d44de89492e1a9315ae9f4b",
+    "entityUrn": "urn:li:container:46b713e3c7754c51649899f0f284ce34",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -4344,12 +4344,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c6627af82d44de89492e1a9315ae9f4b",
+    "entityUrn": "urn:li:container:46b713e3c7754c51649899f0f284ce34",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+            "container": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
         }
     },
     "systemMetadata": {
@@ -4360,15 +4360,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:c6627af82d44de89492e1a9315ae9f4b",
+    "entityUrn": "urn:li:container:46b713e3c7754c51649899f0f284ce34",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
+                    "id": "urn:li:container:0a12bec9e9271b0db039923a770d75e5",
+                    "urn": "urn:li:container:0a12bec9e9271b0db039923a770d75e5"
                 }
             ]
         }
@@ -4381,7 +4381,7 @@
 },
 {
     "entityType": "dataFlow",
-    "entityUrn": "urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD)",
+    "entityUrn": "urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -4397,7 +4397,7 @@
 },
 {
     "entityType": "dataFlow",
-    "entityUrn": "urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD)",
+    "entityUrn": "urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -4413,7 +4413,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD),Weekly Demo Data Backup)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -4429,7 +4429,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD),Weekly Demo Data Backup)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -4442,800 +4442,5 @@
         "runId": "mssql-test",
         "lastRunId": "no-run-id-provided"
     }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,DemoData.dbo.Products,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
-                    "urn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,DemoData.Foo.Items,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,DemoData.Foo.Persons,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,DemoData.Foo.SalesReason,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:47217386c89d8b94153f6ee31e7e77ec",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:5eb0d61efa998d1ccd5cbdc6ce4bb4af",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:2816b2cb7f90d3dce64125ba89fb1fa8",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:20d0f0c94e9796ff44ff32d4d0e19084",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:3600d2ebb33b25dac607624d7eae7575",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:280f2e3aefacc346d0ce1590ec337c7d",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:cba5c3ca7f028fcf749593be369d3c24",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:58c30fa72f213ca7e12fb04f5a7d150f",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:9387ddfeb7b57672cabd761ade89c49c",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:3a5f70e0e34834d4eeeb4d5a5caf03d0",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,NewData.dbo.ProductsNew,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                },
-                {
-                    "id": "urn:li:container:3a5f70e0e34834d4eeeb4d5a5caf03d0",
-                    "urn": "urn:li:container:3a5f70e0e34834d4eeeb4d5a5caf03d0"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,NewData.FooNew.ItemsNew,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                },
-                {
-                    "id": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63",
-                    "urn": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,NewData.FooNew.PersonsNew,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                },
-                {
-                    "id": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63",
-                    "urn": "urn:li:container:7cc43e5b4e2a7f2f66f1df774d1a0c63"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:54727d9fd7deacef27641559125bbc56",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:141b0980dcb08f48544583e47cf48807",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:c6627af82d44de89492e1a9315ae9f4b",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59",
-                    "urn": "urn:li:container:9447d283fb4f95ce7474f1db0179bb59"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json
index 02c357259c3f53..7c854fb1bdde81 100644
--- a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json
+++ b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json
@@ -1,7 +1,7 @@
 [
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -9,9 +9,9 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata"
+                "database": "DemoData"
             },
-            "name": "demodata"
+            "name": "DemoData"
         }
     },
     "systemMetadata": {
@@ -22,7 +22,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -38,7 +38,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -54,7 +54,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -72,7 +72,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
@@ -112,11 +112,11 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "job_id": "0565425f-2083-45d3-bb61-76e0ee5e1117",
+                "job_id": "a7684ed9-7d4c-46f2-b8bd-1dc5941345d0",
                 "job_name": "Weekly Demo Data Backup",
                 "description": "No description available.",
-                "date_created": "2024-01-19 11:45:06.667000",
-                "date_modified": "2024-01-19 11:45:06.840000",
+                "date_created": "2024-09-03 11:56:19.400000",
+                "date_modified": "2024-09-03 11:56:19.580000",
                 "step_id": "1",
                 "step_name": "Set database to read only",
                 "subsystem": "TSQL",
@@ -155,7 +155,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -163,7 +163,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_accessadmin"
             },
             "name": "db_accessadmin"
@@ -177,7 +177,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -193,7 +193,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -209,7 +209,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -227,12 +227,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -243,15 +243,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -264,7 +264,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -272,7 +272,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_backupoperator"
             },
             "name": "db_backupoperator"
@@ -286,7 +286,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -302,7 +302,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -318,7 +318,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -336,12 +336,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -352,15 +352,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -373,7 +373,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -381,7 +381,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_datareader"
             },
             "name": "db_datareader"
@@ -395,7 +395,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -411,7 +411,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -427,7 +427,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -445,12 +445,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -461,15 +461,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -482,7 +482,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -490,7 +490,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_datawriter"
             },
             "name": "db_datawriter"
@@ -504,7 +504,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -520,7 +520,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -536,7 +536,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -554,12 +554,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -570,15 +570,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -591,7 +591,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -599,7 +599,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_ddladmin"
             },
             "name": "db_ddladmin"
@@ -613,7 +613,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -629,7 +629,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -645,7 +645,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -663,12 +663,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -679,15 +679,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -700,7 +700,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -708,7 +708,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_denydatareader"
             },
             "name": "db_denydatareader"
@@ -722,7 +722,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -738,7 +738,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -754,7 +754,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -772,12 +772,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -788,15 +788,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -809,7 +809,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -817,7 +817,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_denydatawriter"
             },
             "name": "db_denydatawriter"
@@ -831,7 +831,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -847,7 +847,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -863,7 +863,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -881,12 +881,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -897,15 +897,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -918,7 +918,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -926,7 +926,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_owner"
             },
             "name": "db_owner"
@@ -940,7 +940,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -956,7 +956,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -972,7 +972,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -990,12 +990,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1006,15 +1006,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1027,7 +1027,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -1035,7 +1035,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_securityadmin"
             },
             "name": "db_securityadmin"
@@ -1049,7 +1049,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -1065,7 +1065,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -1081,7 +1081,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -1099,12 +1099,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1115,15 +1115,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1136,7 +1136,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -1144,7 +1144,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "dbo"
             },
             "name": "dbo"
@@ -1158,7 +1158,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -1174,7 +1174,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -1190,7 +1190,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -1208,12 +1208,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1224,15 +1224,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1250,7 +1250,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec"
+            "container": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1"
         }
     },
     "systemMetadata": {
@@ -1304,7 +1304,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1316,7 +1316,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "NVARCHAR()",
+                                "nativeDataType": "NVARCHAR(max) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1359,12 +1359,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
-                    "urn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec"
+                    "id": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
+                    "urn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1"
                 }
             ]
         }
@@ -1377,7 +1377,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -1385,7 +1385,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "Foo"
             },
             "name": "Foo"
@@ -1399,7 +1399,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -1415,7 +1415,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -1431,7 +1431,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -1449,12 +1449,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1465,15 +1465,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1491,7 +1491,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+            "container": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
         }
     },
     "systemMetadata": {
@@ -1546,7 +1546,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1558,7 +1558,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "NVARCHAR()",
+                                "nativeDataType": "NVARCHAR(max) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1601,12 +1601,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+                    "id": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
+                    "urn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
                 }
             ]
         }
@@ -1624,7 +1624,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+            "container": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
         }
     },
     "systemMetadata": {
@@ -1678,7 +1678,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -1691,7 +1691,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255, collation='SQL_Latin1_General_CP1_CI_AS')",
+                                "nativeDataType": "VARCHAR(255) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1703,7 +1703,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255, collation='SQL_Latin1_General_CP1_CI_AS')",
+                                "nativeDataType": "VARCHAR(255) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1715,7 +1715,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1758,12 +1758,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+                    "id": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
+                    "urn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
                 }
             ]
         }
@@ -1781,7 +1781,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+            "container": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
         }
     },
     "systemMetadata": {
@@ -1835,7 +1835,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -1847,7 +1847,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "UNIQUEIDENTIFIER()",
+                                "nativeDataType": "UNIQUEIDENTIFIER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1859,7 +1859,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "NVARCHAR(length=50)",
+                                "nativeDataType": "NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1914,12 +1914,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+                    "id": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
+                    "urn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
                 }
             ]
         }
@@ -1932,14 +1932,14 @@
 },
 {
     "entityType": "dataFlow",
-    "entityUrn": "urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD)",
+    "entityUrn": "urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD)",
     "changeType": "UPSERT",
     "aspectName": "dataFlowInfo",
     "aspect": {
         "json": {
             "customProperties": {},
             "externalUrl": "",
-            "name": "demodata.Foo.stored_procedures"
+            "name": "DemoData.Foo.stored_procedures"
         }
     },
     "systemMetadata": {
@@ -1950,7 +1950,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
     "changeType": "UPSERT",
     "aspectName": "dataJobInfo",
     "aspect": {
@@ -1961,11 +1961,11 @@
                 "code": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
                 "input parameters": "['@ID']",
                 "parameter @ID": "{'type': 'int'}",
-                "date_created": "2024-01-19 11:45:06.590000",
-                "date_modified": "2024-01-19 11:45:06.590000"
+                "date_created": "2024-09-03 11:56:19.310000",
+                "date_modified": "2024-09-03 11:56:19.310000"
             },
             "externalUrl": "",
-            "name": "demodata.Foo.Proc.With.SpecialChar",
+            "name": "DemoData.Foo.Proc.With.SpecialChar",
             "type": {
                 "string": "MSSQL_STORED_PROCEDURE"
             }
@@ -1979,7 +1979,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
     "changeType": "UPSERT",
     "aspectName": "dataJobInputOutput",
     "aspect": {
@@ -1997,7 +1997,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2005,7 +2005,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "guest"
             },
             "name": "guest"
@@ -2019,7 +2019,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2035,7 +2035,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2051,7 +2051,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2069,12 +2069,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -2085,15 +2085,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -2106,7 +2106,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2114,7 +2114,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "INFORMATION_SCHEMA"
             },
             "name": "INFORMATION_SCHEMA"
@@ -2128,7 +2128,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2144,7 +2144,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2160,7 +2160,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2178,12 +2178,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -2194,15 +2194,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -2215,7 +2215,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2223,7 +2223,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "sys"
             },
             "name": "sys"
@@ -2237,7 +2237,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2253,7 +2253,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2269,7 +2269,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2287,12 +2287,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -2303,15 +2303,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -2324,7 +2324,7 @@
 },
 {
     "entityType": "dataFlow",
-    "entityUrn": "urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD)",
+    "entityUrn": "urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2340,7 +2340,7 @@
 },
 {
     "entityType": "dataFlow",
-    "entityUrn": "urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD)",
+    "entityUrn": "urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2356,7 +2356,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD),Weekly Demo Data Backup)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2372,7 +2372,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD),Weekly Demo Data Backup)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2385,415 +2385,5 @@
         "runId": "mssql-test",
         "lastRunId": "no-run-id-provided"
     }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,DemoData.dbo.Products,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
-                    "urn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,DemoData.Foo.Items,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,DemoData.Foo.Persons,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,DemoData.Foo.SalesReason,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json
index 02c357259c3f53..7c854fb1bdde81 100644
--- a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json
+++ b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json
@@ -1,7 +1,7 @@
 [
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -9,9 +9,9 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata"
+                "database": "DemoData"
             },
-            "name": "demodata"
+            "name": "DemoData"
         }
     },
     "systemMetadata": {
@@ -22,7 +22,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -38,7 +38,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -54,7 +54,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -72,7 +72,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
@@ -112,11 +112,11 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "job_id": "0565425f-2083-45d3-bb61-76e0ee5e1117",
+                "job_id": "a7684ed9-7d4c-46f2-b8bd-1dc5941345d0",
                 "job_name": "Weekly Demo Data Backup",
                 "description": "No description available.",
-                "date_created": "2024-01-19 11:45:06.667000",
-                "date_modified": "2024-01-19 11:45:06.840000",
+                "date_created": "2024-09-03 11:56:19.400000",
+                "date_modified": "2024-09-03 11:56:19.580000",
                 "step_id": "1",
                 "step_name": "Set database to read only",
                 "subsystem": "TSQL",
@@ -155,7 +155,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -163,7 +163,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_accessadmin"
             },
             "name": "db_accessadmin"
@@ -177,7 +177,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -193,7 +193,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -209,7 +209,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -227,12 +227,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -243,15 +243,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -264,7 +264,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -272,7 +272,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_backupoperator"
             },
             "name": "db_backupoperator"
@@ -286,7 +286,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -302,7 +302,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -318,7 +318,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -336,12 +336,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -352,15 +352,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -373,7 +373,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -381,7 +381,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_datareader"
             },
             "name": "db_datareader"
@@ -395,7 +395,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -411,7 +411,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -427,7 +427,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -445,12 +445,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -461,15 +461,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -482,7 +482,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -490,7 +490,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_datawriter"
             },
             "name": "db_datawriter"
@@ -504,7 +504,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -520,7 +520,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -536,7 +536,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -554,12 +554,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -570,15 +570,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -591,7 +591,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -599,7 +599,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_ddladmin"
             },
             "name": "db_ddladmin"
@@ -613,7 +613,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -629,7 +629,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -645,7 +645,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -663,12 +663,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -679,15 +679,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -700,7 +700,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -708,7 +708,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_denydatareader"
             },
             "name": "db_denydatareader"
@@ -722,7 +722,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -738,7 +738,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -754,7 +754,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -772,12 +772,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -788,15 +788,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -809,7 +809,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -817,7 +817,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_denydatawriter"
             },
             "name": "db_denydatawriter"
@@ -831,7 +831,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -847,7 +847,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -863,7 +863,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -881,12 +881,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -897,15 +897,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -918,7 +918,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -926,7 +926,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_owner"
             },
             "name": "db_owner"
@@ -940,7 +940,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -956,7 +956,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -972,7 +972,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -990,12 +990,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1006,15 +1006,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1027,7 +1027,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -1035,7 +1035,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_securityadmin"
             },
             "name": "db_securityadmin"
@@ -1049,7 +1049,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -1065,7 +1065,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -1081,7 +1081,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -1099,12 +1099,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1115,15 +1115,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1136,7 +1136,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -1144,7 +1144,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "dbo"
             },
             "name": "dbo"
@@ -1158,7 +1158,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -1174,7 +1174,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -1190,7 +1190,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -1208,12 +1208,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1224,15 +1224,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1250,7 +1250,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec"
+            "container": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1"
         }
     },
     "systemMetadata": {
@@ -1304,7 +1304,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1316,7 +1316,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "NVARCHAR()",
+                                "nativeDataType": "NVARCHAR(max) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1359,12 +1359,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
-                    "urn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec"
+                    "id": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
+                    "urn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1"
                 }
             ]
         }
@@ -1377,7 +1377,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -1385,7 +1385,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "Foo"
             },
             "name": "Foo"
@@ -1399,7 +1399,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -1415,7 +1415,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -1431,7 +1431,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -1449,12 +1449,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1465,15 +1465,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1491,7 +1491,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+            "container": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
         }
     },
     "systemMetadata": {
@@ -1546,7 +1546,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1558,7 +1558,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "NVARCHAR()",
+                                "nativeDataType": "NVARCHAR(max) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1601,12 +1601,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+                    "id": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
+                    "urn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
                 }
             ]
         }
@@ -1624,7 +1624,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+            "container": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
         }
     },
     "systemMetadata": {
@@ -1678,7 +1678,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -1691,7 +1691,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255, collation='SQL_Latin1_General_CP1_CI_AS')",
+                                "nativeDataType": "VARCHAR(255) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1703,7 +1703,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255, collation='SQL_Latin1_General_CP1_CI_AS')",
+                                "nativeDataType": "VARCHAR(255) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1715,7 +1715,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1758,12 +1758,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+                    "id": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
+                    "urn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
                 }
             ]
         }
@@ -1781,7 +1781,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+            "container": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
         }
     },
     "systemMetadata": {
@@ -1835,7 +1835,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -1847,7 +1847,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "UNIQUEIDENTIFIER()",
+                                "nativeDataType": "UNIQUEIDENTIFIER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1859,7 +1859,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "NVARCHAR(length=50)",
+                                "nativeDataType": "NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1914,12 +1914,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+                    "id": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
+                    "urn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
                 }
             ]
         }
@@ -1932,14 +1932,14 @@
 },
 {
     "entityType": "dataFlow",
-    "entityUrn": "urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD)",
+    "entityUrn": "urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD)",
     "changeType": "UPSERT",
     "aspectName": "dataFlowInfo",
     "aspect": {
         "json": {
             "customProperties": {},
             "externalUrl": "",
-            "name": "demodata.Foo.stored_procedures"
+            "name": "DemoData.Foo.stored_procedures"
         }
     },
     "systemMetadata": {
@@ -1950,7 +1950,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
     "changeType": "UPSERT",
     "aspectName": "dataJobInfo",
     "aspect": {
@@ -1961,11 +1961,11 @@
                 "code": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
                 "input parameters": "['@ID']",
                 "parameter @ID": "{'type': 'int'}",
-                "date_created": "2024-01-19 11:45:06.590000",
-                "date_modified": "2024-01-19 11:45:06.590000"
+                "date_created": "2024-09-03 11:56:19.310000",
+                "date_modified": "2024-09-03 11:56:19.310000"
             },
             "externalUrl": "",
-            "name": "demodata.Foo.Proc.With.SpecialChar",
+            "name": "DemoData.Foo.Proc.With.SpecialChar",
             "type": {
                 "string": "MSSQL_STORED_PROCEDURE"
             }
@@ -1979,7 +1979,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
     "changeType": "UPSERT",
     "aspectName": "dataJobInputOutput",
     "aspect": {
@@ -1997,7 +1997,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2005,7 +2005,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "guest"
             },
             "name": "guest"
@@ -2019,7 +2019,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2035,7 +2035,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2051,7 +2051,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2069,12 +2069,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -2085,15 +2085,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -2106,7 +2106,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2114,7 +2114,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "INFORMATION_SCHEMA"
             },
             "name": "INFORMATION_SCHEMA"
@@ -2128,7 +2128,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2144,7 +2144,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2160,7 +2160,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2178,12 +2178,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -2194,15 +2194,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -2215,7 +2215,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2223,7 +2223,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "sys"
             },
             "name": "sys"
@@ -2237,7 +2237,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2253,7 +2253,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2269,7 +2269,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2287,12 +2287,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -2303,15 +2303,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -2324,7 +2324,7 @@
 },
 {
     "entityType": "dataFlow",
-    "entityUrn": "urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD)",
+    "entityUrn": "urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2340,7 +2340,7 @@
 },
 {
     "entityType": "dataFlow",
-    "entityUrn": "urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD)",
+    "entityUrn": "urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2356,7 +2356,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD),Weekly Demo Data Backup)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2372,7 +2372,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD),Weekly Demo Data Backup)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2385,415 +2385,5 @@
         "runId": "mssql-test",
         "lastRunId": "no-run-id-provided"
     }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,DemoData.dbo.Products,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
-                    "urn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,DemoData.Foo.Items,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,DemoData.Foo.Persons,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,DemoData.Foo.SalesReason,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_with_lower_case_urn.json b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_with_lower_case_urn.json
index ad15c654e44c96..1d971624939f8b 100644
--- a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_with_lower_case_urn.json
+++ b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_with_lower_case_urn.json
@@ -1,7 +1,7 @@
 [
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -9,9 +9,9 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata"
+                "database": "DemoData"
             },
-            "name": "demodata"
+            "name": "DemoData"
         }
     },
     "systemMetadata": {
@@ -22,7 +22,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -38,7 +38,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -54,7 +54,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -72,7 +72,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
+    "entityUrn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
@@ -112,11 +112,11 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "job_id": "0565425f-2083-45d3-bb61-76e0ee5e1117",
+                "job_id": "a7684ed9-7d4c-46f2-b8bd-1dc5941345d0",
                 "job_name": "Weekly Demo Data Backup",
                 "description": "No description available.",
-                "date_created": "2024-01-19 11:45:06.667000",
-                "date_modified": "2024-01-19 11:45:06.840000",
+                "date_created": "2024-09-03 11:56:19.400000",
+                "date_modified": "2024-09-03 11:56:19.580000",
                 "step_id": "1",
                 "step_name": "Set database to read only",
                 "subsystem": "TSQL",
@@ -155,7 +155,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -163,7 +163,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_accessadmin"
             },
             "name": "db_accessadmin"
@@ -177,7 +177,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -193,7 +193,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -209,7 +209,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -227,12 +227,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -243,15 +243,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
+    "entityUrn": "urn:li:container:7da983a1581c33cce8a106587b150f02",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -264,7 +264,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -272,7 +272,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_backupoperator"
             },
             "name": "db_backupoperator"
@@ -286,7 +286,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -302,7 +302,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -318,7 +318,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -336,12 +336,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -352,15 +352,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
+    "entityUrn": "urn:li:container:671f67227a05c22c9fa97c27abc56820",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -373,7 +373,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -381,7 +381,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_datareader"
             },
             "name": "db_datareader"
@@ -395,7 +395,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -411,7 +411,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -427,7 +427,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -445,12 +445,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -461,15 +461,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
+    "entityUrn": "urn:li:container:830660638ee785d5352ca300835af7ec",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -482,7 +482,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -490,7 +490,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_datawriter"
             },
             "name": "db_datawriter"
@@ -504,7 +504,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -520,7 +520,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -536,7 +536,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -554,12 +554,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -570,15 +570,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
+    "entityUrn": "urn:li:container:e6b69ac2a511e798a89a4186881f70b8",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -591,7 +591,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -599,7 +599,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_ddladmin"
             },
             "name": "db_ddladmin"
@@ -613,7 +613,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -629,7 +629,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -645,7 +645,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -663,12 +663,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -679,15 +679,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
+    "entityUrn": "urn:li:container:a5b29b900882d27c0d5fb0d5ccac92a5",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -700,7 +700,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -708,7 +708,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_denydatareader"
             },
             "name": "db_denydatareader"
@@ -722,7 +722,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -738,7 +738,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -754,7 +754,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -772,12 +772,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -788,15 +788,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
+    "entityUrn": "urn:li:container:b6baf19c5f148fba3d3385151a8c672f",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -809,7 +809,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -817,7 +817,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_denydatawriter"
             },
             "name": "db_denydatawriter"
@@ -831,7 +831,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -847,7 +847,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -863,7 +863,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -881,12 +881,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -897,15 +897,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
+    "entityUrn": "urn:li:container:ee19bd6cf8db0a0d086fbe78f7539bf7",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -918,7 +918,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -926,7 +926,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_owner"
             },
             "name": "db_owner"
@@ -940,7 +940,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -956,7 +956,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -972,7 +972,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -990,12 +990,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1006,15 +1006,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
+    "entityUrn": "urn:li:container:6514a64e5b04f103c9c1dd0ebe3d8b47",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1027,7 +1027,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -1035,7 +1035,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "db_securityadmin"
             },
             "name": "db_securityadmin"
@@ -1049,7 +1049,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -1065,7 +1065,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -1081,7 +1081,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -1099,12 +1099,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1115,15 +1115,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
+    "entityUrn": "urn:li:container:fd80008628a03642d6e747c460a90619",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1136,7 +1136,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -1144,7 +1144,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "dbo"
             },
             "name": "dbo"
@@ -1158,7 +1158,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -1174,7 +1174,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -1190,7 +1190,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -1208,12 +1208,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1224,15 +1224,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
+    "entityUrn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1250,7 +1250,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec"
+            "container": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1"
         }
     },
     "systemMetadata": {
@@ -1304,7 +1304,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1316,7 +1316,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "NVARCHAR()",
+                                "nativeDataType": "NVARCHAR(max) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1359,12 +1359,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
-                    "urn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec"
+                    "id": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1",
+                    "urn": "urn:li:container:61332a50b978d8ca7245ddb34565d7b1"
                 }
             ]
         }
@@ -1377,7 +1377,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -1385,7 +1385,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "Foo"
             },
             "name": "Foo"
@@ -1399,7 +1399,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -1415,7 +1415,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -1431,7 +1431,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -1449,12 +1449,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -1465,15 +1465,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
+    "entityUrn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -1491,7 +1491,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+            "container": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
         }
     },
     "systemMetadata": {
@@ -1546,7 +1546,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1558,7 +1558,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "NVARCHAR()",
+                                "nativeDataType": "NVARCHAR(max) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1601,12 +1601,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+                    "id": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
+                    "urn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
                 }
             ]
         }
@@ -1624,7 +1624,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+            "container": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
         }
     },
     "systemMetadata": {
@@ -1678,7 +1678,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -1691,7 +1691,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255, collation='SQL_Latin1_General_CP1_CI_AS')",
+                                "nativeDataType": "VARCHAR(255) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1703,7 +1703,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=255, collation='SQL_Latin1_General_CP1_CI_AS')",
+                                "nativeDataType": "VARCHAR(255) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1715,7 +1715,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1758,12 +1758,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+                    "id": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
+                    "urn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
                 }
             ]
         }
@@ -1781,7 +1781,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+            "container": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
         }
     },
     "systemMetadata": {
@@ -1835,7 +1835,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -1847,7 +1847,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "UNIQUEIDENTIFIER()",
+                                "nativeDataType": "UNIQUEIDENTIFIER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1859,7 +1859,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "NVARCHAR(length=50)",
+                                "nativeDataType": "NVARCHAR(50) COLLATE SQL_Latin1_General_CP1_CI_AS",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1914,12 +1914,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 },
                 {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
+                    "id": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9",
+                    "urn": "urn:li:container:046d11ae7c0bc9bde45993041ac011c9"
                 }
             ]
         }
@@ -1932,14 +1932,14 @@
 },
 {
     "entityType": "dataFlow",
-    "entityUrn": "urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD)",
+    "entityUrn": "urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD)",
     "changeType": "UPSERT",
     "aspectName": "dataFlowInfo",
     "aspect": {
         "json": {
             "customProperties": {},
             "externalUrl": "",
-            "name": "demodata.Foo.stored_procedures"
+            "name": "DemoData.Foo.stored_procedures"
         }
     },
     "systemMetadata": {
@@ -1950,7 +1950,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
     "changeType": "UPSERT",
     "aspectName": "dataJobInfo",
     "aspect": {
@@ -1961,11 +1961,11 @@
                 "code": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
                 "input parameters": "['@ID']",
                 "parameter @ID": "{'type': 'int'}",
-                "date_created": "2024-01-19 11:45:06.590000",
-                "date_modified": "2024-01-19 11:45:06.590000"
+                "date_created": "2024-09-03 11:56:19.310000",
+                "date_modified": "2024-09-03 11:56:19.310000"
             },
             "externalUrl": "",
-            "name": "demodata.Foo.Proc.With.SpecialChar",
+            "name": "DemoData.Foo.Proc.With.SpecialChar",
             "type": {
                 "string": "MSSQL_STORED_PROCEDURE"
             }
@@ -1979,7 +1979,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
     "changeType": "UPSERT",
     "aspectName": "dataJobInputOutput",
     "aspect": {
@@ -1997,7 +1997,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2005,7 +2005,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "guest"
             },
             "name": "guest"
@@ -2019,7 +2019,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2035,7 +2035,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2051,7 +2051,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2069,12 +2069,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -2085,15 +2085,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
+    "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -2106,7 +2106,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2114,7 +2114,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "INFORMATION_SCHEMA"
             },
             "name": "INFORMATION_SCHEMA"
@@ -2128,7 +2128,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2144,7 +2144,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2160,7 +2160,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2178,12 +2178,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -2194,15 +2194,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
+    "entityUrn": "urn:li:container:f84e3b6c61876e1625f9112cbc0e988f",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -2215,7 +2215,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -2223,7 +2223,7 @@
             "customProperties": {
                 "platform": "mssql",
                 "env": "PROD",
-                "database": "demodata",
+                "database": "DemoData",
                 "schema": "sys"
             },
             "name": "sys"
@@ -2237,7 +2237,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2253,7 +2253,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -2269,7 +2269,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -2287,12 +2287,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+            "container": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
         }
     },
     "systemMetadata": {
@@ -2303,15 +2303,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
+    "entityUrn": "urn:li:container:d730a6ecf30bbb41cac5df5c0014168d",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
+                    "id": "urn:li:container:b275b7c099ce32f3faf1817cb054b100",
+                    "urn": "urn:li:container:b275b7c099ce32f3faf1817cb054b100"
                 }
             ]
         }
@@ -2324,7 +2324,7 @@
 },
 {
     "entityType": "dataFlow",
-    "entityUrn": "urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD)",
+    "entityUrn": "urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2340,7 +2340,7 @@
 },
 {
     "entityType": "dataFlow",
-    "entityUrn": "urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD)",
+    "entityUrn": "urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2356,7 +2356,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD),Weekly Demo Data Backup)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2372,7 +2372,7 @@
 },
 {
     "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,demodata.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,Weekly Demo Data Backup,PROD),Weekly Demo Data Backup)",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -2385,415 +2385,5 @@
         "runId": "mssql-test",
         "lastRunId": "no-run-id-provided"
     }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:f1b4c0e379c4b2e2e09a8ecd6c1b6dec",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:bad84e08ecf49aee863df68243d8b9d0",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:e48d82445eeacfbe13b431f0bb1826ee",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:884bfecd9e414990a494681293413e8e",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:142ca5fc51b7f44e5e6a424bf1043590",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:1b9d125d390447de36719bfb8dd1f782",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:fcd4c8da3739150766f91e7f6c2a3a30",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:2029cab615b3cd82cb87b153957d2e92",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:556e25ccec98892284f017f870ef7809",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,demodata.dbo.products,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec",
-                    "urn": "urn:li:container:d41a036a2e6cfa44b834edf7683199ec"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,demodata.foo.items,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,demodata.foo.persons,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mssql,demodata.foo.salesreason,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                },
-                {
-                    "id": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671",
-                    "urn": "urn:li:container:6e5c6d608d0a2dcc4eb03591382e5671"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:a6bea84fba7b05fb5d12630c8e6306ac",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:9f37bb7baa7ded19cc023e9f644a8cf8",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:3f157d8292fb473142f19e2250af537f",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5",
-                    "urn": "urn:li:container:b7062d1c0c650d9de0f7a9a5de00b1b5"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "mssql-test",
-        "lastRunId": "no-run-id-provided"
-    }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesConnection_all.json b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesConnection_all.json
index a558eea2e8dd86..9991a3f93a295c 100644
--- a/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesConnection_all.json
+++ b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesConnection_all.json
@@ -120,21 +120,7 @@
                             "dataType": "REAL",
                             "defaultFormat": "p0.0%",
                             "aggregation": null,
-                            "formula": "ZN([Delivered Email]/[Sent Email])",
-                            "upstreamFields": [
-                                {
-                                    "name": "Delivered Email",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                },
-                                {
-                                    "name": "Sent Email",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                }
-                            ]
+                            "formula": "ZN([Delivered Email]/[Sent Email])"
                         },
                         {
                             "__typename": "ColumnField",
@@ -147,17 +133,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "id",
-                                    "table": {
-                                        "__typename": "DatabaseTable",
-                                        "id": "82c42950-210b-ba3f-b2e9-53240474a8fd"
-                                    }
-                                }
-                            ]
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -170,17 +146,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": "Count",
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "Platform",
-                                    "table": {
-                                        "__typename": "DatabaseTable",
-                                        "id": "38f106d0-5219-2663-2647-bbbf5fca3866"
-                                    }
-                                }
-                            ]
+                            "aggregation": "Count"
                         },
                         {
                             "__typename": "ColumnField",
@@ -193,17 +159,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "updatedAt",
-                                    "table": {
-                                        "__typename": "DatabaseTable",
-                                        "id": "82c42950-210b-ba3f-b2e9-53240474a8fd"
-                                    }
-                                }
-                            ]
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -216,17 +172,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "programName",
-                                    "table": {
-                                        "__typename": "DatabaseTable",
-                                        "id": "82c42950-210b-ba3f-b2e9-53240474a8fd"
-                                    }
-                                }
-                            ]
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -239,17 +185,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "Mailing_ID",
-                                    "table": {
-                                        "__typename": "DatabaseTable",
-                                        "id": "1704c7c3-4bb9-e6c6-6ea0-23f76e7560db"
-                                    }
-                                }
-                            ]
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -262,17 +198,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "Campaign_ID",
-                                    "table": {
-                                        "__typename": "DatabaseTable",
-                                        "id": "1704c7c3-4bb9-e6c6-6ea0-23f76e7560db"
-                                    }
-                                }
-                            ]
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -285,8 +211,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "1",
-                            "upstreamFields": []
+                            "formula": "1"
                         },
                         {
                             "__typename": "ColumnField",
@@ -299,17 +224,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "Campaign_Run_ID",
-                                    "table": {
-                                        "__typename": "DatabaseTable",
-                                        "id": "1704c7c3-4bb9-e6c6-6ea0-23f76e7560db"
-                                    }
-                                }
-                            ]
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -322,17 +237,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "User_Agent",
-                                    "table": {
-                                        "__typename": "DatabaseTable",
-                                        "id": "38f106d0-5219-2663-2647-bbbf5fca3866"
-                                    }
-                                }
-                            ]
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -345,17 +250,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "Choice_Number",
-                                    "table": {
-                                        "__typename": "DatabaseTable",
-                                        "id": "1704c7c3-4bb9-e6c6-6ea0-23f76e7560db"
-                                    }
-                                }
-                            ]
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -368,17 +263,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "Campaign_ID",
-                                    "table": {
-                                        "__typename": "DatabaseTable",
-                                        "id": "1704c7c3-4bb9-e6c6-6ea0-23f76e7560db"
-                                    }
-                                }
-                            ]
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -391,8 +276,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -404,9 +288,7 @@
                             "dataCategory": "NOMINAL",
                             "role": "DIMENSION",
                             "dataType": "STRING",
-                            "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "defaultFormat": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -419,17 +301,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "Has_Predictive",
-                                    "table": {
-                                        "__typename": "DatabaseTable",
-                                        "id": "1704c7c3-4bb9-e6c6-6ea0-23f76e7560db"
-                                    }
-                                }
-                            ]
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -442,17 +314,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "Campaign_ID",
-                                    "table": {
-                                        "__typename": "DatabaseTable",
-                                        "id": "38f106d0-5219-2663-2647-bbbf5fca3866"
-                                    }
-                                }
-                            ]
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -465,17 +327,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "Activity_Date",
-                                    "table": {
-                                        "__typename": "DatabaseTable",
-                                        "id": "38f106d0-5219-2663-2647-bbbf5fca3866"
-                                    }
-                                }
-                            ]
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -488,8 +340,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -502,8 +353,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -516,8 +366,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -530,8 +379,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -544,8 +392,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -558,21 +405,7 @@
                             "dataType": "REAL",
                             "defaultFormat": "p0.0%",
                             "aggregation": null,
-                            "formula": "[Clickthrough Emails]/[Delivered Email]",
-                            "upstreamFields": [
-                                {
-                                    "name": "Delivered Email",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                },
-                                {
-                                    "name": "Clickthrough Emails",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                }
-                            ]
+                            "formula": "[Clickthrough Emails]/[Delivered Email]"
                         },
                         {
                             "__typename": "CalculatedField",
@@ -585,21 +418,7 @@
                             "dataType": "REAL",
                             "defaultFormat": "p0.0%",
                             "aggregation": null,
-                            "formula": "ZN([Opened Email]/[Delivered Email])",
-                            "upstreamFields": [
-                                {
-                                    "name": "Delivered Email",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                },
-                                {
-                                    "name": "Opened Email",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                }
-                            ]
+                            "formula": "ZN([Opened Email]/[Delivered Email])"
                         },
                         {
                             "__typename": "ColumnField",
@@ -612,8 +431,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -626,15 +444,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "COUNTD([Id])",
-                            "upstreamFields": [
-                                {
-                                    "name": "Id",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                }
-                            ]
+                            "formula": "COUNTD([Id])"
                         },
                         {
                             "__typename": "CalculatedField",
@@ -647,21 +457,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "COUNTD([Id (Activity - Email Delivered)])",
-                            "upstreamFields": [
-                                {
-                                    "name": "Activity",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                },
-                                {
-                                    "name": "Email Delivered",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                }
-                            ]
+                            "formula": "COUNTD([Id (Activity - Email Delivered)])"
                         },
                         {
                             "__typename": "ColumnField",
@@ -674,8 +470,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -688,8 +483,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -702,8 +496,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -716,8 +509,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": "Count",
-                            "upstreamFields": []
+                            "aggregation": "Count"
                         },
                         {
                             "__typename": "ColumnField",
@@ -730,8 +522,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -744,8 +535,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -758,8 +548,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -772,8 +561,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -786,8 +574,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -800,8 +587,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -814,8 +600,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -828,8 +613,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -842,8 +626,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -856,8 +639,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -870,21 +652,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "COUNTD([Id (Activity - Click Email)])",
-                            "upstreamFields": [
-                                {
-                                    "name": "Activity",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                },
-                                {
-                                    "name": "Click Email",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                }
-                            ]
+                            "formula": "COUNTD([Id (Activity - Click Email)])"
                         },
                         {
                             "__typename": "ColumnField",
@@ -897,8 +665,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -911,8 +678,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -925,8 +691,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": "Count",
-                            "upstreamFields": []
+                            "aggregation": "Count"
                         },
                         {
                             "__typename": "ColumnField",
@@ -939,8 +704,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -953,8 +717,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -967,8 +730,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -981,8 +743,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -995,21 +756,7 @@
                             "dataType": "REAL",
                             "defaultFormat": "p0.0%",
                             "aggregation": null,
-                            "formula": "ZN([Clickthrough Emails]\r\n/ \r\n[Opened Email])",
-                            "upstreamFields": [
-                                {
-                                    "name": "Clickthrough Emails",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                },
-                                {
-                                    "name": "Opened Email",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                }
-                            ]
+                            "formula": "ZN([Clickthrough Emails]\r\n/ \r\n[Opened Email])"
                         },
                         {
                             "__typename": "CalculatedField",
@@ -1022,21 +769,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "COUNTD([Id (Activity - Open Email)])",
-                            "upstreamFields": [
-                                {
-                                    "name": "Activity",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                },
-                                {
-                                    "name": "Open Email",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                }
-                            ]
+                            "formula": "COUNTD([Id (Activity - Open Email)])"
                         },
                         {
                             "__typename": "ColumnField",
@@ -1049,8 +782,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": "Count",
-                            "upstreamFields": []
+                            "aggregation": "Count"
                         },
                         {
                             "__typename": "ColumnField",
@@ -1063,8 +795,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1077,8 +808,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -1091,21 +821,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "[Opened Email]-[Clickthrough Emails]",
-                            "upstreamFields": [
-                                {
-                                    "name": "Opened Email",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                },
-                                {
-                                    "name": "Clickthrough Emails",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                }
-                            ]
+                            "formula": "[Opened Email]-[Clickthrough Emails]"
                         },
                         {
                             "__typename": "ColumnField",
@@ -1118,8 +834,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1132,8 +847,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -1146,21 +860,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "[Delivered Email]-[Clickthrough Emails]",
-                            "upstreamFields": [
-                                {
-                                    "name": "Delivered Email",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                },
-                                {
-                                    "name": "Clickthrough Emails",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                }
-                            ]
+                            "formula": "[Delivered Email]-[Clickthrough Emails]"
                         },
                         {
                             "__typename": "ColumnField",
@@ -1173,8 +873,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": "Count",
-                            "upstreamFields": []
+                            "aggregation": "Count"
                         },
                         {
                             "__typename": "ColumnField",
@@ -1187,8 +886,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1201,8 +899,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1215,8 +912,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1229,8 +925,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1243,8 +938,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1257,8 +951,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1271,8 +964,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -1312,8 +1004,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1326,8 +1017,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1340,8 +1030,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1354,8 +1043,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -1368,21 +1056,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "[Sent Email] - [Delivered Email]",
-                            "upstreamFields": [
-                                {
-                                    "name": "Sent Email",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                },
-                                {
-                                    "name": "Delivered Email",
-                                    "datasource": {
-                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
-                                    }
-                                }
-                            ]
+                            "formula": "[Sent Email] - [Delivered Email]"
                         },
                         {
                             "__typename": "ColumnField",
@@ -1395,8 +1069,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1409,8 +1082,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         }
                     ],
                     "upstreamDatasources": [],
@@ -1488,17 +1160,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": "Year",
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "payment_date",
-                                    "table": {
-                                        "__typename": "CustomSQLTable",
-                                        "id": "22b0b4c3-6b85-713d-a161-5a87fdd78f40"
-                                    }
-                                }
-                            ]
+                            "aggregation": "Year"
                         },
                         {
                             "__typename": "ColumnField",
@@ -1511,17 +1173,7 @@
                             "role": "MEASURE",
                             "dataType": "REAL",
                             "defaultFormat": null,
-                            "aggregation": "Sum",
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "amount",
-                                    "table": {
-                                        "__typename": "CustomSQLTable",
-                                        "id": "22b0b4c3-6b85-713d-a161-5a87fdd78f40"
-                                    }
-                                }
-                            ]
+                            "aggregation": "Sum"
                         },
                         {
                             "__typename": "ColumnField",
@@ -1534,9 +1186,7 @@
                             "role": "MEASURE",
                             "dataType": "TABLE",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1549,17 +1199,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "first_name",
-                                    "table": {
-                                        "__typename": "CustomSQLTable",
-                                        "id": "22b0b4c3-6b85-713d-a161-5a87fdd78f40"
-                                    }
-                                }
-                            ]
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1572,17 +1212,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": "Sum",
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "customer_id",
-                                    "table": {
-                                        "__typename": "CustomSQLTable",
-                                        "id": "22b0b4c3-6b85-713d-a161-5a87fdd78f40"
-                                    }
-                                }
-                            ]
+                            "aggregation": "Sum"
                         },
                         {
                             "__typename": "ColumnField",
@@ -1595,17 +1225,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": "Sum",
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "rental_id",
-                                    "table": {
-                                        "__typename": "CustomSQLTable",
-                                        "id": "22b0b4c3-6b85-713d-a161-5a87fdd78f40"
-                                    }
-                                }
-                            ]
+                            "aggregation": "Sum"
                         },
                         {
                             "__typename": "ColumnField",
@@ -1618,17 +1238,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "agguegation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "last_name",
-                                    "table": {
-                                        "__typename": "CustomSQLTable",
-                                        "id": "10c6297d-0dbd-44f1-b1ba-458bea446513"
-                                    }
-                                }
-                            ]
+                            "agguegation": null
                         }
                     ],
                     "upstreamDatasources": [],
@@ -1700,8 +1310,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1714,8 +1323,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1728,9 +1336,7 @@
                             "role": "MEASURE",
                             "dataType": "TABLE",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1743,8 +1349,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1757,8 +1362,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1771,8 +1375,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1785,8 +1388,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "HierarchyField",
@@ -1794,8 +1396,7 @@
                             "name": "country, city",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": []
+                            "folderName": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1808,8 +1409,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1822,8 +1422,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1836,8 +1435,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1850,8 +1448,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1864,9 +1461,7 @@
                             "role": "MEASURE",
                             "dataType": "TABLE",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1879,8 +1474,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -1893,8 +1487,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": "Sum",
-                            "upstreamFields": []
+                            "aggregation": "Sum"
                         }
                     ],
                     "upstreamDatasources": [],
@@ -1981,15 +1574,7 @@
                             "name": "Region (People)",
                             "description": null,
                             "isHidden": true,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Region (People)",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -1997,15 +1582,7 @@
                             "name": "Product ID",
                             "description": null,
                             "isHidden": true,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Product ID",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2013,15 +1590,7 @@
                             "name": "Profit",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Profit",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2029,15 +1598,7 @@
                             "name": "Product",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Product",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2045,15 +1606,7 @@
                             "name": "Sub-Category",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Sub-Category",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2061,15 +1614,7 @@
                             "name": "Row ID",
                             "description": null,
                             "isHidden": true,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Row ID",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2077,15 +1622,7 @@
                             "name": "Order ID",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Order ID",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2093,15 +1630,7 @@
                             "name": "Customer ID",
                             "description": null,
                             "isHidden": true,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Customer ID",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2109,15 +1638,7 @@
                             "name": "Ship Mode",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Ship Mode",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2125,15 +1646,7 @@
                             "name": "People",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Customer ID",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2141,15 +1654,7 @@
                             "name": "Order ID (Returns)",
                             "description": null,
                             "isHidden": true,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Order ID (Returns)",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2157,15 +1662,7 @@
                             "name": "City",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "City",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2173,15 +1670,7 @@
                             "name": "Sales",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Sales",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2189,15 +1678,7 @@
                             "name": "Region",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Region",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2205,15 +1686,7 @@
                             "name": "Quantity",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Quantity",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2221,15 +1694,7 @@
                             "name": "Ship Date",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Ship Date",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2237,15 +1702,7 @@
                             "name": "Orders",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Orders",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2253,15 +1710,7 @@
                             "name": "Profit Ratio",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Profit Ratio",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2269,15 +1718,7 @@
                             "name": "Returns",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Returns",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2285,15 +1726,7 @@
                             "name": "Manufacturer",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Manufacturer",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2301,15 +1734,7 @@
                             "name": "Location",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Location",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2317,15 +1742,7 @@
                             "name": "Returned",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Returned",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2333,15 +1750,7 @@
                             "name": "Category",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Category",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2349,15 +1758,7 @@
                             "name": "Regional Manager",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Regional Manager",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2365,15 +1766,7 @@
                             "name": "Postal Code",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Postal Code",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2381,15 +1774,7 @@
                             "name": "Profit (bin)",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Profit (bin)",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2397,15 +1782,7 @@
                             "name": "Segment",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Segment",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2413,15 +1790,7 @@
                             "name": "Top Customers by Profit",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Top Customers by Profit",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2429,15 +1798,7 @@
                             "name": "Country/Region",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Country/Region",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2445,15 +1806,7 @@
                             "name": "Discount",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Discount",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2461,15 +1814,7 @@
                             "name": "Order Date",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Order Date",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2477,15 +1822,7 @@
                             "name": "Product Name",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Product Name",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2493,15 +1830,7 @@
                             "name": "Customer Name",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Customer ID",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -2509,15 +1838,7 @@
                             "name": "State",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "State",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         }
                     ],
                     "upstreamDatasources": [
@@ -2645,8 +1966,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2659,8 +1979,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2673,8 +1992,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2687,8 +2005,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2701,8 +2018,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -2715,21 +2031,7 @@
                             "dataType": "REAL",
                             "defaultFormat": "p0%",
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It shows the percentage of requests which made SLA\r\n\r\nCOUNTD(IF [Made SLA]= TRUE\r\nTHEN  [Number]\r\nEND)\r\n/\r\nCOUNTD([Number])",
-                            "upstreamFields": [
-                                {
-                                    "name": "Made SLA",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                },
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It shows the percentage of requests which made SLA\r\n\r\nCOUNTD(IF [Made SLA]= TRUE\r\nTHEN  [Number]\r\nEND)\r\n/\r\nCOUNTD([Number])"
                         },
                         {
                             "__typename": "ColumnField",
@@ -2742,8 +2044,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2756,8 +2057,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2770,8 +2070,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2784,8 +2083,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2798,8 +2096,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2812,8 +2109,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2826,8 +2122,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2840,8 +2135,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2854,8 +2148,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2868,8 +2161,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2882,8 +2174,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2896,8 +2187,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -2910,21 +2200,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": "Attribute",
-                            "formula": "// This is a calculated field\r\n// It shows the total number of problems ignoring opened date\r\n\r\n{ EXCLUDE [Opened]: COUNTD([Number])}",
-                            "upstreamFields": [
-                                {
-                                    "name": "Opened",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                },
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It shows the total number of problems ignoring opened date\r\n\r\n{ EXCLUDE [Opened]: COUNTD([Number])}"
                         },
                         {
                             "__typename": "ColumnField",
@@ -2937,8 +2213,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATE",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2951,8 +2226,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2965,8 +2239,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2979,8 +2252,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -2993,8 +2265,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3007,8 +2278,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3021,8 +2291,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3035,8 +2304,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3049,8 +2317,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3063,8 +2330,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3077,8 +2343,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3091,8 +2356,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3105,8 +2369,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3119,8 +2382,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3133,8 +2395,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3147,8 +2408,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3161,8 +2421,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3175,8 +2434,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3189,8 +2447,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3203,8 +2460,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3217,8 +2473,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3231,8 +2486,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3245,8 +2499,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3259,8 +2512,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3273,8 +2525,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3287,8 +2538,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3301,8 +2551,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3315,8 +2564,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3329,8 +2577,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3343,8 +2590,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3357,8 +2603,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3371,8 +2616,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3385,8 +2629,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3399,8 +2642,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3413,8 +2655,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3427,8 +2668,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3441,8 +2681,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3455,8 +2694,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3469,8 +2707,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3483,8 +2720,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3497,8 +2733,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3511,8 +2746,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3525,8 +2759,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3539,8 +2772,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3553,8 +2785,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3567,8 +2798,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3581,8 +2811,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3595,8 +2824,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3609,8 +2837,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3623,8 +2850,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3637,8 +2863,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3651,8 +2876,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3665,8 +2889,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3679,8 +2902,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3693,8 +2915,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3707,8 +2928,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3721,8 +2941,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3735,8 +2954,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3749,8 +2967,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3763,8 +2980,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3777,8 +2993,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3791,8 +3006,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": "Sum",
-                            "upstreamFields": []
+                            "aggregation": "Sum"
                         },
                         {
                             "__typename": "ColumnField",
@@ -3805,8 +3019,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3819,8 +3032,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3833,8 +3045,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3847,8 +3058,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3861,8 +3071,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3875,8 +3084,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -3889,21 +3097,7 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It shows if an accident is overdue\r\n\r\n//Check overdue cases among inactive incidents\r\nIF [Active]=FALSE \r\nAND\r\n[Closed]>[Due date]\r\n\r\nOR\r\n//Check overdue cases among active incidents\r\n[Active]=TRUE \r\nAND NOW()>[Due date]\r\n\r\nTHEN  \"Overdue\"\r\nELSE \"Non Overdue\"\r\nEND",
-                            "upstreamFields": [
-                                {
-                                    "name": "Active",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                },
-                                {
-                                    "name": "Due date",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It shows if an accident is overdue\r\n\r\n//Check overdue cases among inactive incidents\r\nIF [Active]=FALSE \r\nAND\r\n[Closed]>[Due date]\r\n\r\nOR\r\n//Check overdue cases among active incidents\r\n[Active]=TRUE \r\nAND NOW()>[Due date]\r\n\r\nTHEN  \"Overdue\"\r\nELSE \"Non Overdue\"\r\nEND"
                         },
                         {
                             "__typename": "ColumnField",
@@ -3916,8 +3110,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3930,8 +3123,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3944,8 +3136,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamColumns": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3958,8 +3149,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3972,8 +3162,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -3986,8 +3175,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4000,8 +3188,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4014,8 +3201,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4028,8 +3214,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4042,8 +3227,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4056,8 +3240,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4070,8 +3253,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4084,8 +3266,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4098,8 +3279,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4112,8 +3292,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4126,8 +3305,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4140,8 +3318,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4154,8 +3331,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4168,8 +3344,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4182,8 +3357,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4196,8 +3370,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4210,8 +3383,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4224,8 +3396,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4238,8 +3409,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4252,8 +3422,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4266,8 +3435,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4280,8 +3448,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4294,8 +3461,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4308,8 +3474,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4322,8 +3487,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4336,8 +3500,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4350,8 +3513,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4364,8 +3526,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4378,8 +3539,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4392,8 +3552,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4406,8 +3565,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4420,8 +3578,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4434,8 +3591,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4448,8 +3604,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4462,8 +3617,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4476,8 +3630,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4490,8 +3643,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4504,8 +3656,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4518,8 +3669,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4532,8 +3682,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4546,8 +3695,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4560,8 +3708,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4574,8 +3721,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4588,8 +3734,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4602,8 +3747,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4616,8 +3760,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4630,8 +3773,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4644,8 +3786,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4658,8 +3799,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4672,8 +3812,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4686,8 +3825,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4700,8 +3838,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4714,8 +3851,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4728,8 +3864,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4742,8 +3877,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4756,8 +3890,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4770,8 +3903,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4784,8 +3916,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4798,8 +3929,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4812,8 +3942,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4826,8 +3955,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4840,8 +3968,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4854,8 +3981,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4868,8 +3994,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4882,8 +4007,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4896,8 +4020,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4910,8 +4033,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4924,8 +4046,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4938,8 +4059,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4952,8 +4072,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -4966,8 +4085,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -4980,33 +4098,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": "Attribute",
-                            "formula": "// This is a calculated field\r\n// It counts each distinct request made in the last year. The \"exclude\" is used to avoid filters interfering in the final result\r\n\r\n{EXCLUDE [Opened], [Overdue], [Max Year?]: \r\nCOUNTD(IF [Max Year?]=TRUE\r\nTHEN [Number]\r\nEND)\r\n}",
-                            "upstreamFields": [
-                                {
-                                    "name": "Opened",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                },
-                                {
-                                    "name": "Overdue",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                },
-                                {
-                                    "name": "Max Year?",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                },
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It counts each distinct request made in the last year. The \"exclude\" is used to avoid filters interfering in the final result\r\n\r\n{EXCLUDE [Opened], [Overdue], [Max Year?]: \r\nCOUNTD(IF [Max Year?]=TRUE\r\nTHEN [Number]\r\nEND)\r\n}"
                         },
                         {
                             "__typename": "ColumnField",
@@ -5019,8 +4111,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5033,8 +4124,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5047,8 +4137,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5061,8 +4150,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5075,8 +4163,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5089,8 +4176,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5103,8 +4189,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -5117,15 +4202,7 @@
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It shows TRUE/FALSE if the year of opened is equal the maximum year in the dataset\r\n\r\nDATEPART(\"year\", [Opened]) = DATEPART(\"year\", {MAX([Opened])})",
-                            "upstreamFields": [
-                                {
-                                    "name": "Opened",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It shows TRUE/FALSE if the year of opened is equal the maximum year in the dataset\r\n\r\nDATEPART(\"year\", [Opened]) = DATEPART(\"year\", {MAX([Opened])})"
                         },
                         {
                             "__typename": "ColumnField",
@@ -5138,8 +4215,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5152,8 +4228,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5166,8 +4241,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5180,8 +4254,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5194,8 +4267,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5208,8 +4280,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5222,8 +4293,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5236,8 +4306,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5250,8 +4319,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5264,8 +4332,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5278,8 +4345,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5292,8 +4358,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5306,8 +4371,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5320,8 +4384,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5334,8 +4397,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5348,8 +4410,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5362,8 +4423,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5376,8 +4436,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5390,8 +4449,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5404,8 +4462,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5418,8 +4475,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -5445,8 +4501,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5459,8 +4514,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5473,8 +4527,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5487,8 +4540,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5501,8 +4553,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5515,8 +4566,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5529,8 +4579,7 @@
                             "role": "MEASURE",
                             "dataType": "REAL",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamColumns": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5543,8 +4592,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5557,8 +4605,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5571,8 +4618,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5585,8 +4631,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5599,8 +4644,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5613,8 +4657,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5627,8 +4670,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5641,8 +4683,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5655,8 +4696,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5669,8 +4709,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5683,8 +4722,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5697,8 +4735,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5711,8 +4748,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5725,8 +4761,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5739,8 +4774,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5753,8 +4787,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5767,8 +4800,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5781,8 +4813,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5795,8 +4826,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5809,8 +4839,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5823,8 +4852,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5837,8 +4865,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5851,8 +4878,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5865,8 +4891,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5879,8 +4904,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5893,8 +4917,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -5907,21 +4930,7 @@
                             "dataType": "REAL",
                             "defaultFormat": "p0%",
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It shows the percentage of incidents which are overdue\r\n\r\n(IF ATTR([Overdue]= \"Overdue\")\r\nTHEN COUNTD([Number])\r\nEND)\r\n/\r\nATTR({ EXCLUDE [Overdue]:\r\nCOUNTD([Number])})",
-                            "upstreamFields": [
-                                {
-                                    "name": "Overdue",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                },
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It shows the percentage of incidents which are overdue\r\n\r\n(IF ATTR([Overdue]= \"Overdue\")\r\nTHEN COUNTD([Number])\r\nEND)\r\n/\r\nATTR({ EXCLUDE [Overdue]:\r\nCOUNTD([Number])})"
                         },
                         {
                             "__typename": "ColumnField",
@@ -5934,8 +4943,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5948,8 +4956,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5962,8 +4969,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5976,8 +4982,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -5990,8 +4995,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6004,8 +5008,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6018,8 +5021,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6046,8 +5048,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6060,8 +5061,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6074,8 +5074,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6088,8 +5087,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6102,8 +5100,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6116,8 +5113,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6130,8 +5126,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6144,8 +5139,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6158,8 +5152,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6172,8 +5165,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6186,8 +5178,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6200,8 +5191,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6214,8 +5204,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6228,8 +5217,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6242,8 +5230,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6256,8 +5243,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6270,8 +5256,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6284,8 +5269,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6298,8 +5282,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6312,8 +5295,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6326,8 +5308,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6340,8 +5321,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6354,8 +5334,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6368,8 +5347,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6382,8 +5360,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6396,8 +5373,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6410,8 +5386,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6424,8 +5399,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6438,8 +5412,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6452,8 +5425,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6466,8 +5438,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -6480,39 +5451,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": "Attribute",
-                            "formula": "// This is a calculated field\r\n// It counts each distinct active request. The \"exclude\" is used to avoid filters interfering with the final result \r\n\r\n{EXCLUDE [Opened], [Overdue], [Max Year?]: \r\nCOUNTD(IF [Active]=TRUE\r\nTHEN [Number]\r\nEND)\r\n}",
-                            "upstreamFields": [
-                                {
-                                    "name": "Opened",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                },
-                                {
-                                    "name": "Overdue",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                },
-                                {
-                                    "name": "Active",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                },
-                                {
-                                    "name": "Max Year?",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                },
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It counts each distinct active request. The \"exclude\" is used to avoid filters interfering with the final result \r\n\r\n{EXCLUDE [Opened], [Overdue], [Max Year?]: \r\nCOUNTD(IF [Active]=TRUE\r\nTHEN [Number]\r\nEND)\r\n}"
                         },
                         {
                             "__typename": "ColumnField",
@@ -6525,8 +5464,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6539,8 +5477,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6553,8 +5490,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6567,8 +5503,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6581,8 +5516,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6595,8 +5529,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6609,8 +5542,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6623,8 +5555,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6637,8 +5568,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6651,8 +5581,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6665,8 +5594,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6679,8 +5607,7 @@
                             "role": "MEASURE",
                             "dataType": "REAL",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6693,8 +5620,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6707,8 +5633,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6721,8 +5646,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         }
                     ],
                     "upstreamDatasources": [],
@@ -6835,8 +5759,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6849,8 +5772,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6863,8 +5785,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6877,8 +5798,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6891,8 +5811,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6905,8 +5824,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6919,8 +5837,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6933,8 +5850,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6947,8 +5863,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6961,8 +5876,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6975,8 +5889,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -6989,8 +5902,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7003,8 +5915,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7017,8 +5928,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7031,8 +5941,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -7045,27 +5954,7 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It checks if an incident is overdue\r\n\r\n//Check overdue cases among inactive incidents\r\n{ FIXED [Number]:\r\n\r\nIF MAX([Active]=FALSE) \r\nAND\r\nmax([Closed])> max([Due date])\r\n\r\nOR\r\n//Check overdue cases among active incidents\r\nMAX([Active]=TRUE) \r\nAND NOW()> MAX([Due date]) \r\n\r\nTHEN  \"Overdue\"\r\nEND\r\n}",
-                            "upstreamFields": [
-                                {
-                                    "name": "Active",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                },
-                                {
-                                    "name": "Closed",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                },
-                                {
-                                    "name": "Due date",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It checks if an incident is overdue\r\n\r\n//Check overdue cases among inactive incidents\r\n{ FIXED [Number]:\r\n\r\nIF MAX([Active]=FALSE) \r\nAND\r\nmax([Closed])> max([Due date])\r\n\r\nOR\r\n//Check overdue cases among active incidents\r\nMAX([Active]=TRUE) \r\nAND NOW()> MAX([Due date]) \r\n\r\nTHEN  \"Overdue\"\r\nEND\r\n}"
                         },
                         {
                             "__typename": "ColumnField",
@@ -7078,8 +5967,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7092,8 +5980,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7106,8 +5993,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7120,8 +6006,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7134,8 +6019,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7148,8 +6032,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7162,8 +6045,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7176,8 +6058,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7190,8 +6071,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7204,8 +6084,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7218,8 +6097,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7246,8 +6124,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7260,8 +6137,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7274,8 +6150,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7288,8 +6163,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7302,8 +6176,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7316,8 +6189,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7330,8 +6202,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7344,8 +6215,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7358,8 +6228,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7372,8 +6241,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7386,8 +6254,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7400,8 +6267,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7414,8 +6280,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -7428,15 +6293,7 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It groups problems accordingly with their ages\r\n\r\nIF [Age of Problems]< 2592000\r\nTHEN \"Under 30 d\"\r\nELSEIF  [Age of Problems] > 7776000\r\nTHEN \"+ than 90d\"\r\nELSE \" 30-90 d\"\r\nEND",
-                            "upstreamFields": [
-                                {
-                                    "name": "Age of Problems",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It groups problems accordingly with their ages\r\n\r\nIF [Age of Problems]< 2592000\r\nTHEN \"Under 30 d\"\r\nELSEIF  [Age of Problems] > 7776000\r\nTHEN \"+ than 90d\"\r\nELSE \" 30-90 d\"\r\nEND"
                         },
                         {
                             "__typename": "ColumnField",
@@ -7449,8 +6306,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7463,8 +6319,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7477,8 +6332,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7491,8 +6345,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7505,8 +6358,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7519,8 +6371,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7533,8 +6384,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7547,8 +6397,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7561,8 +6410,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7575,8 +6423,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7589,8 +6436,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7603,8 +6449,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -7617,21 +6462,7 @@
                             "dataType": "REAL",
                             "defaultFormat": "p0%",
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It shows the percentage of incidents that are overdue\r\n\r\nIFNULL((IF ATTR([Overdue]= \"Overdue\")\r\nTHEN COUNTD([Number])\r\nEND),0)\r\n/\r\nATTR({ EXCLUDE [Overdue]:\r\nCOUNTD([Number])})",
-                            "upstreamFields": [
-                                {
-                                    "name": "Overdue",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                },
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It shows the percentage of incidents that are overdue\r\n\r\nIFNULL((IF ATTR([Overdue]= \"Overdue\")\r\nTHEN COUNTD([Number])\r\nEND),0)\r\n/\r\nATTR({ EXCLUDE [Overdue]:\r\nCOUNTD([Number])})"
                         },
                         {
                             "__typename": "ColumnField",
@@ -7644,8 +6475,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7658,8 +6488,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7672,8 +6501,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7686,8 +6514,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7700,8 +6527,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7714,8 +6540,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7728,8 +6553,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7742,8 +6566,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7756,8 +6579,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7770,8 +6592,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7784,8 +6605,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7798,8 +6618,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7812,8 +6631,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7826,8 +6644,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -7840,21 +6657,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": "Attribute",
-                            "formula": "// This is a calculated field using a level of detail calculation (LOD)\r\n// It counts each distinct problems ignoring date\r\n\r\n{ EXCLUDE [Opened]: COUNTD([Number])}",
-                            "upstreamFields": [
-                                {
-                                    "name": "Opened",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                },
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field using a level of detail calculation (LOD)\r\n// It counts each distinct problems ignoring date\r\n\r\n{ EXCLUDE [Opened]: COUNTD([Number])}"
                         },
                         {
                             "__typename": "ColumnField",
@@ -7867,8 +6670,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7881,8 +6683,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7895,8 +6696,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7909,8 +6709,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7923,8 +6722,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7937,8 +6735,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7951,8 +6748,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7965,8 +6761,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7979,8 +6774,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -7993,8 +6787,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8007,8 +6800,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8021,8 +6813,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8035,8 +6826,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -8049,8 +6839,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "1",
-                            "upstreamFields": []
+                            "formula": "1"
                         },
                         {
                             "__typename": "ColumnField",
@@ -8063,8 +6852,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8077,8 +6865,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8091,8 +6878,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8105,8 +6891,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8119,8 +6904,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8133,8 +6917,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8147,8 +6930,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8161,8 +6943,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8175,8 +6956,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8189,8 +6969,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8203,8 +6982,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8217,8 +6995,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -8231,21 +7008,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It counts each distinct problems which has a related incident\r\n\r\nCOUNT(IF ([Related Incidents]>0\r\nAND NOT ISNULL([Related Incidents]))=true\r\nTHEN [Number]\r\nEND)",
-                            "upstreamFields": [
-                                {
-                                    "name": "Related Incidents",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                },
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It counts each distinct problems which has a related incident\r\n\r\nCOUNT(IF ([Related Incidents]>0\r\nAND NOT ISNULL([Related Incidents]))=true\r\nTHEN [Number]\r\nEND)"
                         },
                         {
                             "__typename": "ColumnField",
@@ -8258,8 +7021,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8272,8 +7034,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8286,8 +7047,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8300,8 +7060,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8314,8 +7073,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8328,8 +7086,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8342,8 +7099,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8356,8 +7112,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8370,8 +7125,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8384,8 +7138,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8398,8 +7151,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8412,8 +7164,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8426,8 +7177,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8440,8 +7190,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8454,8 +7203,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8468,8 +7216,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8482,8 +7229,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8496,8 +7242,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -8510,21 +7255,7 @@
                             "dataType": "REAL",
                             "defaultFormat": "p0.0%",
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It shows the percentage of problems that are known errors\r\n\r\nCOUNTD(IF [Known error]=TRUE\r\nTHEN [Number] END)\r\n/\r\nCOUNTD([Number])",
-                            "upstreamFields": [
-                                {
-                                    "name": "Known error",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                },
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It shows the percentage of problems that are known errors\r\n\r\nCOUNTD(IF [Known error]=TRUE\r\nTHEN [Number] END)\r\n/\r\nCOUNTD([Number])"
                         },
                         {
                             "__typename": "ColumnField",
@@ -8537,8 +7268,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8551,8 +7281,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8565,8 +7294,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8579,8 +7307,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8593,8 +7320,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8607,8 +7333,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8621,8 +7346,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8635,8 +7359,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -8649,15 +7372,7 @@
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It shows TRUE/FALSE if the year of opened is equal the max year of the dataset \r\n\r\nDATEPART(\"year\", [Opened]) = DATEPART(\"year\", {MAX([Opened])})",
-                            "upstreamFields": [
-                                {
-                                    "name": "Opened",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It shows TRUE/FALSE if the year of opened is equal the max year of the dataset \r\n\r\nDATEPART(\"year\", [Opened]) = DATEPART(\"year\", {MAX([Opened])})"
                         },
                         {
                             "__typename": "ColumnField",
@@ -8670,8 +7385,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8684,8 +7398,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8698,8 +7411,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8712,8 +7424,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8726,8 +7437,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8740,8 +7450,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8754,8 +7463,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8768,8 +7476,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8782,8 +7489,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -8796,15 +7502,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "//Calculates the age of active problems since opened until now\r\n\r\nDATEDIFF('second', [Opened], NOW())",
-                            "upstreamFields": [
-                                {
-                                    "name": "Opened",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                }
-                            ]
+                            "formula": "//Calculates the age of active problems since opened until now\r\n\r\nDATEDIFF('second', [Opened], NOW())"
                         },
                         {
                             "__typename": "ColumnField",
@@ -8817,8 +7515,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": "Sum",
-                            "upstreamFields": []
+                            "aggregation": "Sum"
                         },
                         {
                             "__typename": "ColumnField",
@@ -8831,8 +7528,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8859,8 +7555,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8873,8 +7568,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8887,8 +7581,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8901,8 +7594,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -8915,21 +7607,7 @@
                             "dataType": "REAL",
                             "defaultFormat": "p0%",
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It shows the percentage of critical or high priority problems\r\n\r\nCOUNTD(IF [Priority]=1\r\nOR  [Priority]=2\r\nTHEN [Number]\r\nEND)\r\n/\r\nCOUNTD([Number])",
-                            "upstreamFields": [
-                                {
-                                    "name": "Priority",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                },
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It shows the percentage of critical or high priority problems\r\n\r\nCOUNTD(IF [Priority]=1\r\nOR  [Priority]=2\r\nTHEN [Number]\r\nEND)\r\n/\r\nCOUNTD([Number])"
                         },
                         {
                             "__typename": "ColumnField",
@@ -8942,8 +7620,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8956,8 +7633,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8970,8 +7646,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8984,8 +7659,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -8998,8 +7672,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9012,8 +7685,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9040,8 +7712,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9054,8 +7725,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -9068,33 +7738,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": "Attribute",
-                            "formula": "// This is a calculated field\r\n// It counts each disctinct problem. The \"exclude\" is used to avoid filters interfering with the result\r\n\r\n{EXCLUDE [Opened], [Overdue], [Max Year?]: \r\nCOUNTD(IF [Max Year?]=TRUE\r\nTHEN [Number]\r\nEND)\r\n}",
-                            "upstreamFields": [
-                                {
-                                    "name": "Opened",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                },
-                                {
-                                    "name": "Overdue",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                },
-                                {
-                                    "name": "Max Year?",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                },
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It counts each disctinct problem. The \"exclude\" is used to avoid filters interfering with the result\r\n\r\n{EXCLUDE [Opened], [Overdue], [Max Year?]: \r\nCOUNTD(IF [Max Year?]=TRUE\r\nTHEN [Number]\r\nEND)\r\n}"
                         },
                         {
                             "__typename": "ColumnField",
@@ -9107,8 +7751,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9121,8 +7764,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9135,8 +7777,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9149,8 +7790,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9163,8 +7803,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9177,8 +7816,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9191,8 +7829,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9205,8 +7842,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9219,8 +7855,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9233,8 +7868,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -9247,39 +7881,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": "Attribute",
-                            "formula": "// This is a calculated field using a level of detail calculation (LOD)\r\n// It counts each distinct active problem. The \"exclude\" is used to avoid filters interfering with the result \r\n\r\n{EXCLUDE [Opened], [Overdue], [Max Year?]: \r\nCOUNTD(IF [Active]=TRUE\r\nTHEN [Number]\r\nEND)\r\n}",
-                            "upstreamFields": [
-                                {
-                                    "name": "Opened",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                },
-                                {
-                                    "name": "Overdue",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                },
-                                {
-                                    "name": "Max Year?",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                },
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                },
-                                {
-                                    "name": "Active",
-                                    "datasource": {
-                                        "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field using a level of detail calculation (LOD)\r\n// It counts each distinct active problem. The \"exclude\" is used to avoid filters interfering with the result \r\n\r\n{EXCLUDE [Opened], [Overdue], [Max Year?]: \r\nCOUNTD(IF [Active]=TRUE\r\nTHEN [Number]\r\nEND)\r\n}"
                         },
                         {
                             "__typename": "ColumnField",
@@ -9292,8 +7894,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9306,8 +7907,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         }
                     ],
                     "upstreamDatasources": [],
@@ -9459,8 +8059,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9473,8 +8072,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9487,8 +8085,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9501,8 +8098,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9515,8 +8111,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9529,8 +8124,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9543,8 +8137,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9557,8 +8150,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9571,8 +8163,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9585,8 +8176,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9599,8 +8189,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9627,8 +8216,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9641,8 +8229,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9655,8 +8242,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9669,8 +8255,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9683,8 +8268,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9697,8 +8281,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9711,8 +8294,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9725,8 +8307,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9739,8 +8320,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9753,8 +8333,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9767,8 +8346,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9781,8 +8359,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9795,8 +8372,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9809,8 +8385,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9823,8 +8398,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9837,8 +8411,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9851,8 +8424,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9865,8 +8437,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATE",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9879,8 +8450,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9893,8 +8463,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9907,8 +8476,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9921,8 +8489,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9935,8 +8502,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9949,8 +8515,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9963,8 +8528,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9977,8 +8541,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -9991,8 +8554,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10005,8 +8567,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10019,8 +8580,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10033,8 +8593,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -10047,21 +8606,7 @@
                             "dataType": "REAL",
                             "defaultFormat": "p0%",
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It show the percentage incidents which are overdue\r\n\r\n(IF ATTR([Overdue]=\"Overdue\")\r\nTHEN COUNTD([Number])\r\nEND)\r\n/\r\nATTR({ EXCLUDE [Overdue]:\r\nCOUNTD([Number])})",
-                            "upstreamFields": [
-                                {
-                                    "name": "Overdue",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                },
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It show the percentage incidents which are overdue\r\n\r\n(IF ATTR([Overdue]=\"Overdue\")\r\nTHEN COUNTD([Number])\r\nEND)\r\n/\r\nATTR({ EXCLUDE [Overdue]:\r\nCOUNTD([Number])})"
                         },
                         {
                             "__typename": "ColumnField",
@@ -10074,8 +8619,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10088,8 +8632,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10102,8 +8645,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10116,8 +8658,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10130,8 +8671,7 @@
                             "role": "DIMENSION",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": "Sum",
-                            "upstreamFields": []
+                            "aggregation": "Sum"
                         },
                         {
                             "__typename": "ColumnField",
@@ -10144,8 +8684,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10158,8 +8697,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10172,8 +8710,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10186,8 +8723,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10200,8 +8736,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10214,8 +8749,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10228,8 +8762,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10242,8 +8775,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10256,8 +8788,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10270,8 +8801,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -10284,33 +8814,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": "Attribute",
-                            "formula": "// This is a calculated field using level of detail calculation\r\n// It counts each distinct incident. The exclude is used to guarantee that filters will not interfere in the result\r\n\r\n\r\n{EXCLUDE [Opened], [Overdue], [Max Year?]: \r\nCOUNTD(IF [Max Year?]=TRUE\r\nTHEN [Number]\r\nEND)\r\n}",
-                            "upstreamFields": [
-                                {
-                                    "name": "Opened",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                },
-                                {
-                                    "name": "Overdue",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                },
-                                {
-                                    "name": "Max Year?",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                },
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field using level of detail calculation\r\n// It counts each distinct incident. The exclude is used to guarantee that filters will not interfere in the result\r\n\r\n\r\n{EXCLUDE [Opened], [Overdue], [Max Year?]: \r\nCOUNTD(IF [Max Year?]=TRUE\r\nTHEN [Number]\r\nEND)\r\n}"
                         },
                         {
                             "__typename": "ColumnField",
@@ -10323,8 +8827,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10337,8 +8840,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10365,8 +8867,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10379,8 +8880,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10393,8 +8893,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10407,8 +8906,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10421,8 +8919,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10435,8 +8932,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10449,8 +8945,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10463,8 +8958,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10477,8 +8971,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10491,8 +8984,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10505,8 +8997,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10519,8 +9010,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10533,8 +9023,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10547,8 +9036,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10561,8 +9049,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10575,8 +9062,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10589,8 +9075,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10603,8 +9088,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10617,8 +9101,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10631,8 +9114,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10645,8 +9127,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10659,8 +9140,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10673,8 +9153,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10687,8 +9166,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10701,8 +9179,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10715,8 +9192,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATE",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10729,8 +9205,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10743,8 +9218,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -10757,33 +9231,7 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It shows if an incident is overdue\r\n\r\n//Check overdue cases among inactive incidents\r\n{ FIXED [Number]:\r\n\r\nIF MAX([Active]=FALSE) \r\nAND\r\nmax([Closed])>max([Due date])\r\n\r\nOR\r\n//Check overdue cases among active incidents\r\nMAX([Active] = TRUE) \r\nAND NOW() > MAX([Due date]) \r\n\r\nTHEN  \"Overdue\"\r\nEND\r\n}",
-                            "upstreamFields": [
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                },
-                                {
-                                    "name": "Active",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                },
-                                {
-                                    "name": "Closed",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                },
-                                {
-                                    "name": "Due date",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It shows if an incident is overdue\r\n\r\n//Check overdue cases among inactive incidents\r\n{ FIXED [Number]:\r\n\r\nIF MAX([Active]=FALSE) \r\nAND\r\nmax([Closed])>max([Due date])\r\n\r\nOR\r\n//Check overdue cases among active incidents\r\nMAX([Active] = TRUE) \r\nAND NOW() > MAX([Due date]) \r\n\r\nTHEN  \"Overdue\"\r\nEND\r\n}"
                         },
                         {
                             "__typename": "ColumnField",
@@ -10796,8 +9244,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10810,8 +9257,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10824,8 +9270,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10838,8 +9283,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10852,8 +9296,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10866,8 +9309,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10880,8 +9322,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10894,8 +9335,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10908,8 +9348,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10922,8 +9361,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10936,8 +9374,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10950,8 +9387,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10964,8 +9400,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10978,8 +9413,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -10992,8 +9426,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11006,8 +9439,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11020,8 +9452,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11034,8 +9465,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11048,8 +9478,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11062,8 +9491,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11076,8 +9504,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11090,8 +9517,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11104,8 +9530,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11118,8 +9543,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -11132,21 +9556,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It calculates the difference in seconds between opening and closing an incident\r\n\r\n// Check if closed date is valid\r\nIF [Closed]>[Opened]\r\nTHEN\r\n//Calculate difference\r\nDATEDIFF('second', [Opened], [Closed])\r\nEND",
-                            "upstreamFields": [
-                                {
-                                    "name": "Closed",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                },
-                                {
-                                    "name": "Opened",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It calculates the difference in seconds between opening and closing an incident\r\n\r\n// Check if closed date is valid\r\nIF [Closed]>[Opened]\r\nTHEN\r\n//Calculate difference\r\nDATEDIFF('second', [Opened], [Closed])\r\nEND"
                         },
                         {
                             "__typename": "ColumnField",
@@ -11159,8 +9569,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11173,8 +9582,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11187,8 +9595,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11201,8 +9608,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11215,8 +9621,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11229,8 +9634,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11243,8 +9647,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11257,8 +9660,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11271,8 +9673,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11285,8 +9686,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11299,8 +9699,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11313,8 +9712,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11327,8 +9725,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11341,8 +9738,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11355,8 +9751,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -11369,39 +9764,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": "Attribute",
-                            "formula": "// This is a calculated field\r\n// It counts each distinct incident. The \"exclude\" is used to avoid filters interfering in the final result\r\n\r\n{EXCLUDE [Opened], [Overdue], [Max Year?]: \r\nCOUNTD(IF [Active]=TRUE\r\nTHEN [Number]\r\nEND)\r\n}",
-                            "upstreamFields": [
-                                {
-                                    "name": "Opened",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                },
-                                {
-                                    "name": "Overdue",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                },
-                                {
-                                    "name": "Active",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                },
-                                {
-                                    "name": "Max Year?",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                },
-                                {
-                                    "name": "Number",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It counts each distinct incident. The \"exclude\" is used to avoid filters interfering in the final result\r\n\r\n{EXCLUDE [Opened], [Overdue], [Max Year?]: \r\nCOUNTD(IF [Active]=TRUE\r\nTHEN [Number]\r\nEND)\r\n}"
                         },
                         {
                             "__typename": "ColumnField",
@@ -11414,8 +9777,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11428,8 +9790,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11442,8 +9803,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11456,8 +9816,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11470,8 +9829,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11484,8 +9842,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11498,8 +9855,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11512,8 +9868,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11526,8 +9881,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11540,8 +9894,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11554,8 +9907,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11568,8 +9920,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11582,8 +9933,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11596,8 +9946,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11610,8 +9959,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11624,8 +9972,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11638,8 +9985,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -11652,15 +9998,7 @@
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It shows TRUE/FALSE if opened date equals maximum year in the dataset\r\n\r\nDATEPART(\"year\", [Opened]) = DATEPART(\"year\", {MAX([Opened])})",
-                            "upstreamFields": [
-                                {
-                                    "name": "Opened",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It shows TRUE/FALSE if opened date equals maximum year in the dataset\r\n\r\nDATEPART(\"year\", [Opened]) = DATEPART(\"year\", {MAX([Opened])})"
                         },
                         {
                             "__typename": "ColumnField",
@@ -11673,8 +10011,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11687,8 +10024,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11701,8 +10037,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11715,8 +10050,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11729,8 +10063,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11743,8 +10076,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11757,8 +10089,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11771,8 +10102,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11785,8 +10115,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11799,8 +10128,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11813,8 +10141,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11827,8 +10154,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11841,8 +10167,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11855,8 +10180,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11869,8 +10193,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11883,8 +10206,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11897,8 +10219,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11911,8 +10232,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11925,8 +10245,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11939,8 +10258,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11953,8 +10271,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11967,8 +10284,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11981,8 +10297,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -11995,8 +10310,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12009,8 +10323,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12023,8 +10336,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12037,8 +10349,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12051,8 +10362,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12065,8 +10375,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12079,8 +10388,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12093,8 +10401,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -12107,15 +10414,7 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "// This is an IF statment using the opened field to allow for different formats\r\n// original used on columns for line charts are formatted in starting letter of month i.e. J for January\r\n// This version formats to full month name for the tooltip \r\n\r\n\r\n// The IF statement names the month based on the month number of the datefield\r\nIF DATEPART('month', [Opened]) = 1 THEN 'January'\r\nELSEIF DATEPART('month', [Opened]) = 2 THEN 'February'\r\nELSEIF DATEPART('month', [Opened]) = 3 THEN 'March'\r\nELSEIF DATEPART('month', [Opened]) = 4 THEN 'April'\r\nELSEIF DATEPART('month', [Opened]) = 5 THEN 'May'\r\nELSEIF DATEPART('month', [Opened]) = 6 THEN 'June'\r\nELSEIF DATEPART('month', [Opened]) = 7 THEN 'July'\r\nELSEIF DATEPART('month', [Opened]) = 8 THEN 'August'\r\nELSEIF DATEPART('month', [Opened]) = 9 THEN 'September'\r\nELSEIF DATEPART('month', [Opened]) = 10 THEN 'October'\r\nELSEIF DATEPART('month', [Opened]) = 11 THEN 'Novemeber'\r\nELSEIF DATEPART('month', [Opened]) = 12 THEN 'December'\r\nELSE NULL\r\nEND",
-                            "upstreamFields": [
-                                {
-                                    "name": "Opened",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is an IF statment using the opened field to allow for different formats\r\n// original used on columns for line charts are formatted in starting letter of month i.e. J for January\r\n// This version formats to full month name for the tooltip \r\n\r\n\r\n// The IF statement names the month based on the month number of the datefield\r\nIF DATEPART('month', [Opened]) = 1 THEN 'January'\r\nELSEIF DATEPART('month', [Opened]) = 2 THEN 'February'\r\nELSEIF DATEPART('month', [Opened]) = 3 THEN 'March'\r\nELSEIF DATEPART('month', [Opened]) = 4 THEN 'April'\r\nELSEIF DATEPART('month', [Opened]) = 5 THEN 'May'\r\nELSEIF DATEPART('month', [Opened]) = 6 THEN 'June'\r\nELSEIF DATEPART('month', [Opened]) = 7 THEN 'July'\r\nELSEIF DATEPART('month', [Opened]) = 8 THEN 'August'\r\nELSEIF DATEPART('month', [Opened]) = 9 THEN 'September'\r\nELSEIF DATEPART('month', [Opened]) = 10 THEN 'October'\r\nELSEIF DATEPART('month', [Opened]) = 11 THEN 'Novemeber'\r\nELSEIF DATEPART('month', [Opened]) = 12 THEN 'December'\r\nELSE NULL\r\nEND"
                         },
                         {
                             "__typename": "ColumnField",
@@ -12128,8 +10427,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12156,8 +10454,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12170,8 +10467,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12184,8 +10480,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -12198,8 +10493,7 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "1",
-                            "upstreamFields": []
+                            "formula": "1"
                         },
                         {
                             "__typename": "ColumnField",
@@ -12212,8 +10506,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12226,8 +10519,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12240,8 +10532,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12254,8 +10545,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12268,8 +10558,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12282,8 +10571,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12296,8 +10584,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12310,8 +10597,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12324,8 +10610,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12338,8 +10623,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12352,8 +10636,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12366,8 +10649,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12380,8 +10662,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12394,8 +10675,7 @@
                             "role": "DIMENSION",
                             "dataType": "BOOLEAN",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12408,8 +10688,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12422,8 +10701,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12436,8 +10714,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12450,8 +10727,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12464,8 +10740,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12478,8 +10753,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12492,8 +10766,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12506,8 +10779,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12520,8 +10792,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12534,8 +10805,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12548,8 +10818,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12562,8 +10831,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12576,8 +10844,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12590,8 +10857,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12604,8 +10870,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12618,8 +10883,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12632,8 +10896,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "CalculatedField",
@@ -12646,15 +10909,7 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "// This is a calculated field\r\n// It transforms time in seconds into DD:HH:MM:SS format\r\nSTR(INT(AVG([Time to Close an Incident (seconds)])/86400)) \r\n \r\n+ \" day(s) \" + \r\n \r\nIF (INT(AVG([Time to Close an Incident (seconds)])%86400/3600)) \r\n< 10 THEN \"0\" ELSE \"\" END + STR(INT(AVG([Time to Close an Incident (seconds)])%86400/3600))\r\n \r\n+ \":\" + \r\n \r\nIF INT(AVG([Time to Close an Incident (seconds)])%3600/60) \r\n< 10 THEN \"0\" ELSE \"\" END + STR(INT(AVG([Time to Close an Incident (seconds)])%3600/60)) \r\n \r\n \r\n+ \":\" + \r\n \r\nIF INT(AVG([Time to Close an Incident (seconds)]) %3600 %60) \r\n< 10 THEN \"0\" ELSE \"\" END + STR(INT(AVG([Time to Close an Incident (seconds)]) %3600 %60))",
-                            "upstreamFields": [
-                                {
-                                    "name": "Time to Close an Incident (seconds)",
-                                    "datasource": {
-                                        "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
-                                    }
-                                }
-                            ]
+                            "formula": "// This is a calculated field\r\n// It transforms time in seconds into DD:HH:MM:SS format\r\nSTR(INT(AVG([Time to Close an Incident (seconds)])/86400)) \r\n \r\n+ \" day(s) \" + \r\n \r\nIF (INT(AVG([Time to Close an Incident (seconds)])%86400/3600)) \r\n< 10 THEN \"0\" ELSE \"\" END + STR(INT(AVG([Time to Close an Incident (seconds)])%86400/3600))\r\n \r\n+ \":\" + \r\n \r\nIF INT(AVG([Time to Close an Incident (seconds)])%3600/60) \r\n< 10 THEN \"0\" ELSE \"\" END + STR(INT(AVG([Time to Close an Incident (seconds)])%3600/60)) \r\n \r\n \r\n+ \":\" + \r\n \r\nIF INT(AVG([Time to Close an Incident (seconds)]) %3600 %60) \r\n< 10 THEN \"0\" ELSE \"\" END + STR(INT(AVG([Time to Close an Incident (seconds)]) %3600 %60))"
                         },
                         {
                             "__typename": "ColumnField",
@@ -12667,8 +10922,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         }
                     ],
                     "upstreamDatasources": [],
@@ -12751,15 +11005,7 @@
                             "name": "customer_id",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "customer_id",
-                                    "datasource": {
-                                        "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -12767,15 +11013,7 @@
                             "name": "Custom SQL Query",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Custom SQL Query",
-                                    "datasource": {
-                                        "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -12783,15 +11021,7 @@
                             "name": "staff_last_name",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "staff_last_name",
-                                    "datasource": {
-                                        "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -12799,15 +11029,7 @@
                             "name": "staff_first_name",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "staff_first_name",
-                                    "datasource": {
-                                        "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -12815,15 +11037,7 @@
                             "name": "customer_last_name",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "customer_last_name",
-                                    "datasource": {
-                                        "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -12831,15 +11045,7 @@
                             "name": "amount",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "amount",
-                                    "datasource": {
-                                        "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -12847,15 +11053,7 @@
                             "name": "customer_first_name",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "customer_first_name",
-                                    "datasource": {
-                                        "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "DatasourceField",
@@ -12863,15 +11061,7 @@
                             "name": "payment_date",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "payment_date",
-                                    "datasource": {
-                                        "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         }
                     ],
                     "upstreamDatasources": [
@@ -12913,17 +11103,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "id",
-                                    "table": {
-                                        "__typename": "CustomSQLTable",
-                                        "id": "c7dd65fb-6e7e-4091-bbde-8c78b34a40f8"
-                                    }
-                                }
-                            ]
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -12936,17 +11116,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "name",
-                                    "table": {
-                                        "__typename": "CustomSQLTable",
-                                        "id": "c7dd65fb-6e7e-4091-bbde-8c78b34a40f8"
-                                    }
-                                }
-                            ]
+                            "aggregation": null
                         }
                     ],
                     "upstreamDatasources": [],
diff --git a/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_04ed1dcc7090_all.json b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_04ed1dcc7090_all.json
new file mode 100644
index 00000000000000..e695ec7f5339c6
--- /dev/null
+++ b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_04ed1dcc7090_all.json
@@ -0,0 +1,97 @@
+{
+    "data": {
+        "fieldsConnection": {
+            "nodes":  [
+                {
+                    "id": "08feb4a3-ecd2-8e6e-d3d0-fb27970b4898",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "payment_date",
+                            "table": {
+                                "__typename": "CustomSQLTable",
+                                "id": "22b0b4c3-6b85-713d-a161-5a87fdd78f40"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "id": "85ce12c3-12b1-fbfc-659f-a0670b193bab",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "amount",
+                            "table": {
+                                "__typename": "CustomSQLTable",
+                                "id": "22b0b4c3-6b85-713d-a161-5a87fdd78f40"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "id": "afb789df-a7d6-0fd8-1c20-4d7725636f32",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ba250011-4873-54ad-5b64-c689996216f2",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "first_name",
+                            "table": {
+                                "__typename": "CustomSQLTable",
+                                "id": "22b0b4c3-6b85-713d-a161-5a87fdd78f40"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "id": "c04914c4-0a78-1bd1-acb7-ebf0d704c609",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "customer_id",
+                            "table": {
+                                "__typename": "CustomSQLTable",
+                                "id": "22b0b4c3-6b85-713d-a161-5a87fdd78f40"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "id": "c68badd9-86d7-c554-d287-9f21d1ac113b",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "rental_id",
+                            "table": {
+                                "__typename": "CustomSQLTable",
+                                "id": "22b0b4c3-6b85-713d-a161-5a87fdd78f40"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "id": "eb9b61e1-5209-4586-7af0-b69cd0df25c9",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "last_name",
+                            "table": {
+                                "__typename": "CustomSQLTable",
+                                "id": "10c6297d-0dbd-44f1-b1ba-458bea446513"
+                            }
+                        }
+                    ]
+                }
+
+                    ],
+            "pageInfo": {
+                "hasNextPage": false,
+                "endCursor": null
+            },
+            "totalCount": 8
+        }
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_1570e7f932f6_all.json b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_1570e7f932f6_all.json
new file mode 100644
index 00000000000000..edeac704355781
--- /dev/null
+++ b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_1570e7f932f6_all.json
@@ -0,0 +1,1004 @@
+{
+    "data": {
+        "fieldsConnection": {
+            "nodes": [
+                {
+                    "id": "00063251-7439-42d0-92ed-ef1e4780f535",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "01e9bb1a-4104-6015-c523-a8ced60c0141",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "082a9196-5708-f04c-fea5-4b41017364a4",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0a750e32-3a43-ba4b-8965-414be6582d71",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0d28c5bd-5a38-b27a-ab29-dd463cb88781",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0d469bda-c335-56e9-5a99-e5ff72fc3eb5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0e6317db-3c7e-6108-142f-b135c7c5446e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "102561e9-3e82-6fb0-8cf0-5358554ced64",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "107ea9de-0cb0-68d4-7fa0-88cb302111f9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1273ded0-48d6-124a-6478-c890e710d77b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "15497da4-f39e-eee6-ff86-a62a21ab018e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1708b90c-543c-1187-12e4-5fb2efc4398d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "17737de3-7edf-6e9f-98f9-4babf6c1ec52",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1810002a-23d7-fb93-88ba-8929d7ae6626",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1a6643b1-0d5e-10b1-ce9e-8e899f5bb74d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1b0ade5c-b27a-37c9-3777-5f1b10db972e",
+                    "upstreamFields": [
+                        {
+                            "name": "Active",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        },
+                        {
+                            "name": "Closed",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        },
+                        {
+                            "name": "Due date",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1cc3d024-5f16-0c4b-2a11-f25e74a529f7",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "204940b8-ad53-93bc-7f4e-0c49a1ced7c8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "20a816a9-cd49-1c22-c174-68cabbdfb5d6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "20ca442a-ce32-096c-1930-631070435f6a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "221c3b38-b379-ca91-033c-12e1c3bdc2a6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2434f7f7-34cc-38bf-1a6d-b38cda03767d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2636292d-03af-c4bf-1d23-125e93817c46",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "275cd5a0-27af-24b5-dceb-7b949069c5b1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "27b9efb6-3bf8-554c-6483-90302baea5a4",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "286f168e-6791-76ec-a3fd-5869e249a90d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "29bf12fc-c7cb-2646-0018-d1ad17df380e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2a16d7b7-664b-e4fb-5992-9e46656be0f6",
+                    "upstreamFields": null,
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2b288274-2ad4-46e5-e3a4-083d40c27ca5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2c072517-9087-302b-45d2-f1784dbabadb",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2dcbb622-7def-1148-f71d-7e684889280c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2ddcc070-6825-e04c-0f86-71b41a108592",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2e6f4141-1ff0-23f8-ca7b-7e2f725e429c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2edd6e6a-0441-a361-3c1c-787fee02887b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2eddd399-9dd8-6077-b068-6170fe145c9a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "314b11a4-eb95-e74a-485b-b9e701ba63ca",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "31bb1233-4c26-8c2b-b01d-e3257257b20a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "37ff2384-09ee-37a0-68de-50fcf93dad5e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3983e917-c97c-2ef3-3646-c8b7ed6b7cde",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "39cb645a-f49b-46ba-e105-0d4e5a557a50",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3a946020-200f-ef9c-3ffb-dc3d1d7f8d83",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3ca79cbf-1f11-1c6b-8cff-8809fb78847d",
+                    "upstreamFields": [
+                        {
+                            "name": "Age of Problems",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3d079b7f-055a-9e32-a556-06b5ba88b724",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3d9a1e8a-dece-0426-1de3-ce1b17f280bc",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3e307351-7b04-b559-f1b1-ae2e7540399b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4385ee61-4737-cf60-8a23-98e27ce055c5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "463b329f-3168-d7ba-51c2-9fc559c59e74",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "474dbfe8-d6ab-6ce9-615f-2b8c7cd72c1f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "47a4c0ce-80ed-c19f-318e-a939a71e23b8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4898fa27-e5c9-e339-83c0-95afb40a6f3c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4b2193e9-48cf-e370-2354-08960ecb2669",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4bc64791-96fa-d9bf-46bc-3fb125979a8b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4e71e5aa-56fe-adf9-1c4c-9172d06d7bd0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "51b313dc-a42c-fee6-bf29-b00afd3afeeb",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "545b9d43-eae2-8cbc-99d0-27058e192e95",
+                    "upstreamFields": [
+                        {
+                            "name": "Overdue",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        },
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5563d48f-36df-74c8-400a-d167d6026e8c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "56c61068-74ae-1683-4285-ab67e479b2b1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "57b8ab3a-2a5e-8762-a1a6-7f4619af8f45",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "597b6c72-023a-971a-ab51-d8a0175f3980",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "59ac55b4-449a-a192-52d0-89fd0311c100",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5a1b706a-7d10-2971-26e7-16e2dc023fbd",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5ae351de-6951-d9bb-6084-905aaf36acc7",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5ae89446-3361-5c2b-aff0-96fe2133779f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5e86cadb-a132-14db-8a23-c8e2d7cbebd5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5ea7e018-fcdd-e7f0-12c2-5059b8a95631",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "637edfdf-a02f-d4b2-695d-58f86520a466",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "639e97db-56cb-5c83-c39f-f79a3acc7a0a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "644f210f-5b10-ac75-d6f4-c0b1d364af30",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "64591d51-9d4a-2759-7852-87aa2bcb0438",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6815a7f2-82b4-4b5f-7212-20c3894eeb0e",
+                    "upstreamFields": [
+                        {
+                            "name": "Opened",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        },
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6e395433-83a6-cfa2-a243-195b96674a7f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6fb1d4f0-f0ba-0f95-2f7c-20bba021df32",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "70078cf3-13bd-863d-594c-bd8e9e4680cc",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "730d411d-1a9e-391f-6749-cb86f81fd10c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "73d0ea57-a4b1-a2d7-41dd-06c010809086",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "761ab98a-f63e-9487-9164-4e67ff5847e8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "76552343-464f-748f-8fd5-8466ad906420",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "78c21e64-d43e-5b59-22cc-647b77ecf64e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7ab7701e-d395-2505-c768-2f9d6e2903f5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7bdbc329-3b53-ddc9-451a-62e95d19406b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7cc637cf-bb98-8073-bc08-cd06bd457ae2",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7de3a818-2d72-9b14-320c-321fd1879aaf",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7defb5b3-27c6-3039-d2bd-2a9f1f272752",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "800b5b29-6e5a-7c6f-af58-1da43992b340",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "80648b09-43b9-511c-767c-773a1c79ee4e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "825a07ec-113e-cb1b-5659-bdfcd18f6ea9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "82ae3f36-177c-7979-3b5e-9ee6b16341c7",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "82fe5c00-66b0-38bd-6d12-fce5418c2110",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "832b6e6d-3a12-3d68-ffda-e17819eae225",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "858f09a3-a80b-b76b-4815-8310678912fe",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "868fffe2-1903-0353-cf1a-c32043339e5e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "87c90db6-cf07-0b3e-229b-8cd23147bb86",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "88d4c61c-dc52-28ca-1a67-5bcb0aef88e5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "89d75169-9239-7079-0412-68b71f6442ba",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8b607f1a-3a69-256d-b3ca-9a2b6bc9654a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8e72964b-8ffc-f855-62f9-cff5536f7153",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "90ef2358-7bd1-5aaa-0df1-76dabec7a66a",
+                    "upstreamFields": [
+                        {
+                            "name": "Related Incidents",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        },
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9197aa16-fb9b-9da7-dd36-57c441dd7f45",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "923b2b13-ea7d-a516-9b38-dae12dbd867e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "931f2ad1-5ec9-144a-bf79-c355831fb5eb",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "940b4d67-33e7-882b-577f-f144f2b01da1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "94caead7-f1f1-ddd5-0887-42812ab147a2",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "95a0d3c4-4186-cfa8-6327-8d4c98125945",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "981b7ffe-d4bf-532d-2b8e-a0010f08e9ea",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "98dbe828-7c43-eb7e-c46f-00d3f398dfdb",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9998c2e0-3141-5e59-f0fe-119e568774af",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9a6c26c4-84ba-fe54-9cdc-6cac2c443096",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a7e005c8-34bb-bc7f-eb1f-a35898e083cf",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ab2aa63d-c73a-9cf9-9a54-9d469d47e890",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ab6b575a-355a-a33e-f5dd-758009a5d727",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ad860ae9-1f1e-190b-774c-9e30d3666e8f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ae576f09-897e-d919-b991-216abbbb676f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b02e54fa-0cd0-d28d-c391-b5a0b89fc1c6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b0fdc0c9-bf62-8b24-8582-17c8685ec9c1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b10a9c7b-377b-3b0d-d172-487a7ca329ba",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b34308cc-f30c-a5bb-52b9-78c00f2f461c",
+                    "upstreamFields": [
+                        {
+                            "name": "Known error",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        },
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b3641005-3974-868f-2a61-0dce2e083ef9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "baa48968-d807-7a6f-e46e-a60f97216aae",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c09ee363-0a77-cf4b-bc0b-58cd5ed9b623",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c1cae107-4e52-e8e6-286b-28ac285128d7",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c1ef3114-424a-b7d7-3559-989b2bbc4f48",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c53ead8c-9d9c-4c32-8fdb-841e30b0a532",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c5aba5a9-0447-90c7-bfa0-064ee2a5c809",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c5c20844-5802-c8a9-ef9d-a62e1972f94a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c64607f1-c00a-88b8-b4ea-4018f7dff6f0",
+                    "upstreamFields": [
+                        {
+                            "name": "Opened",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c790ee85-ee15-0cbb-9782-98312c7903c5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c7cd50dd-1459-4d24-fe94-96611ccd7a6e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c8a9edb7-a929-3eeb-f005-4ff46ef1a6ac",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c8c90936-8146-8283-8b27-66104b99ebe6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c973b995-ccca-201f-0ea3-5b8ac1625d99",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ca6e50f9-4097-4aaf-ead3-ec6cce910e20",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ced911f2-2ff8-60e3-e522-36f7c8f7a28d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cf7efd6f-3e9d-0bf4-b96d-4404194690e6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cfafc137-c841-f1a8-42a7-c976624ec73d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cff99350-e836-7226-8050-3163d587b479",
+                    "upstreamFields": [
+                        {
+                            "name": "Opened",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cffb2549-3525-3117-9d65-855e28d41fdd",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d1233d09-863c-94bc-ea08-a962f932462e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d347b9a8-e7ad-d29c-c65e-bf0794aae411",
+                    "upstreamFields": null,
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d4120dbf-7a9a-8dcc-b04d-46d252167368",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d8f9b0fd-70f2-8a37-b5d2-42659cbb4bef",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "da47cb47-8e2e-9a86-a3de-30b06bb627a4",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "dd85d612-daca-60b3-433b-83508d004b1f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "de196a57-20e2-9501-3d72-f8e2681266c8",
+                    "upstreamFields": [
+                        {
+                            "name": "Priority",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        },
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "de60a6dd-ae9a-3b7c-edf8-d24f5f53fa89",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e0101592-4d04-fca2-69ee-4716d890b478",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e3250a75-40d1-430a-8e8d-91ccb4cdbd06",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e5311592-2aff-4c2b-6e39-394467561292",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e557ac82-16de-15b8-05b6-5ab147b282da",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e99ce6f7-1be9-1631-5ac1-5c9a7fa1843e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ea90347e-f01d-6dc2-0676-215bd646281a",
+                    "upstreamFields": null,
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "eae5703d-877a-a98b-e050-73333ab7ea7f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ec7efb26-fd01-82de-28dd-194ebd3da3f5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ec9379d0-f48b-577e-2314-6288c3f4a3a0",
+                    "upstreamFields": [
+                        {
+                            "name": "Opened",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        },
+                        {
+                            "name": "Overdue",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        },
+                        {
+                            "name": "Max Year?",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        },
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f0476fba-cb04-884e-9b6d-1de64a00c645",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f432316d-59f3-0369-3ce6-867f880c671b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f593d9e0-cb42-a787-c4b1-61aab31ba3be",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f6583bf8-59b8-9722-3b91-86b33f998413",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f67c0bb4-2ec3-aa3a-6b92-bd697c6bbe80",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f7b024b2-3ea3-4fbc-199c-b501cddaa7d5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f8d5647e-11f4-0fc7-d121-92a980617707",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f971325f-534e-80c6-7cfe-197273a02aaa",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "fa53bc38-b45e-4bfa-7ae4-5ae249ef6751",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "fd8d3177-df25-99c8-707d-76aff8975567",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "fed69289-f04f-e280-fdd5-719cf043ff35",
+                    "upstreamFields": [
+                        {
+                            "name": "Opened",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        },
+                        {
+                            "name": "Overdue",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        },
+                        {
+                            "name": "Max Year?",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        },
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        },
+                        {
+                            "name": "Active",
+                            "datasource": {
+                                "id": "3ade7817-ae27-259e-8e48-1570e7f932f6"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ff4371e0-3575-3686-23d1-4d035db44f33",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ffd340a0-8e6c-b2a7-2649-66f7c86f468b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                }
+            ],
+            "pageInfo": {
+                "hasNextPage": false,
+                "endCursor": null
+            },
+            "totalCount": 8
+        }
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_26675da44a38_all.json b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_26675da44a38_all.json
new file mode 100644
index 00000000000000..6c44f9c3142434
--- /dev/null
+++ b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_26675da44a38_all.json
@@ -0,0 +1,109 @@
+{
+    "data": {
+        "fieldsConnection": {
+            "nodes": [
+                {
+                    "id": "0235103b-b83a-1380-8357-45b6e458202d",
+                    "upstreamFields": [
+                        {
+                            "name": "customer_id",
+                            "datasource": {
+                                "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "494eb750-ceb8-5000-e42b-f5889389c62b",
+                    "upstreamFields": [
+                        {
+                            "name": "Custom SQL Query",
+                            "datasource": {
+                                "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "60ca9dc0-f867-01a1-6d9f-e196636c0f08",
+                    "upstreamFields": [
+                        {
+                            "name": "staff_last_name",
+                            "datasource": {
+                                "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "79ab36f4-e1f3-ec9a-13c6-e7658f3ed563",
+                    "upstreamFields": [
+                        {
+                            "name": "staff_first_name",
+                            "datasource": {
+                                "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8dbd31bb-460f-bb52-3b26-d0b4b5df875e",
+                    "upstreamFields": [
+                        {
+                            "name": "customer_last_name",
+                            "datasource": {
+                                "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c058d792-9f88-8642-4e63-682cfb6382af",
+                    "upstreamFields": [
+                        {
+                            "name": "amount",
+                            "datasource": {
+                                "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d432bec7-b5cf-7891-3a47-087a65f3679b",
+                    "upstreamFields": [
+                        {
+                            "name": "customer_first_name",
+                            "datasource": {
+                                "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ddadd012-bcdb-2ddd-9021-c590410c3e59",
+                    "upstreamFields": [
+                        {
+                            "name": "payment_date",
+                            "datasource": {
+                                "id": "00cce29f-b561-bb41-3557-8e19660bb5dd"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                }
+            ],
+            "pageInfo": {
+                "hasNextPage": false,
+                "endCursor": null
+            },
+            "totalCount": 8
+        }
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_69eb47587cc2_all.json b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_69eb47587cc2_all.json
new file mode 100644
index 00000000000000..403c796c815535
--- /dev/null
+++ b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_69eb47587cc2_all.json
@@ -0,0 +1,421 @@
+{
+    "data": {
+        "fieldsConnection": {
+            "nodes": [
+                {
+                    "id": "05e878c2-3b10-7944-446a-09c3c958df39",
+                    "upstreamFields": [
+                        {
+                            "name": "Region (People)",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "092029cd-706b-93c5-f2ea-68b020adb647",
+                    "upstreamFields": [
+                        {
+                            "name": "Product ID",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "10d720d9-d4dc-f0dd-6f6d-f2078a808aed",
+                    "upstreamFields": [
+                        {
+                            "name": "Profit",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1b83e377-52f1-24f3-992b-2559e8b6ca70",
+                    "upstreamFields": [
+                        {
+                            "name": "Product",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1e420a77-19a5-c303-abbc-de977b5f4ef9",
+                    "upstreamFields": [
+                        {
+                            "name": "Sub-Category",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "28ec64fc-8a21-65dd-6125-2f73fc625f26",
+                    "upstreamFields": [
+                        {
+                            "name": "Row ID",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "32c2bd6f-cc3e-62e0-1e6a-f5ae480ac329",
+                    "upstreamFields": [
+                        {
+                            "name": "Order ID",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3934cbed-ff3d-de73-aefa-8bccc8bc9797",
+                    "upstreamFields": [
+                        {
+                            "name": "Customer ID",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4de34be4-76ea-7080-f0d4-7f108466015b",
+                    "upstreamFields": [
+                        {
+                            "name": "Ship Mode",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "54e48e4f-5519-15c1-4a1b-97dc909899a1",
+                    "upstreamFields": [
+                        {
+                            "name": "Customer ID",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5a03c6b4-b21c-27b0-65f9-2d5ae81b5ed0",
+                    "upstreamFields": [
+                        {
+                            "name": "Order ID (Returns)",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5baa65db-612b-a18e-957f-8685b6b85571",
+                    "upstreamFields": [
+                        {
+                            "name": "City",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "61b4d0d2-3b7c-a61f-e4bd-a95b6fde8478",
+                    "upstreamFields": [
+                        {
+                            "name": "Sales",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6966d863-35e8-9c0a-6094-c6d27a1fd787",
+                    "upstreamFields": [
+                        {
+                            "name": "Region",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6a7b2e6d-3484-0df3-d98e-328a111691df",
+                    "upstreamFields": [
+                        {
+                            "name": "Quantity",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7d3bd4e3-1683-7450-d55d-592e1a47a817",
+                    "upstreamFields": [
+                        {
+                            "name": "Ship Date",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "839c51f8-344f-b1c0-4e3a-9d53bd2dd6bd",
+                    "upstreamFields": [
+                        {
+                            "name": "Orders",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8bd692d0-3d64-3678-8deb-a6c9469f7475",
+                    "upstreamFields": [
+                        {
+                            "name": "Profit Ratio",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9722bc5a-16be-4f16-91db-708598db866e",
+                    "upstreamFields": [
+                        {
+                            "name": "Returns",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "983ea4b7-3690-1805-4a7a-a8bea49f920c",
+                    "upstreamFields": [
+                        {
+                            "name": "Manufacturer",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "997587cb-024f-1a56-e37c-2fb7277642e6",
+                    "upstreamFields": [
+                        {
+                            "name": "Location",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a4c088c6-03e9-8dc3-3e69-764ab8610bf5",
+                    "upstreamFields": [
+                        {
+                            "name": "Returned",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a69ba55b-4434-6988-e276-06183ba7ee63",
+                    "upstreamFields": [
+                        {
+                            "name": "Category",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b4d8bf7b-74aa-3b34-ba07-a5947aceae44",
+                    "upstreamFields": [
+                        {
+                            "name": "Regional Manager",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "bb4583d3-90db-6272-b939-22537dac2de4",
+                    "upstreamFields": [
+                        {
+                            "name": "Postal Code",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c9fdaec1-d715-bab0-a5e6-7cb2a4096d0c",
+                    "upstreamFields": [
+                        {
+                            "name": "Profit (bin)",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cbf261c1-b86b-2f51-7aa7-9ec601acdadf",
+                    "upstreamFields": [
+                        {
+                            "name": "Segment",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cc311fea-3737-9f07-b1bf-f4811309668d",
+                    "upstreamFields": [
+                        {
+                            "name": "Top Customers by Profit",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d90ed70b-2846-f23d-360c-7a72e3a8d62d",
+                    "upstreamFields": [
+                        {
+                            "name": "Country/Region",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e1906cb6-1a86-90ee-512c-c2ecf5069d96",
+                    "upstreamFields": [
+                        {
+                            "name": "Discount",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e502bf72-d0a6-80ed-eefb-47e10608a21d",
+                    "upstreamFields": [
+                        {
+                            "name": "Order Date",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ea384863-64ca-b5fa-7e15-d3273b5026e6",
+                    "upstreamFields": [
+                        {
+                            "name": "Product Name",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "eaad917f-9a67-d25b-2f18-7c740e9064a7",
+                    "upstreamFields": [
+                        {
+                            "name": "Customer ID",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "fd71baa7-0996-a23f-7029-3df44e89fff0",
+                    "upstreamFields": [
+                        {
+                            "name": "State",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                }
+            ],
+            "pageInfo": {
+                "hasNextPage": false,
+                "endCursor": null
+            },
+            "totalCount": 8
+        }
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_6f5f4cc0b6c6_all.json b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_6f5f4cc0b6c6_all.json
new file mode 100644
index 00000000000000..4bffaf3ed8da60
--- /dev/null
+++ b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_6f5f4cc0b6c6_all.json
@@ -0,0 +1,75 @@
+{
+    "data": {
+        "fieldsConnection": {
+            "nodes":  [
+                {
+                    "id": "04151303-bd09-aff5-b9ee-e4948c2cb4f0",
+                    "upstreamFields": []
+                },
+                {
+                    "id": "0a0bd261-effc-6d14-3e7a-bc0b214455d4",
+                    "upstreamFields": []
+                },
+                {
+                    "id": "27a9fbc1-1290-d570-d88b-149d83d4b113",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2dd4db27-740f-7cc7-b36e-09564d556cb3",
+                    "upstreamFields": []
+                },
+                {
+                    "id": "3146b9b4-eb1f-ae91-804f-e5b157cf0eb7",
+                    "upstreamFields": []
+                },
+                {
+                    "id": "31811e0f-9fd3-dad5-6093-aab2de26e470",
+                    "upstreamFields": []
+                },
+                {
+                    "id": "3c8d999a-85c2-9f62-17e0-e7e3b4fc59c1",
+                    "upstreamFields": []
+                },
+                {
+                    "id": "4ad28d4f-8e39-429d-5b42-8bdd5ae90734",
+                    "upstreamFields": []
+                },
+                {
+                    "id": "67a5460e-d59a-1aa5-d999-7a945c3ac781",
+                    "upstreamFields": []
+                },
+                {
+                    "id": "7cbb7bd2-85d6-1a27-b21a-b93104c5fbf7",
+                    "upstreamFields": []
+                },
+                {
+                    "id": "917735d1-6fd5-536e-cc19-52eb04b6e954",
+                    "upstreamFields": []
+                },
+                {
+                    "id": "aee7feaf-f094-7601-e798-ba92e414a964",
+                    "upstreamFields": []
+                },
+                {
+                    "id": "dde631d5-9f2b-5413-e3d7-74b6494c1d75",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e2da5ba0-5e55-013a-3c2d-fbd975331a3c",
+                    "upstreamFields": []
+                },
+                {
+                    "id": "fb549c29-1158-1073-98e3-040086d127e8",
+                    "upstreamFields": []
+                }
+            ],
+            "pageInfo": {
+                "hasNextPage": false,
+                "endCursor": null
+            },
+            "totalCount": 8
+        }
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_a0fced25e056_all.json b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_a0fced25e056_all.json
new file mode 100644
index 00000000000000..1e5e4d0454469b
--- /dev/null
+++ b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_a0fced25e056_all.json
@@ -0,0 +1,1548 @@
+{
+    "data": {
+        "fieldsConnection": {
+            "nodes": [
+                {
+                    "id": "008efba8-a319-a2d1-017c-ac8b716464a1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "02290a78-a75c-49c9-e9f8-4010d0949eac",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "04dc385d-8417-aa5f-3f4c-27c4333fdb5e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "05e3ac4d-2a2f-43f4-095c-e735768bad55",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0a0d2eaa-a912-2e18-6c15-df4c31b2fda2",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0a972b7c-d9f9-9f60-4777-73d4c2edce73",
+                    "upstreamFields": [
+                        {
+                            "name": "Made SLA",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        },
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0c34bf50-f6c4-ffd5-820b-aa4d39b17145",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0c3589ad-af62-c35d-8e8f-878754bef4eb",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0ce0525d-249d-0583-da6f-1a8fe2c35be5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0d2d74c7-251c-fccb-a10c-356eb18ce381",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0d51375a-79a7-32db-5b69-7604d2440487",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0dbbf6a9-12f0-ab05-3a47-5cde0385d100",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0efd4d21-41ff-c601-b317-52134176c0a6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "122a6170-8375-6ea3-67d1-9f1282bd3395",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "12bc3d05-58ca-b026-29f1-ab26e294c44f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "132c92e6-5670-b1c2-ba4e-04dd949b88c8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "135564cf-1b6a-e773-0434-aa221fbd2f6b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "13788d86-4bc3-2f8c-7c81-22441862abe4",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "13b03dc6-0c35-2d6c-309b-4e38cf5f9ec0",
+                    "upstreamFields": [
+                        {
+                            "name": "Opened",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        },
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "13f2b909-b0be-cdf7-a0f6-f51f9ebfa575",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1532b8d8-95da-574f-5790-b80e3869ac60",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "15920ddf-c025-a048-a71d-7b500535f323",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "15c932ba-aafa-4fb2-e616-5192aee65ab4",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "15cf1367-7a9d-7628-fa27-08fb49cc287d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "15dbd6e4-a561-8760-6b6f-d0a3dffc2207",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1734af47-5c4c-9627-b8b0-9971a8a80b22",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "174d81eb-c5e3-722b-993b-ec2c6423dd49",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "175f2ede-eb52-2f9a-cb9c-fa88c1111dc0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "17c2014d-2507-6a9f-ad1e-2de49d4d42fe",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "181b3cc8-66f2-764e-a3ed-dcd634ed165e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "18d38346-0679-cc25-ceac-7c3d44187292",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "19ea2ef0-ca24-3b1d-5e57-2fd045efd0a2",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1a16620c-c2e7-1c76-15bc-d2c177b1d070",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1c06f71e-5a76-e28e-6cdc-897d0b4557dd",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1cb5b877-0c99-f95c-bf72-59a514da4373",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "20f1306b-4773-0662-4253-02fd76e901a1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "22cbb922-13e7-d035-8265-31773e23bd2a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "23e08774-36b9-497e-3d14-df6cb90499d9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "241346ea-bd7a-5f61-4a48-c5d555d8c687",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2470d761-eb96-34ed-e9e8-93a85cee999b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "24acc42c-935e-c9e6-604e-4d16a84cc0c7",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "258f1373-9799-56d2-b92d-d91d71ea7e1b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "25f757d1-a30b-3fe0-05d2-b924c9a25903",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "26dbc4e1-7f24-1805-aaa2-430434a45e12",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "26e8468a-eb18-e101-ca05-c3a973788f41",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "26eb4032-4bbf-f9fd-1a23-3156f038b811",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "26fac0b0-9c32-8b6c-4750-1af13c8aa0ec",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "274183a9-b33a-7d99-53ee-03010803a777",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "276c386f-864d-e6a1-d9d6-4f0e52a1247d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2ab8f665-e11e-6370-d100-6c204b83c436",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2ba3fefa-ec86-2d62-513c-7eb93975277c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2c742cd3-4300-8880-6db0-26bca6d67162",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3024c8e3-bf18-c4ed-a65b-6483523f7112",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "32479c99-87cf-4b10-f77c-65623e197323",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "32952e69-cd24-fac4-9b40-6639d668e6f1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "32fa8a47-f7e8-627d-83c7-26b967486b5d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3359b5b0-4947-afa1-b610-e90f51b21368",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "368833f1-86ec-d717-d7c4-17460462696d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "37cbff94-4fcf-de28-3d7f-577148e25de5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "38435c95-3578-5f91-b918-db4ca155348c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "388f8f1e-59ea-9061-132d-b4395f36f3ad",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "39bf48ba-57b2-67a9-dc04-128658bb7c95",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3a2833f2-44fc-19fb-9d35-0a89b36c56e0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3bdf4fb2-6442-7243-be14-8e743a3c749a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3c0b9be1-6c0b-9b59-7a74-011173a4f6ac",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3c172c79-58c8-887d-c057-8c79ab04a826",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3ee4dbb7-1172-04b2-c5e8-05cada9b50aa",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "418ae8b3-ec94-9c2e-75d8-052576a242e0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4255ae77-005b-f589-9ccd-19665baa8e58",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4282472f-2d7a-8cd7-92c7-9b8b762242ea",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "441c2514-af72-5391-9777-9fcfaddc6741",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "467161aa-e739-41ff-389b-793d49f47359",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "467ddc9e-f3c0-1976-dcd4-18e0e0513c60",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "46a60f30-fe47-1be7-97d9-e2fce6bebdc3",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "46c15306-b653-1cef-bf53-f272c7e0771e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4769810f-04b7-6ea9-d279-6ba912159368",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4a18e53d-9f58-8115-363c-d8899262525f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4b782f0a-af66-f996-6eb3-0eed7138db78",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4e8f122f-5f4d-77be-e716-b6434851bc79",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4f2e8b54-8bb2-d5ee-764f-2cf037056728",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4f4cb0a0-d290-f269-6306-ffbda0b59bb9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4f63ee1c-1ce8-5c28-3f38-19706fcb28f8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "50a5f06d-6281-6cb0-5fa1-acacafc73035",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "51198995-f955-99c0-76dd-b65af948b3ab",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "515b0be8-2b01-81e1-b5f4-d38c6028f450",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "52562198-6ff7-8ab5-827c-d647ebdcc012",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "537a920a-7f17-eba0-0b32-d597edc44483",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "53de3015-a2ef-299d-a778-77b2669cee6f",
+                    "upstreamFields": [
+                        {
+                            "name": "Active",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        },
+                        {
+                            "name": "Due date",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5498cd4e-affa-faee-8ede-3c3a271626b4",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5525b243-fc68-551f-c2fa-5336d846d162",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "575b861c-2fd8-fbd5-e9b2-56554458ae26",
+                    "upstreamFields": null,
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "58ab3115-ed3a-e547-456f-19546d8ed7e6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "58ae7942-799d-2c8c-09f9-160e26f55499",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "58b286a8-ca37-8bc3-9526-6b6ce5ec31f9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "58eb2a4c-9bf3-ae9c-3025-e74424ebf774",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "599e517c-0ee3-b31d-ec77-6c7d09585d32",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5a54045b-981f-38c9-f858-440a1821d9ef",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5d63bd75-3187-f45f-619a-f01d8ecc8284",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5dc0a505-e6ca-fa13-b183-045eb170c2ac",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5e3fed63-8bc3-0beb-248e-94c11bdc594f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5fc5cc14-7db8-4e62-dd6f-8f6728e7be93",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "60085593-4c40-45d0-cac9-710cb1b396ac",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "611e5630-f981-5cf2-e927-266bedcb86bc",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6218e598-81e7-1b5b-ad84-5ce064025bc2",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "63c7744a-0948-b1ef-52a4-6a489e54e53a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "63e5bd33-24cc-b6dd-4a6d-7c8c363f5450",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "643a8709-e5ea-9915-e06a-efad2d933ac0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "65a525c1-cd94-d4b8-ac37-7eebbb3c409f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "66f180f0-37a7-7693-72b0-f950666cc30b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "67020cc1-aae1-0682-36bd-23c5e608a1ff",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "691e556a-5091-64ce-6055-f6e831197143",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "693cce97-337d-6650-3b28-a7715ab24d26",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6a08f79f-2577-fa62-275a-2ec15857bc04",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6ab03c38-6eb6-b117-ce27-4c9534854b63",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6b4727b4-9080-cc79-06a9-678404955895",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6b6e72ec-e66e-ad8d-56e1-e9b684e82066",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6bf2227b-af9f-23df-d337-b19ea40031f5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6c00ced2-cdb4-7abf-82bc-351e9949edea",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6c8e9a78-a11e-6d92-b4d3-a1ef7d60aa27",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6cdd6e20-5dfc-3c2a-72b7-15cc778665c8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6dce7c6f-bebb-e5fe-f0ed-221a724b806a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6ede002b-b1c1-39fa-b92e-fb6e652c4da3",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6ff1a184-f3e1-a2ce-349e-ae5d76859d76",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "728a1525-246e-f30b-1d6e-6e3ef90739c3",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "72922b48-ca61-7998-c7fe-aa1e1ac13cdd",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7548db00-2a35-387c-9d93-ecb4bd3eb691",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "75c9c62f-7158-3086-9443-ec06063631a9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7633c080-f332-a84d-d369-3fb8176a0f02",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "764aa481-ac4b-ba2c-d8d3-68b4e21fc54a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "784c3e44-b99d-9b52-7ebb-9e4ec6f0be9d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "789ea4f0-9d93-ca84-91db-a91c0c4e0b56",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "79c14db1-3507-37d7-b428-9820adfd4df5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7b4f0f0d-91b1-8037-2ed6-99cbdf50ec09",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7ce2f502-a54b-41ad-cb89-ba72d78362bc",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7f8b5ff1-8612-1c62-d3a1-b8f96c9a8fd7",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "810b150f-36d6-73cf-39a0-fa0b5afb89e6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "82a612f8-5371-316e-624b-8e51f50583ac",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "833697a0-088e-de13-af21-1db93e07e1e6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "838264bf-b544-80df-d7d8-4ceb820e4307",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "83ec93af-9405-34a9-bdd9-29955f5a73d6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "848b5022-e769-97ac-34ab-4855920f60f6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "856cffc0-3019-b83d-7490-ddbe13b16d18",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "85b72af5-e44d-605a-4057-fd588a76ddb1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "88023bbb-07aa-5dda-a16e-782622c24d7c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8874a6de-f4af-75c3-bf20-0b2baabb6f75",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "89d6ce04-07f4-2963-ae3a-f297127905da",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "89faa1fd-6f36-a112-cc5a-b6d0519cb169",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8ce117c7-74c3-224b-03e5-39594cf42106",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8efa84c1-cd61-5372-d0cc-8ae1f02e6de0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9063d7de-4033-6d76-e49c-dd02e915d19b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "92fa607c-c8e4-839c-0d08-abe93725da96",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "937a4589-d8fa-9e04-256f-73c1f16f2607",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "94392467-1a32-887a-1651-538af23ffe37",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "94b52aaa-3b07-fc08-a782-ae74e5677867",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9625aa4e-fb89-7570-c346-306b70d32da1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9653d847-7071-1216-cf9e-144575b95582",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "96c48bb9-89ae-d542-0645-fe8b73f72dfe",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "989d24ed-df40-4769-0a2b-8ec1846c58ce",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "99300f69-6da1-1e15-80b6-92888e970fce",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9958fe2e-6292-7768-b8a0-304ac36dc936",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9ac5654f-df62-bb13-b7f5-41012b5e19e7",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9b7f962e-6a86-e17e-4afd-44001f729df3",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9fdce669-4eed-3ecc-fa22-1a09b7f4a6db",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a0c579b3-7423-144a-0f1d-ec8da1bcccba",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a322b8b0-c401-86a0-a5d8-2aea35da11d1",
+                    "upstreamFields": [
+                        {
+                            "name": "Opened",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        },
+                        {
+                            "name": "Overdue",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        },
+                        {
+                            "name": "Max Year?",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        },
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a43fed62-a037-a6f3-6db4-11135d8b11db",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a455f93d-b035-918a-08b6-4f96a12ca24d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a54fcec0-97c3-72ab-cc19-23123070f7a3",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a58db715-2016-b971-055c-de1d8bfb8f80",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a62941e4-9f9f-93ed-f307-5e6dbfb728ad",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a7058558-d759-9e23-ab6a-a656ee2f317d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a7c8d21d-db4e-debb-bfef-4994beba809d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a88003b6-66c0-f362-a977-2d5d9c6dd3db",
+                    "upstreamFields": [
+                        {
+                            "name": "Opened",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ab41f607-d2c0-4db1-b744-d10914d8a6d5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ac179862-0ef8-afd7-9801-0f2e0f385175",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ac37a380-359c-e478-b642-e31a64c5f0d9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "aca50e11-a5b5-f063-8a78-656f47f29ec5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "acf6fb05-2503-f424-b15e-d603aaa0c223",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "adee9155-2a4b-ca21-7af8-0f42c17b7b45",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ae692271-daf4-7453-e36b-b68d2c33f36f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "af29c272-905b-ef8b-47ed-be289fa4b858",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "afcdfd6b-02d3-1952-c6e9-3dce86cd9da4",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b0486a68-1e13-6dbb-76a4-edc7a1c856bf",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b0590acf-db66-2aaf-1138-e6d56c9e2a97",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b05e2f82-9cd4-7b30-2932-e88632cb2a55",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b1247620-5f00-3f3e-fef3-4eef89c749d6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b265ac9c-0287-b59b-27bd-d330a9fcdf79",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b2fab7e4-75ce-500f-40e9-a67e28c20272",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b3f50843-0f17-9c89-9579-58f317f65620",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b42c0a76-7906-498b-2049-681677b93421",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b472e985-a322-905d-a2f8-699652137607",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b4dee84e-ef33-7e1e-ad52-02a84eb14dd0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b6961a0e-b2ee-fb47-ffbe-a5e778092615",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b6cc2e55-a89b-310e-557e-fe9ab2f297b0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b7a02779-5bcf-9fb6-c303-1dd5fdeacd49",
+                    "upstreamFields": null,
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b7c973cb-2fcd-38d4-ec5c-3252e0c61946",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b7ea244e-0957-b32e-1c82-2c7d6c0c77e8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b8021235-a9c3-d250-6bb6-acd2742549b3",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b8336140-37e9-bc30-246e-2e84d7d776de",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b887e02d-9fb3-e1b2-fce9-e2d9e1864247",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b94dd2fe-50fe-59a7-5dbe-b8c8a224ac90",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b9abd974-460e-1a62-58e8-3da85bd2b27a",
+                    "upstreamFields": null,
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b9fc7e1e-469b-1182-f05f-44c55e5a7dbb",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "baa30890-390b-01ae-2463-3d41ad6af87d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "bb02c81e-5779-e29e-c839-891f6ca7c4fd",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "bbb1056d-69e3-97a5-398a-42500522ecac",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "bcfd29ee-8e1f-fcac-df18-926bf5e4cd4f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "bd26196b-38a8-ecd4-761c-f2f8597db4ea",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "bd61f261-1255-c145-c113-390625309968",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "bed11b20-9063-82d9-5a53-ef8bb75619bb",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c0c11123-d69b-0e06-69a5-04267ffd5d26",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c0c66aca-3a2a-f391-01cf-03df31ea7794",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c1c3585e-d839-80ff-51c3-3de8ca6bfd61",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c2bac94d-07df-2670-c669-d72b13d8d29f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c34e0dd8-b2ba-1998-d418-b0868844b0d7",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c3d35a2b-5ef1-63d7-f220-f89f522d8897",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c3e5bbe9-319e-73bb-7036-c547ceb51ad8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c40c1cbb-92ec-cf6d-2a06-08358d05582a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c447bddc-cd0a-bd6b-f46a-d2c822c16738",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c5b10ad6-d4d8-2d35-d924-db924be17994",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c5dfe431-73c7-546b-e03a-515dfe988f6a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c616d5a0-20bb-e3ba-9ab5-43570a2718a8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c821a872-624f-0044-69a9-3c6208f413d6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c84e3892-d96e-1de0-0d68-05ec16205f3e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c95e3006-8dfb-c213-b2da-d46a6955ddf6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c96e0f19-d3a7-3a3d-6926-d69946eb2de6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c9bc3709-4cb0-6c4d-088d-3ae66f74aa06",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cab3646c-724a-e8d9-9ae4-d423914c8482",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cbbdf8b2-2491-2228-b0ec-cf1bfe6ec52c",
+                    "upstreamFields": [
+                        {
+                            "name": "Overdue",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        },
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cbfb76b9-d958-bf73-91d5-2abe9f57ec6a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cdb98a84-b6b5-d630-b929-871bb56f4054",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cf2aa6cd-3c9c-69ff-819e-53a8d720e7a0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d0f3198a-9ead-4d49-e911-0da4f2ff89e5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d1b741a8-6514-9d72-764c-f16ae538e2c8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d3570da1-02ed-806a-19f6-36d4d7c5d3ae",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d36671a9-e069-e42b-37dd-deac9e6c84f1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d3ab05cd-fcb7-c5cf-a63b-f8caf9417dab",
+                    "upstreamFields": null,
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d4311978-3ead-9d0a-df44-3b46b0ba9575",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d4567175-b4df-d6b5-f68c-6ea7fbd2445c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d55a7e9d-f059-e5eb-e9ec-eb98d97e7097",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d5881216-e42f-c1a0-b255-c08dbc7c0092",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d66ae755-c173-7e1d-3a7d-9a3c0cffe05c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d6712752-0e66-2497-b404-16204fcaf0d0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d753ea95-e162-42f6-def6-6cfeaa7d7dd3",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d7be6a1a-1224-27b1-7b69-34e47dc9ce76",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d7e4cd8a-5110-0285-0a87-e54a29f5d4d4",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d8a0d4a8-a64b-b8f2-ae8c-154dce73618d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d9aedf00-942d-88dc-f69e-0a1e2a762459",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d9bc04ba-76e9-3602-d215-0056f1b0a7ce",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "da538d8c-c121-07e9-d6c7-922ca9c97c0a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "dbc0a381-fcad-8096-6ba1-b15d1288a290",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "dd65ef75-a294-91d9-69e7-fa0aaf00d283",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "df2d4778-d646-2106-e647-c6bbba843272",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "dfafbea8-91ed-d99d-9b33-c907310eebcd",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e00c27d8-4ffd-25a2-906e-edeebd37e49f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e1aca33d-7570-e580-ed64-fa5360f313cd",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e3068773-d950-e10b-a65b-b850ed70c6ca",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e452781c-07b5-05b5-bf67-540832d58064",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e4b1070f-09eb-7ec8-1658-1555a7db8550",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e64f9c26-5717-052e-a0fc-db41d5f8911e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e7578bfd-8620-bd9f-f6ee-934bae3c1d3a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e7c96d5a-dd68-4f96-310c-66b7fa3c4bab",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e8da99f0-8f5d-2614-7551-0490660dbed3",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e9134c81-82dd-4042-4444-57b4a47a72cc",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "eb38fd46-add4-2b2a-ea8b-8089a6ae5067",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ed845856-3909-fe72-2dd9-1a9404050bfa",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "edb7b2e8-c5a1-819a-b423-125134d0c557",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ee1f261c-bd68-a110-186a-da823d37b1c3",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ef6b51a9-6347-ed97-5baf-c6c53baa4751",
+                    "upstreamFields": [
+                        {
+                            "name": "Opened",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        },
+                        {
+                            "name": "Overdue",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        },
+                        {
+                            "name": "Active",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        },
+                        {
+                            "name": "Max Year?",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        },
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "06c3e060-8133-4b58-9b53-a0fced25e056"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f157463f-0e40-e589-c1fc-d85587fd89b8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f18c30e5-41c7-8c28-3ad6-9b3474b0810b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f1f56c79-6d45-31ae-663f-4e529ec1f3cf",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f38cfc69-e333-72d7-7bc5-e16957df3dec",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f3d4aefe-efef-0eef-f741-12b236720626",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f4555797-f26b-ec4c-1234-3c46a142fb30",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f628cef0-e94c-eada-07d1-36fb881b2a63",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f6f4e8a1-209b-7202-0e9b-907d87a994b5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f7a6d35d-6360-a237-86c3-57f11bbc7a2e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f7cb4ce9-1805-1a51-3363-b910e97117d8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f7f588fc-0c6d-aed3-9819-e3f9b9c926dd",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f852966b-add1-7857-3eb0-5b395f533b0d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f9bc6be4-b6e7-c03b-c43b-b8bdff7ef356",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "fdfa2354-b648-706a-2dc4-8bf2fac9bf15",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "fe164caf-ec76-8eab-9a65-8e910f130ed9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                }
+            ],
+            "pageInfo": {
+                "hasNextPage": false,
+                "endCursor": null
+            },
+            "totalCount": 8
+        }
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_a561c7beccd3_all.json b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_a561c7beccd3_all.json
new file mode 100644
index 00000000000000..561398df522c73
--- /dev/null
+++ b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_a561c7beccd3_all.json
@@ -0,0 +1,588 @@
+{
+    "data": {
+        "fieldsConnection": {
+            "nodes":  [
+                        {
+                            "id": "06922989-6ee4-81bb-79d4-f9f9faf17819",
+                            "upstreamFields": [
+                                {
+                                    "name": "Delivered Email",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                },
+                                {
+                                    "name": "Sent Email",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "0e1a7126-7f89-6bcd-d3ac-bc7a36dbe206",
+                            "upstreamFields": [],
+                            "upstreamColumns": [
+                                {
+                                    "name": "id",
+                                    "table": {
+                                        "__typename": "DatabaseTable",
+                                        "id": "82c42950-210b-ba3f-b2e9-53240474a8fd"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "0e9630ee-e141-bff1-d33b-f3ea9241d4b9",
+                            "upstreamFields": [],
+                            "upstreamColumns": [
+                                {
+                                    "name": "Platform",
+                                    "table": {
+                                        "__typename": "DatabaseTable",
+                                        "id": "38f106d0-5219-2663-2647-bbbf5fca3866"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "0fe12d2b-ad7c-3862-dbed-6cf000ada134",
+                            "upstreamFields": [],
+                            "upstreamColumns": [
+                                {
+                                    "name": "updatedAt",
+                                    "table": {
+                                        "__typename": "DatabaseTable",
+                                        "id": "82c42950-210b-ba3f-b2e9-53240474a8fd"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "18b72ab1-374b-9740-47f4-57de5a14043a",
+                            "upstreamFields": [],
+                            "upstreamColumns": [
+                                {
+                                    "name": "programName",
+                                    "table": {
+                                        "__typename": "DatabaseTable",
+                                        "id": "82c42950-210b-ba3f-b2e9-53240474a8fd"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "1e38aa00-9f8c-e489-0024-2e5d3ab8a9b7",
+                            "upstreamFields": [],
+                            "upstreamColumns": [
+                                {
+                                    "name": "Mailing_ID",
+                                    "table": {
+                                        "__typename": "DatabaseTable",
+                                        "id": "1704c7c3-4bb9-e6c6-6ea0-23f76e7560db"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "1e9d01cd-e6e0-91e8-bd07-3690017cf233",
+                             "upstreamFields": [],
+                            "upstreamColumns": [
+                                {
+                                    "name": "Campaign_ID",
+                                    "table": {
+                                        "__typename": "DatabaseTable",
+                                        "id": "1704c7c3-4bb9-e6c6-6ea0-23f76e7560db"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "1fada5ed-ca53-8478-40cf-820309ca45ed",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "2026c0f6-96e1-4a84-9555-b80926aaed36",
+                            "upstreamFields": [],
+                            "upstreamColumns": [
+                                {
+                                    "name": "Campaign_Run_ID",
+                                    "table": {
+                                        "__typename": "DatabaseTable",
+                                        "id": "1704c7c3-4bb9-e6c6-6ea0-23f76e7560db"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "21493acc-8046-5cf8-fcb1-e3ab328bf7b4",
+                            "upstreamFields": [],
+                            "upstreamColumns": [
+                                {
+                                    "name": "User_Agent",
+                                    "table": {
+                                        "__typename": "DatabaseTable",
+                                        "id": "38f106d0-5219-2663-2647-bbbf5fca3866"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "26c360a8-b8fc-efb8-85f0-107d2d63913a",
+                            "upstreamFields": [],
+                            "upstreamColumns": [
+                                {
+                                    "name": "Choice_Number",
+                                    "table": {
+                                        "__typename": "DatabaseTable",
+                                        "id": "1704c7c3-4bb9-e6c6-6ea0-23f76e7560db"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "26c37c0a-c970-3a28-c375-fd6c54113a3e",
+                            "upstreamFields": [],
+                            "upstreamColumns": [
+                                {
+                                    "name": "Campaign_ID",
+                                    "table": {
+                                        "__typename": "DatabaseTable",
+                                        "id": "1704c7c3-4bb9-e6c6-6ea0-23f76e7560db"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "xxxdc8ee-30e5-644b-cf76-48a3dea79cda",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "277dc8ee-30e5-644b-cf76-48a3dea79cda",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "292ebda7-49ee-589f-b8ba-6d44443158ea",
+                            "upstreamFields": [],
+                            "upstreamColumns": [
+                                {
+                                    "name": "Has_Predictive",
+                                    "table": {
+                                        "__typename": "DatabaseTable",
+                                        "id": "1704c7c3-4bb9-e6c6-6ea0-23f76e7560db"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "299d8cdf-75ed-5dff-1e97-f11f7023cd2a",
+                            "upstreamFields": [],
+                            "upstreamColumns": [
+                                {
+                                    "name": "Campaign_ID",
+                                    "table": {
+                                        "__typename": "DatabaseTable",
+                                        "id": "38f106d0-5219-2663-2647-bbbf5fca3866"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "337cbc32-3695-427f-57a8-945a9d66cb46",
+                            "upstreamFields": [],
+                            "upstreamColumns": [
+                                {
+                                    "name": "Activity_Date",
+                                    "table": {
+                                        "__typename": "DatabaseTable",
+                                        "id": "38f106d0-5219-2663-2647-bbbf5fca3866"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "33c19e7e-c7a8-17ce-b1c5-03075d81e718",
+                            "aggregation": null,
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "3b3f6466-37a8-de90-a113-d7fc889de010",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "3bd91e15-44e4-bfa9-c495-e64a481c6a99",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "3c6caacf-8292-4a0e-a569-f01a50c48fde",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "42bf8d99-1c09-1ffa-14b8-f99f20940b4d",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "43a93841-c04b-8a60-57b5-82de870cc156",
+                            "upstreamFields": [
+                                {
+                                    "name": "Delivered Email",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                },
+                                {
+                                    "name": "Clickthrough Emails",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "497f7a5a-7c57-2073-4b2e-a780ed0777f3",
+                            "upstreamFields": [
+                                {
+                                    "name": "Delivered Email",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                },
+                                {
+                                    "name": "Opened Email",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "4d2e3b25-336d-e842-ac42-f947f6e65eb3",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "4dd95bc1-8c08-92e5-09ae-cac7d0736c38",
+                            "upstreamFields": [
+                                {
+                                    "name": "Id",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "4ea37317-863a-b8f7-3451-2ff1dcd43d5c",
+                            "upstreamFields": [
+                                {
+                                    "name": "Activity",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                },
+                                {
+                                    "name": "Email Delivered",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "51b4731a-f7ef-70ec-2db0-b39182d54542",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "53de4a7f-9930-b05f-ead3-6d628495c5bd",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "58d3a137-aada-cb54-0782-c3f8cf0c30bb",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "5ca9f540-c492-7e3b-744b-a78a5a977719",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "5cf0d0ab-fc2d-a46a-b9ad-5128b441158c",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "5d21c9b0-ac28-8d20-4307-9c342c0f238d",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "5f513df7-b73b-2d6b-6b67-74a50e3f1e56",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "602064a0-c2db-e057-6b72-ff40f5e6ffdf",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "64f96cfa-91d2-55b7-62ea-ca05175a7a1b",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "66d4994a-6a37-e8cb-1ced-37926f73b765",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "67d4ac88-0fab-6f51-edd2-9e3cd6f681e8",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "716fddff-5012-3c14-8105-be4625a0c02d",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "722ecf66-c49b-5ad2-bc88-cd59b26d6fab",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "7693149f-424a-371b-0b7a-723a80ef12ef",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "7bc8c737-3ca5-956e-c23f-0fb878748b5e",
+                            "upstreamFields": [
+                                {
+                                    "name": "Activity",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                },
+                                {
+                                    "name": "Click Email",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "7c875ed5-6106-1eec-4a1e-103673cde0ef",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "7fd1eac6-cf7f-2480-6e91-05a31d47aa5b",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "856fd651-a544-2429-4bf8-bc4c8eee3046",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "86c8aef9-f3af-3a82-49a8-453b3fc69057",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "8711ae44-5b7c-b5c4-0c63-9bbb6f8d55d3",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "8b9b1f51-9485-afcf-b323-ba3cb8953183",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "8c4140cf-c6cc-b43d-9621-3ffa8d3dae26",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "908fa927-f78d-0314-4fa4-88307c21e73c",
+                            "upstreamFields": [
+                                {
+                                    "name": "Clickthrough Emails",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                },
+                                {
+                                    "name": "Opened Email",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "91a0b832-5abf-95df-e292-be9e58e91404",
+                            "upstreamFields": [
+                                {
+                                    "name": "Activity",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                },
+                                {
+                                    "name": "Open Email",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "9720c532-6085-7d96-82ff-f30b14ca391e",
+                            "upstreamFields": []
+                        },
+                        {
+                            "__typename": "ColumnField",
+                            "id": "984bcf14-8a6b-2579-51ae-816d5db9821a",
+                            "name": "Lead ID",
+                            "description": null,
+                            "isHidden": false,
+                            "folderName": null,
+                            "dataCategory": "ORDINAL",
+                            "role": "DIMENSION",
+                            "dataType": "INTEGER",
+                            "defaultFormat": null,
+                            "aggregation": null,
+                            "upstreamFields": []
+                        },
+                        {
+                            "__typename": "ColumnField",
+                            "id": "9af0b32d-9e82-419e-c522-c4ac4a0e40d0",
+                            "name": "Campaign Run ID (Activity - Open Email)",
+                            "description": null,
+                            "isHidden": false,
+                            "folderName": null,
+                            "dataCategory": "ORDINAL",
+                            "role": "DIMENSION",
+                            "dataType": "INTEGER",
+                            "defaultFormat": null,
+                            "aggregation": null,
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "a4d2164a-2ef5-4d76-62e1-468bb135b4c2",
+                            "upstreamFields": [
+                                {
+                                    "name": "Opened Email",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                },
+                                {
+                                    "name": "Clickthrough Emails",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "a68a43a9-03f4-bad3-74f1-7ce668c536bc",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "a8fbfef2-2ffd-77a9-0f63-a1d5e6944f24",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "abf83860-1adf-8a92-a4ea-9ce9d3945ad7",
+                            "upstreamFields": [
+                                {
+                                    "name": "Delivered Email",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                },
+                                {
+                                    "name": "Clickthrough Emails",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "acd62e88-e4e9-e0e5-bd00-da2d20e74dd1",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "ae7d7692-b175-447a-a74b-c4f85f236be8",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "af24ee3e-18ae-b2d0-7371-9dd596145f38",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "b143e310-f7e1-7f49-82f5-141ae733c043",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "b4bf1bbe-a8b8-b363-e4fd-0b8cd82871a1",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "b6b7479a-ce63-9308-d0e3-70d8af828f36",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "be574861-0e55-a0be-1143-2e10ea611e9f",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "bfcf48dd-e42a-8693-72c2-9b84efc53172",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "c4998733-5988-3cb6-444c-674059fddfd9",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "e84f0fe4-882b-772f-a8c4-4ea89b97bff3",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "e915db4c-d33b-9f5d-a5bd-6022ae85118d",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "eb18ef87-d48d-fefa-1fd7-98834a304ece",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "f06b3901-4f28-acd5-a724-9a3b18198528",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "f509397e-7e11-4f86-4ae8-2e861df69d46",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "f6dffbe7-aa6f-5acb-25a7-fdf0bf3ab507",
+                            "upstreamFields": [
+                                {
+                                    "name": "Sent Email",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                },
+                                {
+                                    "name": "Delivered Email",
+                                    "datasource": {
+                                        "id": "801c95e3-b07e-7bfe-3789-a561c7beccd3"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "id": "fe556978-d213-2f6c-2950-ec6ce30a63b1",
+                            "upstreamFields": []
+                        },
+                        {
+                            "id": "ffd5c589-6741-450b-bbe6-b21f6a31670e",
+                            "upstreamFields": []
+                        }
+                    ],
+            "pageInfo": {
+                "hasNextPage": false,
+                "endCursor": null
+            },
+            "totalCount": 8
+        }
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_bda46be068e3_all.json b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_bda46be068e3_all.json
new file mode 100644
index 00000000000000..08a46ad2ab7910
--- /dev/null
+++ b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_bda46be068e3_all.json
@@ -0,0 +1,39 @@
+{
+    "data": {
+        "fieldsConnection": {
+            "nodes": [
+                {
+                    "id": "55a70afe-3e54-492d-80c8-744601ae78cc",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "id",
+                            "table": {
+                                "__typename": "CustomSQLTable",
+                                "id": "c7dd65fb-6e7e-4091-bbde-8c78b34a40f8"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "id": "636b9454-8786-4773-b94b-8e8f2db7e1a3",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "name",
+                            "table": {
+                                "__typename": "CustomSQLTable",
+                                "id": "c7dd65fb-6e7e-4091-bbde-8c78b34a40f8"
+                            }
+                        }
+                    ]
+                }
+            ],
+            "pageInfo": {
+                "hasNextPage": false,
+                "endCursor": null
+            },
+            "totalCount": 8
+        }
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_c651da2f6ad8_all.json b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_c651da2f6ad8_all.json
new file mode 100644
index 00000000000000..64aa04a6056b3d
--- /dev/null
+++ b/metadata-ingestion/tests/integration/tableau/setup/embeddedDatasourcesFieldUpstream_c651da2f6ad8_all.json
@@ -0,0 +1,1246 @@
+{
+    "data": {
+        "fieldsConnection": {
+            "nodes": [
+                {
+                    "id": "00ec352d-e443-5ba2-c389-c2265d6166c2",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "02c33011-048b-1afe-fd20-783e5c3c57a9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "02c7edfc-f259-6a56-c229-ce6467a3ebe1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "042d4a79-fc1f-4e33-f87d-bc06e3272d36",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "04fa52d7-3481-c524-7de1-1e73a2620f3a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "05db0bae-0d20-bbf9-b5c4-4a2272ffb839",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "06372073-9eee-a7a0-280e-772b0545be7d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "071f5c53-eb36-7ac6-a9b0-a13ca4987175",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0746f3ae-e85a-78cf-1b29-4bc3b97e323b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0a1dbe03-c079-6fe9-7411-fd600af432ae",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0bc80520-3393-c8ae-3afb-37d0b52b8cf9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0bea60c0-2c3f-0113-4030-b914da11166d",
+                    "upstreamFields": null,
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0c29691d-07aa-e454-e5e1-ae074a812e40",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0eb84a88-4d6a-ebf5-a959-b67091ea6c1e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0fa74f05-78a2-2b3e-e3d3-2028f7988a08",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "10321d43-f20c-d562-b821-77f761ae5cc5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1094b642-9e96-4285-89a3-d85b59e557bc",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "10b2216d-6d19-984d-e60f-11d2751f9ec5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "113364a6-2476-07a2-e25d-81bc137daf4d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "116efdf5-d57d-a3f8-6fb5-334d6fbdab87",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "11be7d6b-d6dd-27ac-2975-00c2bd0ff051",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "12e4157c-3d2c-4e4e-373b-b204dad0ee61",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "17a9f961-0d61-c619-0959-bf4a2415fe4d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "17efeb93-035c-5671-2d6e-eb7256fdc1aa",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1aa6af8e-0f29-d3bf-b81b-35b214d1e59d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1af25d71-cdea-286d-4bac-402a54342d5c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1c558792-0edc-0e33-4077-4ce995aa27ff",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1cbdb3ed-aec2-9f14-b5b2-eb3c83f49cd9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1d2f0e36-1814-07e0-506e-4f52682c58c5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1d416d43-d670-315f-6a16-ae861d4f1ac2",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1e0edf18-0901-532a-5451-fa2314e0859b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1f0b8af8-dd21-5086-e32a-493255b339a0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1fc74be7-19ba-f42b-1e8d-86447923b8a7",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1ffef80b-0b82-08eb-dffb-16d5937421f2",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "214d0ca1-26b3-ff80-68b5-1af3fbbac2ce",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "23e9b73f-e1cf-cc40-7638-8deaa10c77fa",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "24561cc7-2db6-e582-605b-5a796c76b867",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "24603cc5-425e-8a46-ae3a-2d460df840fe",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2484715d-12f8-a016-af12-5612bfedc91e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "27d23241-d9ef-957b-9e98-d58bda254438",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2878a8b5-4306-f844-ef5a-4029eefdf22f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2992ae70-4a49-98e4-f2de-cbc4a8b7a7db",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2a948342-1daf-ac2f-33d3-329e2ca25e34",
+                    "upstreamFields": [
+                        {
+                            "name": "Overdue",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        },
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2ab7f5aa-15ba-de8e-214a-4e0a27ee91fe",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2c95cb81-36f6-443f-6c99-ff001d2388f3",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2e2db482-1927-ba36-a782-8a95c01fdc7e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2f83f6ff-ffdc-07b0-40d8-cb7351c02b66",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2faad672-a1ff-95d1-67c9-2fd6bda9e8b9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "30bfdf30-6abc-a741-8563-c8a456e8f478",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "311d5263-73af-4578-0d62-f4b2f00396a7",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "31c3f642-db9d-3d0c-4497-c61859e1f8b9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "339bd914-66f7-c3c9-e7a7-c45f25cb335a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3423b49b-03bb-6d3a-12c8-4e11778931e1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "34aac98d-e7a5-135b-622f-e6d35d84fae9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "35637b98-c1c1-1200-8815-f1a4c6a13afd",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "36fe7de3-5e0d-83e7-e08c-1c6f299552e1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "37daa6c3-f37b-94d7-f59d-116cef3f3444",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "38645dd2-5f4d-effc-a564-0054ba2e634b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3ac8f5aa-1260-dabf-c762-3ba52fdfc2c0",
+                    "upstreamFields": [
+                        {
+                            "name": "Opened",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        },
+                        {
+                            "name": "Overdue",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        },
+                        {
+                            "name": "Max Year?",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        },
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3ad5f4e6-35be-0037-0e88-3da0136c081b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3ddaea33-73a5-7781-aee0-3f343dce3efd",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "42d00b7c-9983-8883-6b40-bdb2f47f1c35",
+                    "upstreamFields": null,
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4448d754-db6b-6d41-1f80-f8d80ebd0664",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "45d50e09-2ec6-76b3-f2bf-80836f7e49e6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "45dd64b3-2fc5-7c5a-2ef8-684284efdeec",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "47c8a373-e098-0537-e220-013ae1b26dc7",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "49a13936-1856-4a32-197f-13ed80b3ece5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4cb02fc2-cb2c-045f-994c-6c54d21626a5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4e844797-cf85-8239-dbac-4257822b3408",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4e9c3619-b42e-0452-dcaa-b5406e038c85",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4eae18fd-b114-7cf2-b8b6-31af6cea0b55",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "4f45c3ad-fc3b-afeb-6e9d-fb94b42051a9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "50879b60-d080-240f-2439-d15c4ca23cf0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "517cd761-a193-d8c1-c3db-93890bc7d27a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "53342557-60b2-51ea-a730-f38ad3dab715",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "536bc9ae-0f4b-5786-0b0d-691d8bc2b9e5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "54dfc86a-52b7-52b3-3af9-f18e070e56c8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5579f16c-8c12-36be-3ff8-1a4bc270f570",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5668180e-c0cd-dbde-661a-ff1fc6e93385",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "59214da6-732d-5691-5bb8-a81b4132fdd4",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5ae6724e-3a1d-a43c-9421-294f3f1bfb6c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5b478590-b0a9-c34c-faa2-2b7c7a61822f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5d54747d-81ac-f0fc-6320-2bc8b4ea592b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5dbafcd1-d8d2-68cc-fde3-20e8c7b26ff8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5e9aec72-f27e-7dce-fdb7-6b2d418ad785",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "606cc5eb-28b6-6b2e-9ec9-b4d2441323db",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "60bd0e06-5086-d8dc-a6e5-eff080d6a56d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "60c104d7-6b2c-1132-8a7b-28c1a05c2654",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "61eb7e5a-5931-0486-1e98-5e17ec92ed9c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "63090441-e641-21ba-66ae-a0ea3d83344c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "636235a9-4709-04e1-eef2-67ac7c194eb4",
+                    "upstreamFields": [
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        },
+                        {
+                            "name": "Active",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        },
+                        {
+                            "name": "Closed",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        },
+                        {
+                            "name": "Due date",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "66ac12ab-7cba-79fd-b013-72043161beea",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "66d18cb0-c3f0-ad8a-e15a-89563da02834",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "679172d5-d043-c8ff-d115-ef200d11ca72",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7029eb80-9d5f-b12e-40a4-adc7c9968daa",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7063be4c-713b-5d6c-25aa-ad98c5a8f7e9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "724a16a7-49a8-57bd-9ec6-fb5c777d83cf",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "72dc19f7-e551-1b35-ff53-b2bccbfa6bb9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "732bfc50-930a-7ac3-c088-680bad52bff0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "73c00bbc-f7a8-76da-a0bd-bb210b4929b8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "76723c78-1bea-73eb-80ad-1c6c2ff17a87",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "782ebad0-c62f-cbc8-0c22-5904aa50585b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "784b08a1-eb8c-d675-36b3-b316492e5b16",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "79767234-b173-544a-063d-821baa6a5df9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "79fad0d4-12c2-078d-c105-1ab1024e5b21",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7cc56151-90e8-98bb-4354-a514208bff4a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7eacd068-7e19-3dbc-dce0-d5089d3c35b8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7ecb2d1d-4dd0-e49b-c5d2-407bc5a7b08e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "81d9a76b-9a30-a2cc-3078-64c2bfc4f4b0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "837bda98-50c2-164b-665b-ba6e3a02ace3",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "85f313bb-fe2b-5ad7-0cdf-78a64a71fa27",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "86aa92af-853b-4d4e-35b0-21c6424e1735",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "86b35d25-952f-0881-7e62-a812a6e421ae",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "86b677e8-2841-1b59-d1b0-066d16d345c7",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8a14e383-ee8e-4493-bfcd-a7238d11edf4",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8aef8cdb-0381-40e2-4efc-bb6a67c45652",
+                    "upstreamFields": [
+                        {
+                            "name": "Closed",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        },
+                        {
+                            "name": "Opened",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8b69c38c-8297-fb16-1e56-796f67864f60",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8be77673-bc23-ffc3-1958-21856a6d42bf",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8c6b7c63-54a0-46d3-8037-f2de8fa1d476",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8cc2a71d-49c7-fb56-f8f1-f4df94f83aa0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8de5c9d3-0c25-4ff6-1a84-0394bc36c57b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8df59f46-4e3b-aa77-0c74-35c93f844e75",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8e8947fd-7108-d528-44db-7657a1fb480c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8ed7ee55-acb7-9064-da1c-80a20e706464",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "91f45936-daa1-6194-4fa8-1e135b053dd1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "93acf969-1638-980a-5c93-ac1c754d2831",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "941fbf6f-40e4-bfe8-d2ff-b016032ec6dd",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "965d754d-0bc7-06e4-1208-d146de93d6a1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9736203a-fc31-b052-3fc5-abf1afe22f18",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "984069c9-5366-622a-98bf-60c4ca3e0ff5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9a8a1e52-ae97-aee0-c2c9-a4ddf69b5ffc",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9b35c0be-0f76-63a1-445d-9872a1465154",
+                    "upstreamFields": [
+                        {
+                            "name": "Opened",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        },
+                        {
+                            "name": "Overdue",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        },
+                        {
+                            "name": "Active",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        },
+                        {
+                            "name": "Max Year?",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        },
+                        {
+                            "name": "Number",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9d228629-7bd0-42df-3b44-b7900f4c1e48",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "9f81f19e-ce84-459e-ab09-b8e4e6677e98",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a0e000ab-dd73-f572-6a91-4ea2e1d2767d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a0f25adf-7399-e938-d5b2-96cec332c78d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a15c1a3a-4cce-f29b-22d7-3044c66da9e1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a17240cd-70c6-f680-007d-25e83f020daf",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a1a22d48-f456-97d0-c098-5fd70f09ff7f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a2bc54e9-6160-2cb6-d61e-4453051220d8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a3702e1d-995f-0cac-3577-7f3500927ed4",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a39e5386-f37e-8d1e-3e74-fc8857d5c08d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a3b1db00-20da-f6c3-85be-8b769d06db6c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a3cfeec0-84f3-6fda-f043-2a6da9598453",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a4cee743-4ff1-c3fc-e305-47ffa6ea9b4f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a788bc5b-010e-00c8-ef97-c112af3343af",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a7e61b7f-2247-0b9c-7da9-39297faadd8e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a93c6637-d961-ae0b-598e-fa8da75e62c2",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ac4e3607-473b-f643-6d23-8cf0c69c7530",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ad2cbb7c-aaad-12d3-36ef-179ff1cfa1ff",
+                    "upstreamFields": [
+                        {
+                            "name": "Opened",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "af59ec99-214e-e0df-22e2-901b24a2624c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b14c7e6b-bd65-5b11-a6a8-5b267a7b1260",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b22db38f-740d-2d76-b929-370248345099",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b28fcdc2-bcd6-42aa-4e64-f2b4b176324d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b30f2384-7e6f-f13e-f57b-f810985e7cd9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b31e32f3-3e3d-01f1-a54c-453aa77a3297",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b73460b5-51fe-5c8f-61b0-7e9da12244fa",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b880aec8-de45-999b-d664-588f4856c472",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "baa349ea-198a-29da-9dae-f10f31a12cad",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "bb459069-04ab-3bd8-a9ed-dc5573834a34",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "bd513be6-26ba-b62a-74bc-adab1fb6488c",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "bdd48dd3-e4e3-ef05-b63f-e2a6fbff3fd1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "bfb0ac8a-31a2-7024-45f3-49996be2df88",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c199dd42-7e3d-ee43-7497-5c878129a3aa",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c204f108-6aaa-1157-6649-c1e68bf42ad3",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c4f111b2-0b44-14c8-46ad-a2d5ffa99c39",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c5d5443a-e3d4-b1d5-484f-326d66905887",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c79ce6cd-b9dd-6734-e452-aeaca19e82bd",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c8cfca57-a823-37a7-4414-6d0b682a8024",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c958daf4-da7c-229e-390c-f1d81c6dde2a",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c988934d-d4a5-3b7c-83e8-b383a8f8419b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c9beabbf-d9d4-56a1-09d1-a8a0be3078cc",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ca51fe9b-f1e4-f6f9-ee9e-2961a3fd0ac9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ca52cc66-4c1b-83ea-41b1-bc14348096b8",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cb8052a6-0871-69b3-b212-62b7c74bf205",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cbd71d39-25b7-3854-6fac-6fa834cce1ee",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cbfef2b1-a95c-02e9-4c5e-c162e84d7341",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cd1619c4-dd7a-fa47-e171-78e7ddb57879",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cd5bb434-957d-79da-2438-89161a10c0f6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cf6943b4-a34c-1fcd-f032-a09219619d29",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cf931c80-aa6a-9a08-26f2-f0bf383fa918",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d2678e95-9a3b-ae61-a30e-a4fc3ce9985d",
+                    "upstreamFields": [
+                        {
+                            "name": "Opened",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d2753f51-27e6-bd3c-d86f-c1ac5056f743",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d3a25e7f-4a67-7985-0fad-5325a221613d",
+                    "upstreamFields": null,
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d451fb73-04ee-6e91-2b5e-7a619ec49318",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d487e44d-11ff-6c48-9c12-9a94f368e2e4",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d5384062-e552-923e-a612-ca291854b4ca",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d5e37fc7-6a27-f00d-492b-5a04b3aa853e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d5f83f0b-2b83-3723-f0f2-210beaf4ebc9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "da02b984-48fa-76e6-061c-b1462813432b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "da62c9c2-0ca6-a8ab-e518-3fe3959983ba",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "db0bf429-31ae-7a84-7016-343e9631f0cb",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "dc36513d-648a-03f4-6983-d60b911212ea",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "dfcd0d64-ca18-e181-bd07-a2a2528ea65b",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e0e4e50f-5bbc-9b6c-b61c-18c3bead6985",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e107947e-cc43-8d74-bef5-1219b6f26acc",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e2d64ef4-51dd-351b-1a41-34c331438b03",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e2f0512c-5ae3-b551-c540-7f7e9d4e2891",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e3fbc2ec-3c5f-fd89-fee7-a7018f62b8f9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "e8f1f323-2a8a-9f76-a6f1-1b9475149bbb",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "eb75ad3f-7e12-c6b7-816f-f0cc036587d0",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ebd98cba-b969-ab25-a1ec-f9e699259ea5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ed27d249-10e9-e6ab-7d4d-2b804e8c1969",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f1e27f80-b699-f683-cf3b-0ebc53d0dfe2",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f26d57ca-a698-b5e8-b254-65cf3de14a98",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f3298925-2b95-aa53-b2aa-f83feee7a83f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f49bdb6d-26a4-56c1-319c-ecdff5632164",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f59d94c1-f580-0384-8272-ac4be3edd163",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f5f1f0a8-580d-c862-bad4-f0e50aa3f8bc",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f6a05d7e-6f18-f9c7-a424-3f1742a16167",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f92f9515-c6c9-e857-438f-3f4103e34c09",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f97631bf-8375-1560-7883-278f9d6b53fc",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f97fd94e-f5d6-8f68-457b-dfacd40fd7f9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "fba5a588-b3aa-6033-e01c-0bcd4554f3f1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "fbd3c962-218c-de6d-a11c-da9e2e249f16",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "fc35b28d-0112-dbd0-960e-8d1a6d3bf2be",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "fc7a1dae-abc6-8574-b17e-d996e4f57bb9",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "fc82ee6e-5518-0b99-5a3e-f11320190dc2",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "fd5c51a2-8000-9c11-f3f7-b3b8eae0b50e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ff51c0e0-4b09-ab90-9dca-6b7c9de8f135",
+                    "upstreamFields": [
+                        {
+                            "name": "Time to Close an Incident (seconds)",
+                            "datasource": {
+                                "id": "dfe2c02a-54b7-f7a2-39fc-c651da2f6ad8"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "ff85fc4f-2886-a45a-1e12-e5f0aa87abd2",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                }
+            ],
+            "pageInfo": {
+                "hasNextPage": false,
+                "endCursor": null
+            },
+            "totalCount": 8
+        }
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/tableau/setup/publishedDatasourcesConnection_all.json b/metadata-ingestion/tests/integration/tableau/setup/publishedDatasourcesConnection_all.json
index 93ce61e6d4fa4e..4f7812466439b8 100644
--- a/metadata-ingestion/tests/integration/tableau/setup/publishedDatasourcesConnection_all.json
+++ b/metadata-ingestion/tests/integration/tableau/setup/publishedDatasourcesConnection_all.json
@@ -5,7 +5,7 @@
                 {
                     "__typename": "PublishedDatasource",
                     "id": "00cce29f-b561-bb41-3557-8e19660bb5dd",
-                    "luid":"ffd72f16-004a-4a7d-8f5b-a8fd18d4317d",
+                    "luid": "ffd72f16-004a-4a7d-8f5b-a8fd18d4317d",
                     "name": "test publish datasource",
                     "hasExtracts": false,
                     "extractLastRefreshTime": null,
@@ -40,7 +40,7 @@
                             "fullName": "customer",
                             "connectionType": "postgres",
                             "description": "",
-                             "columnsConnection": {
+                            "columnsConnection": {
                                 "totalCount": 0
                             }
                         },
@@ -79,17 +79,7 @@
                             "role": "DIMENSION",
                             "dataType": "DATETIME",
                             "defaultFormat": null,
-                            "aggregation": "Year",
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "payment_date",
-                                    "table": {
-                                        "__typename": "CustomSQLTable",
-                                        "id": "4fb670d5-3e19-9656-e684-74aa9729cf18"
-                                    }
-                                }
-                            ]
+                            "aggregation": "Year"
                         },
                         {
                             "__typename": "ColumnField",
@@ -102,17 +92,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": "Count",
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "staff_first_name",
-                                    "table": {
-                                        "__typename": "CustomSQLTable",
-                                        "id": "4fb670d5-3e19-9656-e684-74aa9729cf18"
-                                    }
-                                }
-                            ]
+                            "aggregation": "Count"
                         },
                         {
                             "__typename": "ColumnField",
@@ -125,17 +105,7 @@
                             "role": "MEASURE",
                             "dataType": "INTEGER",
                             "defaultFormat": null,
-                            "aggregation": "Sum",
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "customer_id",
-                                    "table": {
-                                        "__typename": "CustomSQLTable",
-                                        "id": "4fb670d5-3e19-9656-e684-74aa9729cf18"
-                                    }
-                                }
-                            ]
+                            "aggregation": "Sum"
                         },
                         {
                             "__typename": "ColumnField",
@@ -148,17 +118,7 @@
                             "role": "MEASURE",
                             "dataType": "REAL",
                             "defaultFormat": null,
-                            "aggregation": "Sum",
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "amount",
-                                    "table": {
-                                        "__typename": "CustomSQLTable",
-                                        "id": "4fb670d5-3e19-9656-e684-74aa9729cf18"
-                                    }
-                                }
-                            ]
+                            "aggregation": "Sum"
                         },
                         {
                             "__typename": "ColumnField",
@@ -171,8 +131,7 @@
                             "role": "MEASURE",
                             "dataType": "TABLE",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -185,17 +144,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": "Count",
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "customer_last_name",
-                                    "table": {
-                                        "__typename": "CustomSQLTable",
-                                        "id": "4fb670d5-3e19-9656-e684-74aa9729cf18"
-                                    }
-                                }
-                            ]
+                            "aggregation": "Count"
                         },
                         {
                             "__typename": "ColumnField",
@@ -208,17 +157,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": "Count",
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "customer_first_name",
-                                    "table": {
-                                        "__typename": "CustomSQLTable",
-                                        "id": "4fb670d5-3e19-9656-e684-74aa9729cf18"
-                                    }
-                                }
-                            ]
+                            "aggregation": "Count"
                         },
                         {
                             "__typename": "ColumnField",
@@ -231,17 +170,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": "Count",
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "staff_last_name",
-                                    "table": {
-                                        "__typename": "CustomSQLTable",
-                                        "id": "4fb670d5-3e19-9656-e684-74aa9729cf18"
-                                    }
-                                }
-                            ]
+                            "aggregation": "Count"
                         }
                     ],
                     "upstreamDatasources": [],
@@ -295,7 +224,7 @@
                             "fullName": "[People$]",
                             "connectionType": "excel-direct",
                             "description": "",
-                             "columnsConnection": {
+                            "columnsConnection": {
                                 "totalCount": 2
                             }
                         },
@@ -309,7 +238,7 @@
                             "fullName": "[Returns$]",
                             "connectionType": "excel-direct",
                             "description": "",
-                             "columnsConnection": {
+                            "columnsConnection": {
                                 "totalCount": 2
                             }
                         },
@@ -323,9 +252,9 @@
                             "fullName": "[Orders$]",
                             "connectionType": "excel-direct",
                             "description": "",
-                             "columnsConnection": {
+                            "columnsConnection": {
                                 "totalCount": 21
-                            }                        
+                            }
                         }
                     ],
                     "fields": [
@@ -335,15 +264,7 @@
                             "name": "Top Customers by Profit",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Profit",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -356,8 +277,7 @@
                             "role": "MEASURE",
                             "dataType": "TABLE",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -370,17 +290,7 @@
                             "role": "DIMENSION",
                             "dataType": "STRING",
                             "defaultFormat": null,
-                            "aggregation": "Count",
-                            "upstreamFields": [],
-                            "upstreamColumns": [
-                                {
-                                    "name": "Segment",
-                                    "table": {
-                                        "__typename":"DatabaseTable",
-                                        "id": "b0e0c3eb-6e53-e0f5-ded1-478d5d9f7281"
-                                    }
-                                }
-                            ]
+                            "aggregation": "Count"
                         },
                         {
                             "__typename": "CalculatedField",
@@ -393,21 +303,7 @@
                             "dataType": "REAL",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "formula": "SUM([Profit])/SUM([Sales])",
-                            "upstreamFields": [
-                                {
-                                    "name": "Profit",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                },
-                                {
-                                    "name": "Sales",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "formula": "SUM([Profit])/SUM([Sales])"
                         },
                         {
                             "__typename": "ColumnField",
@@ -421,7 +317,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "name": "City",
@@ -443,7 +338,6 @@
                             "dataType": "REAL",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "name": "Profit",
@@ -465,7 +359,6 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": "Sum",
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -484,7 +377,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": "Count",
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -503,7 +395,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": "Count",
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -522,7 +413,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -540,8 +430,7 @@
                             "role": "MEASURE",
                             "dataType": "TABLE",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -555,7 +444,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -568,15 +456,7 @@
                             "name": "Profit (bin)",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Profit",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -590,7 +470,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -609,7 +488,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": "Count",
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -628,7 +506,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": "Count",
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -647,7 +524,6 @@
                             "dataType": "INTEGER",
                             "defaultFormat": "*00000",
                             "aggregation": "Sum",
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -660,33 +536,7 @@
                             "name": "Product",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "Category",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                },
-                                {
-                                    "name": "Sub-Category",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                },
-                                {
-                                    "name": "Manufacturer",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                },
-                                {
-                                    "name": "Product Name",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -700,7 +550,6 @@
                             "dataType": "DATE",
                             "defaultFormat": null,
                             "aggregation": "Year",
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -713,39 +562,7 @@
                             "name": "Location",
                             "description": null,
                             "isHidden": false,
-                            "folderName": null,
-                            "upstreamFields": [
-                                {
-                                    "name": "City",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                },
-                                {
-                                    "name": "Postal Code",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                },
-                                {
-                                    "name": "Country/Region",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                },
-                                {
-                                    "name": "Region",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                },
-                                {
-                                    "name": "State",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "folderName": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -758,8 +575,7 @@
                             "role": "MEASURE",
                             "dataType": "TABLE",
                             "defaultFormat": null,
-                            "aggregation": null,
-                            "upstreamFields": []
+                            "aggregation": null
                         },
                         {
                             "__typename": "ColumnField",
@@ -773,7 +589,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -792,7 +607,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -811,7 +625,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -830,7 +643,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": "Count",
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -849,7 +661,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": "Count",
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -868,7 +679,6 @@
                             "dataType": "REAL",
                             "defaultFormat": null,
                             "aggregation": "Sum",
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -887,7 +697,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -906,7 +715,6 @@
                             "dataType": "INTEGER",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -921,15 +729,7 @@
                             "isHidden": false,
                             "folderName": null,
                             "role": "DIMENSION",
-                            "dataType": "STRING",
-                            "upstreamFields": [
-                                {
-                                    "name": "Sub-Category",
-                                    "datasource": {
-                                        "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
-                                    }
-                                }
-                            ]
+                            "dataType": "STRING"
                         },
                         {
                             "__typename": "ColumnField",
@@ -943,7 +743,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -962,7 +761,6 @@
                             "dataType": "REAL",
                             "defaultFormat": null,
                             "aggregation": "Sum",
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -981,7 +779,6 @@
                             "dataType": "DATE",
                             "defaultFormat": null,
                             "aggregation": "Year",
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
@@ -1000,7 +797,6 @@
                             "dataType": "STRING",
                             "defaultFormat": null,
                             "aggregation": null,
-                            "upstreamFields": [],
                             "columns": [
                                 {
                                     "table": {}
diff --git a/metadata-ingestion/tests/integration/tableau/setup/publishedDatasourcesFieldUpstream_17139d6e97ae_all.json b/metadata-ingestion/tests/integration/tableau/setup/publishedDatasourcesFieldUpstream_17139d6e97ae_all.json
new file mode 100644
index 00000000000000..8527f31560dea3
--- /dev/null
+++ b/metadata-ingestion/tests/integration/tableau/setup/publishedDatasourcesFieldUpstream_17139d6e97ae_all.json
@@ -0,0 +1,281 @@
+{
+    "data": {
+        "fieldsConnection": {
+            "nodes": [
+                {
+                    "id": "0749f75a-cc58-e1fd-ba66-d2d2b9dbe2cb",
+                    "upstreamFields": [
+                        {
+                            "name": "Profit",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0e2c4d41-12b9-fbd4-d4e0-463c165ecb29",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "0e75ad46-7474-6e02-6d1b-20781db40587",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "Segment",
+                            "table": {
+                                "__typename": "DatabaseTable",
+                                "id": "b0e0c3eb-6e53-e0f5-ded1-478d5d9f7281"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "id": "11242a9a-c161-754c-bdcc-fdc22bfce2b2",
+                    "upstreamFields": [
+                        {
+                            "name": "Profit",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        },
+                        {
+                            "name": "Sales",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "18f817fa-a4df-6dfe-98c0-ffdce9f6cdc5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1a63d0cd-0b37-3dea-b171-8893a9fb1417",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "1a6595e6-5eac-1f32-4d8b-dd0569b4e827",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "204a2d38-c144-f946-b426-ee66ef3eb492",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "2e0aa617-9d3d-15db-3597-17b8ccda2381",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "345f239e-1dd0-30fb-8ed4-103810a0b7cc",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "3cc344da-0d30-75a8-1364-a14a1a93350d",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "53ef59b0-7f59-55fb-ead0-4232a8be86d7",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "5b043b44-cbe5-fd3b-2022-7e14f400e11d",
+                    "upstreamFields": [
+                        {
+                            "name": "Profit",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "60dae0c9-0b36-ead5-977a-07dc049dbd57",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "695e65cb-0c30-fb94-0f09-2323fd88f0fa",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "6c1c7e77-731b-045d-69e9-af6c3c30ac99",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7ba23f14-240b-517d-bffc-e603d6874f29",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "7e40e9c2-8da8-d0c4-6a18-8fade009f33b",
+                    "upstreamFields": [
+                        {
+                            "name": "Category",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        },
+                        {
+                            "name": "Sub-Category",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        },
+                        {
+                            "name": "Manufacturer",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        },
+                        {
+                            "name": "Product Name",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "8c6d612c-ce53-29d5-3754-9508ca139d1f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a0900626-117b-25bb-104d-e7e4272f6e0a",
+                    "upstreamFields": [
+                        {
+                            "name": "City",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        },
+                        {
+                            "name": "Postal Code",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        },
+                        {
+                            "name": "Country/Region",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        },
+                        {
+                            "name": "Region",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        },
+                        {
+                            "name": "State",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "a443959b-f9a4-d0fb-4900-28eaa3a4b88e",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "aa1a9b8f-2fbc-53f4-2e6b-1f7257d28f74",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "acd7abc3-db70-a36f-6f75-2bf28eb6cff1",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b0011709-ba93-895c-6f49-0e3f5548c96f",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "c96df737-f0d7-5e5e-ac09-9149435647fa",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cc070953-68a0-ed87-82be-221c0d93f943",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cd6063c2-58b4-619a-4229-accea19f5189",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "cfcbc551-00d3-c773-3d68-5cafabc95b61",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d6e46283-01fe-cfd1-ee25-be4c9ea985c6",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "d96dc3eb-5bc7-6c7e-4fed-edffb1de00f2",
+                    "upstreamFields": [
+                        {
+                            "name": "Sub-Category",
+                            "datasource": {
+                                "id": "6cbbeeb2-9f3a-00f6-2342-17139d6e97ae"
+                            }
+                        }
+                    ],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "db0ddcfe-7c23-7031-f774-bfd1eb5dffa5",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f04ff107-5ddb-375d-c1d0-34e65406c841",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "f4c6a79d-05e4-b7ab-22a5-f667b7c708bb",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "fd261ef6-c698-900c-fe37-6694ba107367",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                }
+            ],
+            "pageInfo": {
+                "hasNextPage": false,
+                "endCursor": null
+            },
+            "totalCount": 8
+        }
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/tableau/setup/publishedDatasourcesFieldUpstream_8e19660bb5dd_all.json b/metadata-ingestion/tests/integration/tableau/setup/publishedDatasourcesFieldUpstream_8e19660bb5dd_all.json
new file mode 100644
index 00000000000000..14cca1e4ba49f3
--- /dev/null
+++ b/metadata-ingestion/tests/integration/tableau/setup/publishedDatasourcesFieldUpstream_8e19660bb5dd_all.json
@@ -0,0 +1,109 @@
+{
+    "data": {
+        "fieldsConnection": {
+            "nodes": [
+                {
+                    "id": "0fe30270-b1b9-9310-3c16-520b2a4824cb",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "payment_date",
+                            "table": {
+                                "__typename": "CustomSQLTable",
+                                "id": "4fb670d5-3e19-9656-e684-74aa9729cf18"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "id": "2b8a4156-7554-9ec1-a5ba-3316ab7d4ee2",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "staff_first_name",
+                            "table": {
+                                "__typename": "CustomSQLTable",
+                                "id": "4fb670d5-3e19-9656-e684-74aa9729cf18"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "id": "740b3cfe-ff17-c957-1e1b-f322d61f9b25",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "customer_id",
+                            "table": {
+                                "__typename": "CustomSQLTable",
+                                "id": "4fb670d5-3e19-9656-e684-74aa9729cf18"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "id": "9481e156-2775-f5fa-5aa3-be174224d4fb",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "amount",
+                            "table": {
+                                "__typename": "CustomSQLTable",
+                                "id": "4fb670d5-3e19-9656-e684-74aa9729cf18"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "id": "b2e77a9b-8961-0637-0907-940a5fcfb643",
+                    "upstreamFields": [],
+                    "upstreamColumns": []
+                },
+                {
+                    "id": "b950a9fd-ddb8-2a1d-ddbe-91000a3953e1",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "customer_last_name",
+                            "table": {
+                                "__typename": "CustomSQLTable",
+                                "id": "4fb670d5-3e19-9656-e684-74aa9729cf18"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "id": "ca23efe0-5a93-344a-3f69-ec777ee1b318",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "customer_first_name",
+                            "table": {
+                                "__typename": "CustomSQLTable",
+                                "id": "4fb670d5-3e19-9656-e684-74aa9729cf18"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "id": "cab66386-799c-d9b6-812b-d3931b626f3b",
+                    "upstreamFields": [],
+                    "upstreamColumns": [
+                        {
+                            "name": "staff_last_name",
+                            "table": {
+                                "__typename": "CustomSQLTable",
+                                "id": "4fb670d5-3e19-9656-e684-74aa9729cf18"
+                            }
+                        }
+                    ]
+                }
+            ],
+            "pageInfo": {
+                "hasNextPage": false,
+                "endCursor": null
+            },
+            "totalCount": 8
+        }
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py b/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py
index 0891a1e0cd5937..4be39f02757bad 100644
--- a/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py
+++ b/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py
@@ -20,13 +20,13 @@
 from datahub.configuration.source_common import DEFAULT_ENV
 from datahub.emitter.mce_builder import make_schema_field_urn
 from datahub.ingestion.run.pipeline import Pipeline, PipelineContext
-from datahub.ingestion.source.tableau import (
+from datahub.ingestion.source.tableau.tableau import (
     TableauConfig,
     TableauSiteSource,
     TableauSource,
     TableauSourceReport,
 )
-from datahub.ingestion.source.tableau_common import (
+from datahub.ingestion.source.tableau.tableau_common import (
     TableauLineageOverrides,
     TableauUpstreamReference,
 )
@@ -86,7 +86,7 @@ def enable_logging():
     logging.getLogger().setLevel(logging.DEBUG)
 
 
-def read_response(pytestconfig, file_name):
+def read_response(file_name):
     response_json_path = f"{test_resources_dir}/setup/{file_name}"
     with open(response_json_path) as file:
         data = json.loads(file.read())
@@ -285,7 +285,7 @@ def tableau_ingest_common(
     ) as mock_checkpoint:
         mock_checkpoint.return_value = mock_datahub_graph
 
-        with mock.patch("datahub.ingestion.source.tableau.Server") as mock_sdk:
+        with mock.patch("datahub.ingestion.source.tableau.tableau.Server") as mock_sdk:
             mock_sdk.return_value = mock_sdk_client(
                 side_effect_query_metadata_response=side_effect_query_metadata_response,
                 datasources_side_effect=datasources_side_effect,
@@ -331,14 +331,25 @@ def test_tableau_ingest(pytestconfig, tmp_path, mock_datahub_graph):
     tableau_ingest_common(
         pytestconfig,
         tmp_path,
-        [
-            read_response(pytestconfig, "workbooksConnection_all.json"),
-            read_response(pytestconfig, "sheetsConnection_all.json"),
-            read_response(pytestconfig, "dashboardsConnection_all.json"),
-            read_response(pytestconfig, "embeddedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "publishedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "customSQLTablesConnection_all.json"),
-            read_response(pytestconfig, "databaseTablesConnection_all.json"),
+        [  # sequence of json file matters. They are arranged as per graphql api call
+            read_response("workbooksConnection_all.json"),
+            read_response("sheetsConnection_all.json"),
+            read_response("dashboardsConnection_all.json"),
+            read_response("embeddedDatasourcesConnection_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_a561c7beccd3_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_04ed1dcc7090_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_6f5f4cc0b6c6_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_69eb47587cc2_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_a0fced25e056_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_1570e7f932f6_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_c651da2f6ad8_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_26675da44a38_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_bda46be068e3_all.json"),
+            read_response("publishedDatasourcesConnection_all.json"),
+            read_response("publishedDatasourcesFieldUpstream_8e19660bb5dd_all.json"),
+            read_response("publishedDatasourcesFieldUpstream_17139d6e97ae_all.json"),
+            read_response("customSQLTablesConnection_all.json"),
+            read_response("databaseTablesConnection_all.json"),
         ],
         golden_file_name,
         output_file_name,
@@ -350,7 +361,7 @@ def test_tableau_ingest(pytestconfig, tmp_path, mock_datahub_graph):
 @freeze_time(FROZEN_TIME)
 @pytest.mark.integration
 def test_tableau_test_connection_success():
-    with mock.patch("datahub.ingestion.source.tableau.Server"):
+    with mock.patch("datahub.ingestion.source.tableau.tableau.Server"):
         report = test_connection_helpers.run_test_connection(
             TableauSource, config_source_default
         )
@@ -366,6 +377,29 @@ def test_tableau_test_connection_failure():
     test_connection_helpers.assert_basic_connectivity_failure(report, "Unable to login")
 
 
+def mock_data() -> List[dict]:
+    return [
+        read_response("workbooksConnection_all.json"),
+        read_response("sheetsConnection_all.json"),
+        read_response("dashboardsConnection_all.json"),
+        read_response("embeddedDatasourcesConnection_all.json"),
+        read_response("embeddedDatasourcesFieldUpstream_a561c7beccd3_all.json"),
+        read_response("embeddedDatasourcesFieldUpstream_04ed1dcc7090_all.json"),
+        read_response("embeddedDatasourcesFieldUpstream_6f5f4cc0b6c6_all.json"),
+        read_response("embeddedDatasourcesFieldUpstream_69eb47587cc2_all.json"),
+        read_response("embeddedDatasourcesFieldUpstream_a0fced25e056_all.json"),
+        read_response("embeddedDatasourcesFieldUpstream_1570e7f932f6_all.json"),
+        read_response("embeddedDatasourcesFieldUpstream_c651da2f6ad8_all.json"),
+        read_response("embeddedDatasourcesFieldUpstream_26675da44a38_all.json"),
+        read_response("embeddedDatasourcesFieldUpstream_bda46be068e3_all.json"),
+        read_response("publishedDatasourcesConnection_all.json"),
+        read_response("publishedDatasourcesFieldUpstream_8e19660bb5dd_all.json"),
+        read_response("publishedDatasourcesFieldUpstream_17139d6e97ae_all.json"),
+        read_response("customSQLTablesConnection_all.json"),
+        read_response("databaseTablesConnection_all.json"),
+    ]
+
+
 @freeze_time(FROZEN_TIME)
 @pytest.mark.integration
 def test_tableau_cll_ingest(pytestconfig, tmp_path, mock_datahub_graph):
@@ -384,15 +418,7 @@ def test_tableau_cll_ingest(pytestconfig, tmp_path, mock_datahub_graph):
     tableau_ingest_common(
         pytestconfig=pytestconfig,
         tmp_path=tmp_path,
-        side_effect_query_metadata_response=[
-            read_response(pytestconfig, "workbooksConnection_all.json"),
-            read_response(pytestconfig, "sheetsConnection_all.json"),
-            read_response(pytestconfig, "dashboardsConnection_all.json"),
-            read_response(pytestconfig, "embeddedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "publishedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "customSQLTablesConnection_all.json"),
-            read_response(pytestconfig, "databaseTablesConnection_all.json"),
-        ],
+        side_effect_query_metadata_response=mock_data(),
         golden_file_name=golden_file_name,
         output_file_name=output_file_name,
         mock_datahub_graph=mock_datahub_graph,
@@ -416,15 +442,7 @@ def test_project_pattern(pytestconfig, tmp_path, mock_datahub_graph):
     tableau_ingest_common(
         pytestconfig,
         tmp_path,
-        [
-            read_response(pytestconfig, "workbooksConnection_all.json"),
-            read_response(pytestconfig, "sheetsConnection_all.json"),
-            read_response(pytestconfig, "dashboardsConnection_all.json"),
-            read_response(pytestconfig, "embeddedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "publishedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "customSQLTablesConnection_all.json"),
-            read_response(pytestconfig, "databaseTablesConnection_all.json"),
-        ],
+        mock_data(),
         golden_file_name,
         output_file_name,
         mock_datahub_graph,
@@ -448,15 +466,7 @@ def test_project_path_pattern(pytestconfig, tmp_path, mock_datahub_graph):
     tableau_ingest_common(
         pytestconfig,
         tmp_path,
-        [
-            read_response(pytestconfig, "workbooksConnection_all.json"),
-            read_response(pytestconfig, "sheetsConnection_all.json"),
-            read_response(pytestconfig, "dashboardsConnection_all.json"),
-            read_response(pytestconfig, "embeddedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "publishedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "customSQLTablesConnection_all.json"),
-            read_response(pytestconfig, "databaseTablesConnection_all.json"),
-        ],
+        mock_data(),
         golden_file_name,
         output_file_name,
         mock_datahub_graph,
@@ -481,15 +491,7 @@ def test_project_hierarchy(pytestconfig, tmp_path, mock_datahub_graph):
     tableau_ingest_common(
         pytestconfig,
         tmp_path,
-        [
-            read_response(pytestconfig, "workbooksConnection_all.json"),
-            read_response(pytestconfig, "sheetsConnection_all.json"),
-            read_response(pytestconfig, "dashboardsConnection_all.json"),
-            read_response(pytestconfig, "embeddedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "publishedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "customSQLTablesConnection_all.json"),
-            read_response(pytestconfig, "databaseTablesConnection_all.json"),
-        ],
+        mock_data(),
         golden_file_name,
         output_file_name,
         mock_datahub_graph,
@@ -513,15 +515,7 @@ def test_extract_all_project(pytestconfig, tmp_path, mock_datahub_graph):
     tableau_ingest_common(
         pytestconfig,
         tmp_path,
-        [
-            read_response(pytestconfig, "workbooksConnection_all.json"),
-            read_response(pytestconfig, "sheetsConnection_all.json"),
-            read_response(pytestconfig, "dashboardsConnection_all.json"),
-            read_response(pytestconfig, "embeddedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "publishedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "customSQLTablesConnection_all.json"),
-            read_response(pytestconfig, "databaseTablesConnection_all.json"),
-        ],
+        mock_data(),
         golden_file_name,
         output_file_name,
         mock_datahub_graph,
@@ -544,15 +538,7 @@ def test_value_error_projects_and_project_pattern(
         tableau_ingest_common(
             pytestconfig,
             tmp_path,
-            [
-                read_response(pytestconfig, "workbooksConnection_all.json"),
-                read_response(pytestconfig, "sheetsConnection_all.json"),
-                read_response(pytestconfig, "dashboardsConnection_all.json"),
-                read_response(pytestconfig, "embeddedDatasourcesConnection_all.json"),
-                read_response(pytestconfig, "publishedDatasourcesConnection_all.json"),
-                read_response(pytestconfig, "customSQLTablesConnection_all.json"),
-                read_response(pytestconfig, "databaseTablesConnection_all.json"),
-            ],
+            mock_data(),
             golden_file_name,
             output_file_name,
             mock_datahub_graph,
@@ -603,15 +589,7 @@ def test_tableau_ingest_with_platform_instance(
     tableau_ingest_common(
         pytestconfig,
         tmp_path,
-        [
-            read_response(pytestconfig, "workbooksConnection_all.json"),
-            read_response(pytestconfig, "sheetsConnection_all.json"),
-            read_response(pytestconfig, "dashboardsConnection_all.json"),
-            read_response(pytestconfig, "embeddedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "publishedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "customSQLTablesConnection_all.json"),
-            read_response(pytestconfig, "databaseTablesConnection_all.json"),
-        ],
+        mock_data(),
         golden_file_name,
         output_file_name,
         mock_datahub_graph,
@@ -718,15 +696,7 @@ def test_tableau_stateful(pytestconfig, tmp_path, mock_time, mock_datahub_graph)
     pipeline_run1 = tableau_ingest_common(
         pytestconfig,
         tmp_path,
-        [
-            read_response(pytestconfig, "workbooksConnection_all.json"),
-            read_response(pytestconfig, "sheetsConnection_all.json"),
-            read_response(pytestconfig, "dashboardsConnection_all.json"),
-            read_response(pytestconfig, "embeddedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "publishedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "customSQLTablesConnection_all.json"),
-            read_response(pytestconfig, "databaseTablesConnection_all.json"),
-        ],
+        mock_data(),
         golden_file_name,
         output_file_name,
         mock_datahub_graph,
@@ -740,7 +710,7 @@ def test_tableau_stateful(pytestconfig, tmp_path, mock_time, mock_datahub_graph)
     pipeline_run2 = tableau_ingest_common(
         pytestconfig,
         tmp_path,
-        [read_response(pytestconfig, "workbooksConnection_all_stateful.json")],
+        [read_response("workbooksConnection_all_stateful.json")],
         golden_file_deleted_name,
         output_file_deleted_name,
         mock_datahub_graph,
@@ -885,15 +855,7 @@ def test_tableau_signout_timeout(pytestconfig, tmp_path, mock_datahub_graph):
     tableau_ingest_common(
         pytestconfig,
         tmp_path,
-        [
-            read_response(pytestconfig, "workbooksConnection_all.json"),
-            read_response(pytestconfig, "sheetsConnection_all.json"),
-            read_response(pytestconfig, "dashboardsConnection_all.json"),
-            read_response(pytestconfig, "embeddedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "publishedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "customSQLTablesConnection_all.json"),
-            read_response(pytestconfig, "databaseTablesConnection_all.json"),
-        ],
+        mock_data(),
         golden_file_name,
         output_file_name,
         mock_datahub_graph,
@@ -1003,15 +965,7 @@ def test_get_all_datasources_failure(pytestconfig, tmp_path, mock_datahub_graph)
     tableau_ingest_common(
         pytestconfig,
         tmp_path,
-        [
-            read_response(pytestconfig, "workbooksConnection_all.json"),
-            read_response(pytestconfig, "sheetsConnection_all.json"),
-            read_response(pytestconfig, "dashboardsConnection_all.json"),
-            read_response(pytestconfig, "embeddedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "publishedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "customSQLTablesConnection_all.json"),
-            read_response(pytestconfig, "databaseTablesConnection_all.json"),
-        ],
+        mock_data(),
         golden_file_name,
         output_file_name,
         mock_datahub_graph,
@@ -1037,20 +991,42 @@ def test_tableau_ingest_multiple_sites(pytestconfig, tmp_path, mock_datahub_grap
         pytestconfig=pytestconfig,
         tmp_path=tmp_path,
         side_effect_query_metadata_response=[
-            read_response(pytestconfig, "workbooksConnection_all.json"),
-            read_response(pytestconfig, "sheetsConnection_all.json"),
-            read_response(pytestconfig, "dashboardsConnection_all.json"),
-            read_response(pytestconfig, "embeddedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "publishedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "customSQLTablesConnection_all.json"),
-            read_response(pytestconfig, "databaseTablesConnection_all.json"),
-            read_response(pytestconfig, "workbooksConnection_all.json"),
-            read_response(pytestconfig, "sheetsConnection_all.json"),
-            read_response(pytestconfig, "dashboardsConnection_all.json"),
-            read_response(pytestconfig, "embeddedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "publishedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "customSQLTablesConnection_all.json"),
-            read_response(pytestconfig, "databaseTablesConnection_all.json"),
+            read_response("workbooksConnection_all.json"),
+            read_response("sheetsConnection_all.json"),
+            read_response("dashboardsConnection_all.json"),
+            read_response("embeddedDatasourcesConnection_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_a561c7beccd3_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_04ed1dcc7090_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_6f5f4cc0b6c6_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_69eb47587cc2_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_a0fced25e056_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_1570e7f932f6_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_c651da2f6ad8_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_26675da44a38_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_bda46be068e3_all.json"),
+            read_response("publishedDatasourcesConnection_all.json"),
+            read_response("publishedDatasourcesFieldUpstream_8e19660bb5dd_all.json"),
+            read_response("publishedDatasourcesFieldUpstream_17139d6e97ae_all.json"),
+            read_response("customSQLTablesConnection_all.json"),
+            read_response("databaseTablesConnection_all.json"),
+            read_response("workbooksConnection_all.json"),
+            read_response("sheetsConnection_all.json"),
+            read_response("dashboardsConnection_all.json"),
+            read_response("embeddedDatasourcesConnection_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_a561c7beccd3_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_04ed1dcc7090_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_6f5f4cc0b6c6_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_69eb47587cc2_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_a0fced25e056_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_1570e7f932f6_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_c651da2f6ad8_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_26675da44a38_all.json"),
+            read_response("embeddedDatasourcesFieldUpstream_bda46be068e3_all.json"),
+            read_response("publishedDatasourcesConnection_all.json"),
+            read_response("publishedDatasourcesFieldUpstream_8e19660bb5dd_all.json"),
+            read_response("publishedDatasourcesFieldUpstream_17139d6e97ae_all.json"),
+            read_response("customSQLTablesConnection_all.json"),
+            read_response("databaseTablesConnection_all.json"),
         ],
         golden_file_name=golden_file_name,
         output_file_name=output_file_name,
@@ -1075,15 +1051,7 @@ def test_tableau_ingest_sites_as_container(pytestconfig, tmp_path, mock_datahub_
     tableau_ingest_common(
         pytestconfig=pytestconfig,
         tmp_path=tmp_path,
-        side_effect_query_metadata_response=[
-            read_response(pytestconfig, "workbooksConnection_all.json"),
-            read_response(pytestconfig, "sheetsConnection_all.json"),
-            read_response(pytestconfig, "dashboardsConnection_all.json"),
-            read_response(pytestconfig, "embeddedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "publishedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "customSQLTablesConnection_all.json"),
-            read_response(pytestconfig, "databaseTablesConnection_all.json"),
-        ],
+        side_effect_query_metadata_response=mock_data(),
         golden_file_name=golden_file_name,
         output_file_name=output_file_name,
         mock_datahub_graph=mock_datahub_graph,
@@ -1107,15 +1075,7 @@ def test_site_name_pattern(pytestconfig, tmp_path, mock_datahub_graph):
     tableau_ingest_common(
         pytestconfig,
         tmp_path,
-        [
-            read_response(pytestconfig, "workbooksConnection_all.json"),
-            read_response(pytestconfig, "sheetsConnection_all.json"),
-            read_response(pytestconfig, "dashboardsConnection_all.json"),
-            read_response(pytestconfig, "embeddedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "publishedDatasourcesConnection_all.json"),
-            read_response(pytestconfig, "customSQLTablesConnection_all.json"),
-            read_response(pytestconfig, "databaseTablesConnection_all.json"),
-        ],
+        mock_data(),
         golden_file_name,
         output_file_name,
         mock_datahub_graph,
@@ -1134,10 +1094,10 @@ def test_permission_mode_switched_error(pytestconfig, tmp_path, mock_datahub_gra
     ) as mock_checkpoint:
         mock_checkpoint.return_value = mock_datahub_graph
 
-        with mock.patch("datahub.ingestion.source.tableau.Server") as mock_sdk:
+        with mock.patch("datahub.ingestion.source.tableau.tableau.Server") as mock_sdk:
             mock_sdk.return_value = mock_sdk_client(
                 side_effect_query_metadata_response=[
-                    read_response(pytestconfig, "permission_mode_switched_error.json")
+                    read_response("permission_mode_switched_error.json")
                 ],
                 sign_out_side_effect=[{}],
                 datasources_side_effect=[{}],
@@ -1157,6 +1117,7 @@ def test_permission_mode_switched_error(pytestconfig, tmp_path, mock_datahub_gra
                 query=mock.MagicMock(),
                 connection_type=mock.MagicMock(),
                 query_filter=mock.MagicMock(),
+                current_cursor=None,
                 retries_remaining=1,
             )
 
diff --git a/metadata-ingestion/tests/integration/trino/trino_hive_instance_mces_golden.json b/metadata-ingestion/tests/integration/trino/trino_hive_instance_mces_golden.json
index c5664b9373e8c5..d19b83f4d4e2f8 100644
--- a/metadata-ingestion/tests/integration/trino/trino_hive_instance_mces_golden.json
+++ b/metadata-ingestion/tests/integration/trino/trino_hive_instance_mces_golden.json
@@ -244,7 +244,7 @@
                             "numrows": "1",
                             "rawdatasize": "32",
                             "totalsize": "33",
-                            "transient_lastddltime": "1710150034"
+                            "transient_lastddltime": "1722106707"
                         },
                         "name": "array_struct_test",
                         "description": "This table has array of structs",
@@ -280,7 +280,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -505,7 +505,7 @@
                             "numrows": "3",
                             "rawdatasize": "94",
                             "totalsize": "97",
-                            "transient_lastddltime": "1710150038"
+                            "transient_lastddltime": "1722106711"
                         },
                         "name": "classification_test",
                         "tags": []
@@ -539,7 +539,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -551,7 +551,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -563,7 +563,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -575,7 +575,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -587,7 +587,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -764,7 +764,7 @@
                             "numrows": "0",
                             "rawdatasize": "0",
                             "totalsize": "0",
-                            "transient_lastddltime": "1710150036"
+                            "transient_lastddltime": "1722106709"
                         },
                         "name": "map_test",
                         "tags": []
@@ -798,7 +798,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -991,7 +991,7 @@
                             "numrows": "0",
                             "rawdatasize": "0",
                             "totalsize": "0",
-                            "transient_lastddltime": "1710150036"
+                            "transient_lastddltime": "1722106709"
                         },
                         "name": "nested_struct_test",
                         "tags": []
@@ -1025,7 +1025,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1262,7 +1262,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "transient_lastddltime": "1710150028"
+                            "transient_lastddltime": "1722106702"
                         },
                         "name": "pokes",
                         "tags": []
@@ -1296,7 +1296,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1308,7 +1308,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1320,7 +1320,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1497,7 +1497,7 @@
                             "numrows": "0",
                             "rawdatasize": "0",
                             "totalsize": "0",
-                            "transient_lastddltime": "1710150031"
+                            "transient_lastddltime": "1722106704"
                         },
                         "name": "struct_test",
                         "tags": []
@@ -1531,7 +1531,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1748,7 +1748,7 @@
                         "customProperties": {
                             "numfiles": "0",
                             "totalsize": "0",
-                            "transient_lastddltime": "1710150036"
+                            "transient_lastddltime": "1722106709"
                         },
                         "name": "struct_test_view_materialized",
                         "tags": []
@@ -1782,7 +1782,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2002,7 +2002,7 @@
                             "numrows": "0",
                             "rawdatasize": "0",
                             "totalsize": "0",
-                            "transient_lastddltime": "1710150031"
+                            "transient_lastddltime": "1722106704"
                         },
                         "name": "_test_table_underscore",
                         "tags": []
@@ -2036,7 +2036,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2048,7 +2048,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -2225,7 +2225,7 @@
                             "numrows": "0",
                             "rawdatasize": "0",
                             "totalsize": "0",
-                            "transient_lastddltime": "1710150036"
+                            "transient_lastddltime": "1722106709"
                         },
                         "name": "union_test",
                         "tags": []
@@ -2527,7 +2527,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "transient_lastddltime": "1710150036",
+                            "transient_lastddltime": "1722106709",
                             "view_definition": "SELECT \"property_id\", \"service\"\nFROM \"db1\".\"array_struct_test\"",
                             "is_view": "True"
                         },
@@ -2563,7 +2563,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
diff --git a/metadata-ingestion/tests/integration/trino/trino_hive_mces_golden.json b/metadata-ingestion/tests/integration/trino/trino_hive_mces_golden.json
index 2764433808cbdb..f72610fba7c547 100644
--- a/metadata-ingestion/tests/integration/trino/trino_hive_mces_golden.json
+++ b/metadata-ingestion/tests/integration/trino/trino_hive_mces_golden.json
@@ -231,7 +231,7 @@
                             "numrows": "1",
                             "rawdatasize": "32",
                             "totalsize": "33",
-                            "transient_lastddltime": "1713211020"
+                            "transient_lastddltime": "1722106707"
                         },
                         "name": "array_struct_test",
                         "description": "This table has array of structs",
@@ -267,7 +267,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -471,7 +471,7 @@
                             "numrows": "3",
                             "rawdatasize": "94",
                             "totalsize": "97",
-                            "transient_lastddltime": "1713211025"
+                            "transient_lastddltime": "1722106711"
                         },
                         "name": "classification_test",
                         "tags": []
@@ -505,7 +505,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -517,7 +517,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "glossaryTerms": {
                                     "terms": [
@@ -540,7 +540,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "glossaryTerms": {
                                     "terms": [
@@ -563,7 +563,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "glossaryTerms": {
                                     "terms": [
@@ -586,7 +586,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "glossaryTerms": {
                                     "terms": [
@@ -753,7 +753,7 @@
                             "numrows": "0",
                             "rawdatasize": "0",
                             "totalsize": "0",
-                            "transient_lastddltime": "1713211023"
+                            "transient_lastddltime": "1722106709"
                         },
                         "name": "map_test",
                         "tags": []
@@ -787,7 +787,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -959,7 +959,7 @@
                             "numrows": "0",
                             "rawdatasize": "0",
                             "totalsize": "0",
-                            "transient_lastddltime": "1713211023"
+                            "transient_lastddltime": "1722106709"
                         },
                         "name": "nested_struct_test",
                         "tags": []
@@ -993,7 +993,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1209,7 +1209,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "transient_lastddltime": "1713211015"
+                            "transient_lastddltime": "1722106702"
                         },
                         "name": "pokes",
                         "tags": []
@@ -1243,7 +1243,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1255,7 +1255,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1267,7 +1267,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1423,7 +1423,7 @@
                             "numrows": "0",
                             "rawdatasize": "0",
                             "totalsize": "0",
-                            "transient_lastddltime": "1713211017"
+                            "transient_lastddltime": "1722106704"
                         },
                         "name": "struct_test",
                         "tags": []
@@ -1457,7 +1457,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1653,7 +1653,7 @@
                         "customProperties": {
                             "numfiles": "0",
                             "totalsize": "0",
-                            "transient_lastddltime": "1713211023"
+                            "transient_lastddltime": "1722106709"
                         },
                         "name": "struct_test_view_materialized",
                         "tags": []
@@ -1687,7 +1687,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1886,7 +1886,7 @@
                             "numrows": "0",
                             "rawdatasize": "0",
                             "totalsize": "0",
-                            "transient_lastddltime": "1713211017"
+                            "transient_lastddltime": "1722106704"
                         },
                         "name": "_test_table_underscore",
                         "tags": []
@@ -1920,7 +1920,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1932,7 +1932,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR()",
+                                "nativeDataType": "VARCHAR",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -2088,7 +2088,7 @@
                             "numrows": "0",
                             "rawdatasize": "0",
                             "totalsize": "0",
-                            "transient_lastddltime": "1713211023"
+                            "transient_lastddltime": "1722106709"
                         },
                         "name": "union_test",
                         "tags": []
@@ -2369,7 +2369,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "transient_lastddltime": "1713211023",
+                            "transient_lastddltime": "1722106709",
                             "view_definition": "SELECT \"property_id\", \"service\"\nFROM \"db1\".\"array_struct_test\"",
                             "is_view": "True"
                         },
@@ -2405,7 +2405,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
diff --git a/metadata-ingestion/tests/integration/trino/trino_mces_golden.json b/metadata-ingestion/tests/integration/trino/trino_mces_golden.json
index 1f03f02fa9408f..b2afad81b12fad 100644
--- a/metadata-ingestion/tests/integration/trino/trino_mces_golden.json
+++ b/metadata-ingestion/tests/integration/trino/trino_mces_golden.json
@@ -256,7 +256,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -268,7 +268,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -280,7 +280,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -292,7 +292,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -304,7 +304,7 @@
                                         "com.linkedin.pegasus2avro.schema.RecordType": {}
                                     }
                                 },
-                                "nativeDataType": "JSON()",
+                                "nativeDataType": "JSON",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -504,7 +504,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -516,7 +516,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -528,7 +528,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -540,7 +540,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -723,7 +723,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -735,7 +735,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -918,7 +918,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -930,7 +930,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -942,7 +942,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -954,7 +954,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -966,7 +966,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -978,7 +978,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1479,142 +1479,5 @@
         "runId": "trino-test",
         "lastRunId": "no-run-id-provided"
     }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:ad9f7c5e0d4bf83d6278f62271c28761",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1632398400000,
-        "runId": "trino-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:2d206e03e435f48a5b8bacf444bf565c",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:ad9f7c5e0d4bf83d6278f62271c28761",
-                    "urn": "urn:li:container:ad9f7c5e0d4bf83d6278f62271c28761"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1632398400000,
-        "runId": "trino-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:trino,postgresqldb.librarydb.book,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:ad9f7c5e0d4bf83d6278f62271c28761",
-                    "urn": "urn:li:container:ad9f7c5e0d4bf83d6278f62271c28761"
-                },
-                {
-                    "id": "urn:li:container:2d206e03e435f48a5b8bacf444bf565c",
-                    "urn": "urn:li:container:2d206e03e435f48a5b8bacf444bf565c"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1632398400000,
-        "runId": "trino-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:trino,postgresqldb.librarydb.issue_history,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:ad9f7c5e0d4bf83d6278f62271c28761",
-                    "urn": "urn:li:container:ad9f7c5e0d4bf83d6278f62271c28761"
-                },
-                {
-                    "id": "urn:li:container:2d206e03e435f48a5b8bacf444bf565c",
-                    "urn": "urn:li:container:2d206e03e435f48a5b8bacf444bf565c"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1632398400000,
-        "runId": "trino-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:trino,postgresqldb.librarydb.member,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:ad9f7c5e0d4bf83d6278f62271c28761",
-                    "urn": "urn:li:container:ad9f7c5e0d4bf83d6278f62271c28761"
-                },
-                {
-                    "id": "urn:li:container:2d206e03e435f48a5b8bacf444bf565c",
-                    "urn": "urn:li:container:2d206e03e435f48a5b8bacf444bf565c"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1632398400000,
-        "runId": "trino-test",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:trino,postgresqldb.librarydb.book_in_circulation,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:ad9f7c5e0d4bf83d6278f62271c28761",
-                    "urn": "urn:li:container:ad9f7c5e0d4bf83d6278f62271c28761"
-                },
-                {
-                    "id": "urn:li:container:2d206e03e435f48a5b8bacf444bf565c",
-                    "urn": "urn:li:container:2d206e03e435f48a5b8bacf444bf565c"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1632398400000,
-        "runId": "trino-test",
-        "lastRunId": "no-run-id-provided"
-    }
 }
 ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/unity/test_unity_catalog_ingest.py b/metadata-ingestion/tests/integration/unity/test_unity_catalog_ingest.py
index 22a48efdec41d7..c078f1b77fd1be 100644
--- a/metadata-ingestion/tests/integration/unity/test_unity_catalog_ingest.py
+++ b/metadata-ingestion/tests/integration/unity/test_unity_catalog_ingest.py
@@ -276,6 +276,9 @@ def register_mock_data(workspace_client):
 
 
 TableEntry = namedtuple("TableEntry", ["database", "tableName", "isTemporary"])
+ViewEntry = namedtuple(
+    "ViewEntry", ["namespace", "viewName", "isTemporary", "isMaterialized"]
+)
 
 
 def mock_hive_sql(query):
@@ -418,7 +421,7 @@ def mock_hive_sql(query):
             TableEntry("bronze_kambi", "view1", False),
         ]
     elif query == "SHOW VIEWS FROM `bronze_kambi`":
-        return [TableEntry("bronze_kambi", "view1", False)]
+        return [ViewEntry("bronze_kambi", "view1", False, False)]
 
     return []
 
diff --git a/metadata-ingestion/tests/integration/vertica/vertica_mces_with_db_golden.json b/metadata-ingestion/tests/integration/vertica/vertica_mces_with_db_golden.json
index cd1cd0d7e28a48..2f2a02a3352ee1 100644
--- a/metadata-ingestion/tests/integration/vertica/vertica_mces_with_db_golden.json
+++ b/metadata-ingestion/tests/integration/vertica/vertica_mces_with_db_golden.json
@@ -1,7 +1,7 @@
 [
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:343f520ad0fb3259b298736800bb1385",
+    "entityUrn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -9,9 +9,9 @@
             "customProperties": {
                 "platform": "vertica",
                 "env": "PROD",
-                "database": "vmart"
+                "database": "Vmart"
             },
-            "name": "vmart"
+            "name": "Vmart"
         }
     },
     "systemMetadata": {
@@ -22,7 +22,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:343f520ad0fb3259b298736800bb1385",
+    "entityUrn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -38,7 +38,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:343f520ad0fb3259b298736800bb1385",
+    "entityUrn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -54,7 +54,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:343f520ad0fb3259b298736800bb1385",
+    "entityUrn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -72,7 +72,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:343f520ad0fb3259b298736800bb1385",
+    "entityUrn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
@@ -88,7 +88,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
+    "entityUrn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -96,7 +96,7 @@
             "customProperties": {
                 "platform": "vertica",
                 "env": "PROD",
-                "database": "vmart",
+                "database": "Vmart",
                 "schema": "public"
             },
             "name": "public"
@@ -110,7 +110,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
+    "entityUrn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -126,7 +126,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
+    "entityUrn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -142,7 +142,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
+    "entityUrn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -160,12 +160,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
+    "entityUrn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+            "container": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
         }
     },
     "systemMetadata": {
@@ -176,15 +176,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
+    "entityUrn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 }
             ]
         }
@@ -228,7 +228,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -250,7 +250,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:24:31.057395+00:00",
+                            "create_time": "2024-06-18 12:46:11.762979+00:00",
                             "table_size": "0 KB"
                         },
                         "name": "clicks",
@@ -287,7 +287,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -300,7 +300,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -313,7 +313,7 @@
                                         "com.linkedin.pegasus2avro.schema.TimeType": {}
                                     }
                                 },
-                                "nativeDataType": "TIMESTAMP_WITH_PRECISION()",
+                                "nativeDataType": "TIMESTAMP",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -356,12 +356,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -405,7 +405,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -427,7 +427,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:23:45.887434+00:00",
+                            "create_time": "2024-06-18 12:45:49.748139+00:00",
                             "table_size": "2119 KB"
                         },
                         "name": "customer_dimension",
@@ -464,7 +464,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -477,7 +477,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=16)",
+                                "nativeDataType": "VARCHAR(16)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -490,7 +490,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=256)",
+                                "nativeDataType": "VARCHAR(256)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -503,7 +503,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=8)",
+                                "nativeDataType": "VARCHAR(8)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -516,7 +516,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=8)",
+                                "nativeDataType": "VARCHAR(8)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -529,7 +529,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -542,7 +542,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=256)",
+                                "nativeDataType": "VARCHAR(256)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -555,7 +555,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -568,7 +568,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=2)",
+                                "nativeDataType": "CHAR(2)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -581,7 +581,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -594,7 +594,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -607,7 +607,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -620,7 +620,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -633,7 +633,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -646,7 +646,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -659,7 +659,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -672,7 +672,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -685,7 +685,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -698,7 +698,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -711,7 +711,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -724,7 +724,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -767,12 +767,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -816,7 +816,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -838,7 +838,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:23:45.897002+00:00",
+                            "create_time": "2024-06-18 12:45:49.756539+00:00",
                             "table_size": "145 KB"
                         },
                         "name": "date_dimension",
@@ -875,7 +875,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -888,7 +888,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -901,7 +901,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=18)",
+                                "nativeDataType": "VARCHAR(18)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -914,7 +914,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=9)",
+                                "nativeDataType": "VARCHAR(9)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -927,7 +927,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -940,7 +940,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -953,7 +953,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -966,7 +966,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -979,7 +979,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -992,7 +992,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1005,7 +1005,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1018,7 +1018,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=9)",
+                                "nativeDataType": "VARCHAR(9)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1031,7 +1031,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1044,7 +1044,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=7)",
+                                "nativeDataType": "CHAR(7)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1057,7 +1057,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1070,7 +1070,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=7)",
+                                "nativeDataType": "CHAR(7)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1083,7 +1083,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1096,7 +1096,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1109,7 +1109,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=10)",
+                                "nativeDataType": "VARCHAR(10)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1122,7 +1122,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=7)",
+                                "nativeDataType": "CHAR(7)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1135,7 +1135,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1178,12 +1178,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -1227,7 +1227,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -1249,7 +1249,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:23:45.903227+00:00",
+                            "create_time": "2024-06-18 12:45:49.761468+00:00",
                             "table_size": "327 KB"
                         },
                         "name": "employee_dimension",
@@ -1286,7 +1286,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -1299,7 +1299,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=8)",
+                                "nativeDataType": "VARCHAR(8)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1312,7 +1312,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=8)",
+                                "nativeDataType": "VARCHAR(8)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1325,7 +1325,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1338,7 +1338,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=8)",
+                                "nativeDataType": "VARCHAR(8)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1351,7 +1351,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1364,7 +1364,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1377,7 +1377,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1390,7 +1390,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=256)",
+                                "nativeDataType": "VARCHAR(256)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1403,7 +1403,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1416,7 +1416,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=2)",
+                                "nativeDataType": "CHAR(2)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1429,7 +1429,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1442,7 +1442,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1455,7 +1455,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1468,7 +1468,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1481,7 +1481,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1494,7 +1494,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1507,7 +1507,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1550,12 +1550,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -1599,7 +1599,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -1621,7 +1621,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:23:45.912348+00:00",
+                            "create_time": "2024-06-18 12:45:49.768272+00:00",
                             "table_size": "2567 KB"
                         },
                         "name": "inventory_fact",
@@ -1658,7 +1658,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1671,7 +1671,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1684,7 +1684,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1697,7 +1697,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1710,7 +1710,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -1723,7 +1723,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1766,12 +1766,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -1815,7 +1815,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -1837,7 +1837,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:24:31.194163+00:00",
+                            "create_time": "2024-06-18 12:46:11.881911+00:00",
                             "table_size": "0 KB"
                         },
                         "name": "phrases",
@@ -1874,7 +1874,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=128)",
+                                "nativeDataType": "VARCHAR(128)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -1917,12 +1917,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -1966,7 +1966,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -1988,7 +1988,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:23:45.890782+00:00",
+                            "create_time": "2024-06-18 12:45:49.751522+00:00",
                             "table_size": "19 KB"
                         },
                         "name": "product_dimension",
@@ -2025,7 +2025,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -2038,7 +2038,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2051,7 +2051,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=128)",
+                                "nativeDataType": "VARCHAR(128)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2064,7 +2064,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2077,7 +2077,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2090,7 +2090,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2103,7 +2103,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2116,7 +2116,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2129,7 +2129,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2142,7 +2142,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2155,7 +2155,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2168,7 +2168,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2181,7 +2181,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2194,7 +2194,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2207,7 +2207,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2220,7 +2220,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2233,7 +2233,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2246,7 +2246,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2259,7 +2259,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2272,7 +2272,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2285,7 +2285,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -2328,12 +2328,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -2377,7 +2377,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -2399,7 +2399,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:23:45.893891+00:00",
+                            "create_time": "2024-06-18 12:45:49.754039+00:00",
                             "table_size": "3 KB"
                         },
                         "name": "promotion_dimension",
@@ -2436,7 +2436,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -2449,7 +2449,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=128)",
+                                "nativeDataType": "VARCHAR(128)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2462,7 +2462,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2475,7 +2475,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2488,7 +2488,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2501,7 +2501,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2514,7 +2514,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2527,7 +2527,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2540,7 +2540,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=128)",
+                                "nativeDataType": "VARCHAR(128)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2553,7 +2553,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2566,7 +2566,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2579,7 +2579,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -2622,12 +2622,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -2671,7 +2671,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -2693,7 +2693,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:24:31.046829+00:00",
+                            "create_time": "2024-06-18 12:46:11.751917+00:00",
                             "table_size": "0 KB"
                         },
                         "name": "readings",
@@ -2730,7 +2730,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2743,7 +2743,7 @@
                                         "com.linkedin.pegasus2avro.schema.TimeType": {}
                                     }
                                 },
-                                "nativeDataType": "TIMESTAMP_WITH_PRECISION()",
+                                "nativeDataType": "TIMESTAMP",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2756,7 +2756,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -2799,12 +2799,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -2848,7 +2848,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -2870,7 +2870,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:23:45.906471+00:00",
+                            "create_time": "2024-06-18 12:45:49.763788+00:00",
                             "table_size": "1 KB"
                         },
                         "name": "shipping_dimension",
@@ -2907,7 +2907,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -2920,7 +2920,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=30)",
+                                "nativeDataType": "CHAR(30)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2933,7 +2933,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=10)",
+                                "nativeDataType": "CHAR(10)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -2946,7 +2946,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=20)",
+                                "nativeDataType": "CHAR(20)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -2989,12 +2989,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -3038,7 +3038,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -3060,7 +3060,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:23:45.900185+00:00",
+                            "create_time": "2024-06-18 12:45:49.759103+00:00",
                             "table_size": "1 KB"
                         },
                         "name": "vendor_dimension",
@@ -3097,7 +3097,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -3110,7 +3110,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3123,7 +3123,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3136,7 +3136,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3149,7 +3149,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=2)",
+                                "nativeDataType": "CHAR(2)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3162,7 +3162,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3175,7 +3175,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3188,7 +3188,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -3231,12 +3231,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -3280,7 +3280,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -3302,7 +3302,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:24:30.233405+00:00",
+                            "create_time": "2024-06-18 12:46:11.212820+00:00",
                             "table_size": "0 KB"
                         },
                         "name": "vmart_load_success",
@@ -3339,7 +3339,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -3382,12 +3382,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -3431,7 +3431,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -3453,7 +3453,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:23:45.909432+00:00",
+                            "create_time": "2024-06-18 12:45:49.766036+00:00",
                             "table_size": "2 KB"
                         },
                         "name": "warehouse_dimension",
@@ -3490,7 +3490,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -3503,7 +3503,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=20)",
+                                "nativeDataType": "VARCHAR(20)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3516,7 +3516,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=256)",
+                                "nativeDataType": "VARCHAR(256)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3529,7 +3529,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=60)",
+                                "nativeDataType": "VARCHAR(60)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3542,7 +3542,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=2)",
+                                "nativeDataType": "CHAR(2)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3555,7 +3555,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -3598,12 +3598,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -3647,7 +3647,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -3669,7 +3669,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:24:31.075640+00:00",
+                            "create_time": "2024-06-18 12:46:11.778456+00:00",
                             "table_size": "0 KB",
                             "view_definition": "SELECT sum(customer_dimension.annual_income) AS SUM, customer_dimension.customer_state FROM public.customer_dimension WHERE (customer_dimension.customer_key IN (SELECT store_sales_fact.customer_key FROM store.store_sales_fact)) GROUP BY customer_dimension.customer_state ORDER BY customer_dimension.customer_state",
                             "is_view": "True"
@@ -3708,7 +3708,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -3721,7 +3721,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=2)",
+                                "nativeDataType": "CHAR(2)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -3782,12 +3782,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -3800,7 +3800,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:342b43fc61f85b16580be55c11e89787",
+    "entityUrn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -3808,7 +3808,8 @@
             "customProperties": {
                 "platform": "vertica",
                 "env": "PROD",
-                "database": "vmart",
+                "database": "Vmart",
+                "database": "Vmart",
                 "schema": "store"
             },
             "name": "store"
@@ -3822,7 +3823,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:342b43fc61f85b16580be55c11e89787",
+    "entityUrn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -3838,7 +3839,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:342b43fc61f85b16580be55c11e89787",
+    "entityUrn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -3854,7 +3855,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:342b43fc61f85b16580be55c11e89787",
+    "entityUrn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -3872,12 +3873,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:342b43fc61f85b16580be55c11e89787",
+    "entityUrn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+            "container": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
         }
     },
     "systemMetadata": {
@@ -3888,15 +3889,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:342b43fc61f85b16580be55c11e89787",
+    "entityUrn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 }
             ]
         }
@@ -3940,7 +3941,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:342b43fc61f85b16580be55c11e89787"
+            "container": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44"
         }
     },
     "systemMetadata": {
@@ -3962,7 +3963,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:23:45.918904+00:00",
+                            "create_time": "2024-06-18 12:45:49.773986+00:00",
                             "table_size": "2 KB"
                         },
                         "name": "store_dimension",
@@ -3999,7 +4000,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -4012,7 +4013,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4025,7 +4026,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4038,7 +4039,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=256)",
+                                "nativeDataType": "VARCHAR(256)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4051,7 +4052,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4064,7 +4065,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=2)",
+                                "nativeDataType": "CHAR(2)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4077,7 +4078,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4090,7 +4091,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4103,7 +4104,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4116,7 +4117,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4129,7 +4130,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4142,7 +4143,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4155,7 +4156,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4168,7 +4169,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4181,7 +4182,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4194,7 +4195,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4207,7 +4208,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4220,7 +4221,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -4263,12 +4264,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:342b43fc61f85b16580be55c11e89787",
-                    "urn": "urn:li:container:342b43fc61f85b16580be55c11e89787"
+                    "id": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
+                    "urn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44"
                 }
             ]
         }
@@ -4312,7 +4313,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:342b43fc61f85b16580be55c11e89787"
+            "container": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44"
         }
     },
     "systemMetadata": {
@@ -4334,7 +4335,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:23:45.929154+00:00",
+                            "create_time": "2024-06-18 12:45:49.781744+00:00",
                             "table_size": "8646 KB"
                         },
                         "name": "store_orders_fact",
@@ -4371,7 +4372,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4384,7 +4385,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4397,7 +4398,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4410,7 +4411,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4423,7 +4424,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4436,7 +4437,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4449,7 +4450,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4462,7 +4463,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4475,7 +4476,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4488,7 +4489,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4501,7 +4502,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4514,7 +4515,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4527,7 +4528,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4540,7 +4541,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4553,7 +4554,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4566,7 +4567,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4579,7 +4580,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4592,7 +4593,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4605,7 +4606,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -4648,12 +4649,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:342b43fc61f85b16580be55c11e89787",
-                    "urn": "urn:li:container:342b43fc61f85b16580be55c11e89787"
+                    "id": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
+                    "urn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44"
                 }
             ]
         }
@@ -4697,7 +4698,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:342b43fc61f85b16580be55c11e89787"
+            "container": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44"
         }
     },
     "systemMetadata": {
@@ -4719,7 +4720,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:23:45.922050+00:00",
+                            "create_time": "2024-06-18 12:45:49.776427+00:00",
                             "table_size": "225096 KB"
                         },
                         "name": "store_sales_fact",
@@ -4756,7 +4757,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4769,7 +4770,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4782,7 +4783,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4795,7 +4796,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4808,7 +4809,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4821,7 +4822,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4834,7 +4835,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4847,7 +4848,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4860,7 +4861,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4873,7 +4874,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4886,7 +4887,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4899,7 +4900,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4912,7 +4913,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=16)",
+                                "nativeDataType": "VARCHAR(16)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4925,7 +4926,7 @@
                                         "com.linkedin.pegasus2avro.schema.TimeType": {}
                                     }
                                 },
-                                "nativeDataType": "TIME()",
+                                "nativeDataType": "TIME",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4938,7 +4939,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=8)",
+                                "nativeDataType": "VARCHAR(8)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4951,7 +4952,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -4964,7 +4965,7 @@
                                         "com.linkedin.pegasus2avro.schema.TimeType": {}
                                     }
                                 },
-                                "nativeDataType": "TIMESTAMP_WITH_PRECISION()",
+                                "nativeDataType": "TIMESTAMP",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -5007,12 +5008,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:342b43fc61f85b16580be55c11e89787",
-                    "urn": "urn:li:container:342b43fc61f85b16580be55c11e89787"
+                    "id": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
+                    "urn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44"
                 }
             ]
         }
@@ -5025,7 +5026,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
+    "entityUrn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -5033,7 +5034,7 @@
             "customProperties": {
                 "platform": "vertica",
                 "env": "PROD",
-                "database": "vmart",
+                "database": "Vmart",
                 "schema": "online_sales"
             },
             "name": "online_sales"
@@ -5047,7 +5048,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
+    "entityUrn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -5063,7 +5064,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
+    "entityUrn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -5079,7 +5080,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
+    "entityUrn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -5097,12 +5098,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
+    "entityUrn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+            "container": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
         }
     },
     "systemMetadata": {
@@ -5113,15 +5114,15 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
+    "entityUrn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
     "changeType": "UPSERT",
     "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 }
             ]
         }
@@ -5165,7 +5166,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:ae8df3182db1bb8b3a612998126beae7"
+            "container": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557"
         }
     },
     "systemMetadata": {
@@ -5187,7 +5188,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:23:45.938730+00:00",
+                            "create_time": "2024-06-18 12:45:49.789350+00:00",
                             "table_size": "6 KB"
                         },
                         "name": "call_center_dimension",
@@ -5224,7 +5225,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -5237,7 +5238,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5250,7 +5251,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5263,7 +5264,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5276,7 +5277,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5289,7 +5290,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5302,7 +5303,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=20)",
+                                "nativeDataType": "CHAR(20)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5315,7 +5316,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=40)",
+                                "nativeDataType": "VARCHAR(40)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5328,7 +5329,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=256)",
+                                "nativeDataType": "VARCHAR(256)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5341,7 +5342,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5354,7 +5355,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=2)",
+                                "nativeDataType": "CHAR(2)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5367,7 +5368,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -5410,12 +5411,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
-                    "urn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7"
+                    "id": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
+                    "urn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557"
                 }
             ]
         }
@@ -5459,7 +5460,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:ae8df3182db1bb8b3a612998126beae7"
+            "container": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557"
         }
     },
     "systemMetadata": {
@@ -5481,7 +5482,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:23:45.935745+00:00",
+                            "create_time": "2024-06-18 12:45:49.786989+00:00",
                             "table_size": "9 KB"
                         },
                         "name": "online_page_dimension",
@@ -5518,7 +5519,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": true
                             },
@@ -5531,7 +5532,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5544,7 +5545,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5557,7 +5558,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5570,7 +5571,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=100)",
+                                "nativeDataType": "VARCHAR(100)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5583,7 +5584,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=100)",
+                                "nativeDataType": "VARCHAR(100)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -5626,12 +5627,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
-                    "urn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7"
+                    "id": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
+                    "urn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557"
                 }
             ]
         }
@@ -5675,7 +5676,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:ae8df3182db1bb8b3a612998126beae7"
+            "container": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557"
         }
     },
     "systemMetadata": {
@@ -5697,7 +5698,7 @@
                 {
                     "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
                         "customProperties": {
-                            "create_time": "2024-06-03 12:23:45.941712+00:00",
+                            "create_time": "2024-06-18 12:45:49.791761+00:00",
                             "table_size": "182385 KB"
                         },
                         "name": "online_sales_fact",
@@ -5734,7 +5735,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5747,7 +5748,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5760,7 +5761,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5773,7 +5774,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5786,7 +5787,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5799,7 +5800,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5812,7 +5813,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5825,7 +5826,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5838,7 +5839,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5851,7 +5852,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5864,7 +5865,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5877,7 +5878,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5890,7 +5891,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5903,7 +5904,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5916,7 +5917,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5929,7 +5930,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5942,7 +5943,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5955,7 +5956,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=16)",
+                                "nativeDataType": "VARCHAR(16)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5968,7 +5969,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -5981,7 +5982,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -6024,12 +6025,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
-                    "urn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7"
+                    "id": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
+                    "urn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557"
                 }
             ]
         }
@@ -6042,7 +6043,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:343f520ad0fb3259b298736800bb1385",
+    "entityUrn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -6050,13 +6051,14 @@
             "customProperties": {
                 "platform": "vertica",
                 "env": "PROD",
-                "database": "vmart",
+                "database": "Vmart",
+                "database": "Vmart",
                 "cluster_type": "Enterprise",
-                "cluster_size": "52 GB",
+                "cluster_size": "243 GB",
                 "subcluster": " ",
                 "communal_storage_path": ""
             },
-            "name": "vmart"
+            "name": "Vmart"
         }
     },
     "systemMetadata": {
@@ -6067,7 +6069,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:343f520ad0fb3259b298736800bb1385",
+    "entityUrn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -6083,7 +6085,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:343f520ad0fb3259b298736800bb1385",
+    "entityUrn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -6099,7 +6101,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:343f520ad0fb3259b298736800bb1385",
+    "entityUrn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -6117,7 +6119,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
+    "entityUrn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -6125,11 +6127,11 @@
             "customProperties": {
                 "platform": "vertica",
                 "env": "PROD",
-                "database": "vmart",
+                "database": "Vmart",
                 "schema": "public",
                 "projection_count": "12",
                 "udx_list": "APPROXIMATE_COUNT_DISTINCT_SYNOPSIS_INFO, APPROXIMATE_MEDIAN, APPROXIMATE_PERCENTILE, AcdDataToCount, AcdDataToLongSyn, AcdDataToSyn, AcdSynToCount, AcdSynToSyn, DelimitedExport, DelimitedExportMulti, EmptyMap, Explode, FAvroParser, FCefParser, FCsvParser, FDelimitedPairParser, FDelimitedParser, FIDXParser, FJSONParser, FRegexParser, FlexTokenizer, JsonExport, JsonExportMulti, KafkaAvroParser, KafkaCheckBrokers, KafkaExport, KafkaInsertDelimiters, KafkaInsertLengths, KafkaJsonParser, KafkaListManyTopics, KafkaListTopics, KafkaOffsets, KafkaParser, KafkaSource, KafkaTopicDetails, MSE, MapAggregate, MapAggregate, MapContainsKey, MapContainsKey, MapContainsValue, MapContainsValue, MapDelimitedExtractor, MapItems, MapItems, MapJSONExtractor, MapKeys, MapKeys, MapKeysInfo, MapKeysInfo, MapLookup, MapLookup, MapLookup, MapPut, MapRegexExtractor, MapSize, MapSize, MapToString, MapToString, MapValues, MapValues, MapValuesOrField, MapVersion, MapVersion, OrcExport, OrcExportMulti, PRC, ParquetExport, ParquetExportMulti, PickBestType, PickBestType, PickBestType, ROC, STV_AsGeoJSON, STV_AsGeoJSON, STV_AsGeoJSON, STV_Create_Index, STV_Create_Index, STV_Create_Index, STV_DWithin, STV_DWithin, STV_DWithin, STV_Describe_Index, STV_Drop_Index, STV_Export2Shapefile, STV_Extent, STV_Extent, STV_ForceLHR, STV_Geography, STV_Geography, STV_GeographyPoint, STV_Geometry, STV_Geometry, STV_GeometryPoint, STV_GeometryPoint, STV_GetExportShapefileDirectory, STV_Intersect, STV_Intersect, STV_Intersect, STV_Intersect, STV_Intersect, STV_Intersect, STV_Intersect, STV_Intersect, STV_IsValidReason, STV_IsValidReason, STV_IsValidReason, STV_LineStringPoint, STV_LineStringPoint, STV_LineStringPoint, STV_MemSize, STV_MemSize, STV_MemSize, STV_NN, STV_NN, STV_NN, STV_PolygonPoint, STV_PolygonPoint, STV_PolygonPoint, STV_Refresh_Index, STV_Refresh_Index, STV_Refresh_Index, STV_Rename_Index, STV_Reverse, STV_SetExportShapefileDirectory, STV_ShpCreateTable, STV_ShpParser, STV_ShpSource, ST_Area, ST_Area, ST_Area, ST_AsBinary, ST_AsBinary, ST_AsBinary, ST_AsText, ST_AsText, ST_AsText, ST_Boundary, ST_Buffer, ST_Centroid, ST_Contains, ST_Contains, ST_Contains, ST_ConvexHull, ST_Crosses, ST_Difference, ST_Disjoint, ST_Disjoint, ST_Disjoint, ST_Distance, ST_Distance, ST_Distance, ST_Envelope, ST_Equals, ST_Equals, ST_Equals, ST_GeoHash, ST_GeoHash, ST_GeoHash, ST_GeographyFromText, ST_GeographyFromWKB, ST_GeomFromGeoHash, ST_GeomFromGeoJSON, ST_GeomFromGeoJSON, ST_GeomFromText, ST_GeomFromText, ST_GeomFromWKB, ST_GeomFromWKB, ST_GeometryN, ST_GeometryN, ST_GeometryN, ST_GeometryType, ST_GeometryType, ST_GeometryType, ST_Intersection, ST_Intersects, ST_Intersects, ST_IsEmpty, ST_IsEmpty, ST_IsEmpty, ST_IsSimple, ST_IsSimple, ST_IsSimple, ST_IsValid, ST_IsValid, ST_IsValid, ST_Length, ST_Length, ST_Length, ST_NumGeometries, ST_NumGeometries, ST_NumGeometries, ST_NumPoints, ST_NumPoints, ST_NumPoints, ST_Overlaps, ST_PointFromGeoHash, ST_PointN, ST_PointN, ST_PointN, ST_Relate, ST_SRID, ST_SRID, ST_SRID, ST_Simplify, ST_SimplifyPreserveTopology, ST_SymDifference, ST_Touches, ST_Touches, ST_Touches, ST_Transform, ST_Union, ST_Union, ST_Within, ST_Within, ST_Within, ST_X, ST_X, ST_X, ST_XMax, ST_XMax, ST_XMax, ST_XMin, ST_XMin, ST_XMin, ST_Y, ST_Y, ST_Y, ST_YMax, ST_YMax, ST_YMax, ST_YMin, ST_YMin, ST_YMin, ST_intersects, SetMapKeys, Summarize_CatCol, Summarize_CatCol, Summarize_CatCol, Summarize_CatCol, Summarize_CatCol, Summarize_NumCol, Unnest, VoltageSecureAccess, VoltageSecureAccess, VoltageSecureConfigure, VoltageSecureConfigureGlobal, VoltageSecureProtect, VoltageSecureProtect, VoltageSecureProtectAllKeys, VoltageSecureRefreshPolicy, VoltageSecureVersion, append_centers, apply_bisecting_kmeans, apply_iforest, apply_inverse_pca, apply_inverse_svd, apply_kmeans, apply_kprototypes, apply_normalize, apply_one_hot_encoder, apply_pca, apply_svd, approximate_quantiles, ar_create_blobs, ar_final_newton, ar_save_model, ar_transition_newton, arima_bfgs, arima_line_search, arima_save_model, avg_all_columns_local, bisecting_kmeans_init_model, bk_apply_best_kmeans_results, bk_compute_totss_local, bk_finalize_model, bk_get_rows_in_active_cluster, bk_kmeans_compute_local_centers, bk_kmeans_compute_withinss, bk_kmeans_fast_random_init, bk_kmeans_slow_random_init, bk_kmeanspp_init_cur_cluster, bk_kmeanspp_reset_blob, bk_kmeanspp_select_new_centers, bk_kmeanspp_within_chunk_sum, bk_save_final_model, bk_write_new_cluster_level, blob_to_table, bufUdx, bufUdx, calc_pseudo_centers, calculate_alpha_linear, calculate_hessian_linear1, calculate_hessian_linear2, chi_squared, cleanup_kmeans_files, compute_and_save_global_center, compute_and_save_new_centers, compute_local_totss, compute_local_withinss, compute_new_local_centers, confusion_matrix, coordinate_descent_covariance, corr_matrix, count_rows_in_blob, create_aggregator_blob, error_rate, evaluate_naive_bayes_model, evaluate_reg_model, evaluate_svm_model, export_model_files, finalize_blob_resource_group, get_attr_minmax, get_attr_robust_zscore, get_attr_zscore, get_model_attribute, get_model_summary, get_robust_zscore_median, iforest_create_blobs, iforest_phase0_udf1, iforest_phase0_udf2, iforest_phase1_udf1, iforest_phase1_udf2, iforest_phase1_udf3, iforest_phase1_udf4, iforest_phase2_udf1, iforest_phase2_udf2, iforest_phase2_udf3, iforest_phase2_udf4, iforest_save_model, import_model_files, isOrContains, kmeansAddMetricsToModel, kmeans_init_blobs, kmeans_to_write_final_centers, lift_table, line_search_logistic1, line_search_logistic2, load_rows_into_blocks, map_factor, math_op, matrix_global_xtx, matrix_local_xtx, mode_finder, model_converter, naive_bayes_phase1, naive_bayes_phase1_blob, naive_bayes_phase2, pca_prep1_global, pca_prep1_local, pca_prep2, pmml_parser, predict_arima, predict_autoregressor, predict_linear_reg, predict_logistic_reg, predict_moving_average, predict_naive_bayes, predict_naive_bayes_classes, predict_pmml, predict_poisson_reg, predict_rf_classifier, predict_rf_classifier_classes, predict_rf_regressor, predict_svm_classifier, predict_svm_regressor, predict_xgb_classifier, predict_xgb_classifier_classes, predict_xgb_regressor, random_init, random_init_write, read_from_dfblob, read_map_factor, read_ptree, read_tree, reg_final_bfgs, reg_final_newton, reg_transition_bfgs, reg_transition_newton, reg_write_model, remove_blob, reverse_normalize, rf_blob, rf_clean, rf_phase0_udf1, rf_phase0_udf2, rf_phase1_udf1, rf_phase1_udf2, rf_phase1_udf3, rf_phase1_udf4, rf_phase2_udf1, rf_phase2_udf2, rf_phase2_udf3, rf_phase2_udf4, rf_predictor_importance, rf_save_model, rsquared, save_cv_result, save_pca_model, save_svd_model, save_svm_model, select_new_centers, store_minmax_model, store_one_hot_encoder_model, store_robust_zscore_model, store_zscore_model, table_to_blob, table_to_dfblob, tokenize, topk, update_and_return_sum_of_squared_distances, upgrade_model_format, writeInitialKmeansModelToDfs, xgb_create_blobs, xgb_phase0_udf1, xgb_phase0_udf2, xgb_phase1_udf1, xgb_phase1_udf2, xgb_phase1_udf3, xgb_phase2_udf1, xgb_phase2_udf2, xgb_phase2_udf3, xgb_predictor_importance, xgb_prune, xgb_save_model, yule_walker, ",
-                "udx_language": "ComplexTypesLib -- Functions for Complex Types |  DelimitedExportLib -- Delimited data export package |  JsonExportLib -- Json data export package |  MachineLearningLib -- Machine learning package |  OrcExportLib -- Orc export package |  ParquetExportLib -- Parquet export package |  ApproximateLib -- Approximate package |  FlexTableLib -- Flexible Tables Data Load and Query |  KafkaLib -- Kafka streaming load and export |  PlaceLib -- Geospatial package |  VoltageSecureLib -- Voltage SecureData Connector |  TransformFunctions -- User-defined Python library |  "
+                "udx_language": "ApproximateLib -- Approximate package |  FlexTableLib -- Flexible Tables Data Load and Query |  OrcExportLib -- Orc export package |  JsonExportLib -- Json data export package |  PlaceLib -- Geospatial package |  ParquetExportLib -- Parquet export package |  ComplexTypesLib -- Functions for Complex Types |  VoltageSecureLib -- Voltage SecureData Connector |  KafkaLib -- Kafka streaming load and export |  MachineLearningLib -- Machine learning package |  DelimitedExportLib -- Delimited data export package |  TransformFunctions -- User-defined Python library |  "
             },
             "name": "public"
         }
@@ -6142,7 +6144,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
+    "entityUrn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -6158,7 +6160,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
+    "entityUrn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -6174,7 +6176,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
+    "entityUrn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -6192,12 +6194,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
+    "entityUrn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+            "container": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
         }
     },
     "systemMetadata": {
@@ -6239,7 +6241,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -6304,7 +6306,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6317,7 +6319,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6330,7 +6332,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=18)",
+                                "nativeDataType": "VARCHAR(18)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6343,7 +6345,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=9)",
+                                "nativeDataType": "VARCHAR(9)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6356,7 +6358,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6369,7 +6371,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6382,7 +6384,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6395,7 +6397,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6408,7 +6410,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6421,7 +6423,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6434,7 +6436,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6447,7 +6449,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=9)",
+                                "nativeDataType": "VARCHAR(9)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6460,7 +6462,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6473,7 +6475,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=7)",
+                                "nativeDataType": "CHAR(7)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6486,7 +6488,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6499,7 +6501,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=7)",
+                                "nativeDataType": "CHAR(7)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6512,7 +6514,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6525,7 +6527,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6538,7 +6540,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=10)",
+                                "nativeDataType": "VARCHAR(10)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6551,7 +6553,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=7)",
+                                "nativeDataType": "CHAR(7)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6564,7 +6566,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -6607,12 +6609,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -6656,7 +6658,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -6721,7 +6723,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6734,7 +6736,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6747,7 +6749,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=128)",
+                                "nativeDataType": "VARCHAR(128)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6760,7 +6762,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6773,7 +6775,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6786,7 +6788,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6799,7 +6801,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6812,7 +6814,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6825,7 +6827,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6838,7 +6840,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6851,7 +6853,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6864,7 +6866,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6877,7 +6879,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6890,7 +6892,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6903,7 +6905,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6916,7 +6918,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6929,7 +6931,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6942,7 +6944,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6955,7 +6957,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6968,7 +6970,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -6981,7 +6983,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -7024,12 +7026,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -7073,7 +7075,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -7138,7 +7140,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7151,7 +7153,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=128)",
+                                "nativeDataType": "VARCHAR(128)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7164,7 +7166,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7177,7 +7179,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7190,7 +7192,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7203,7 +7205,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7216,7 +7218,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7229,7 +7231,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7242,7 +7244,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=128)",
+                                "nativeDataType": "VARCHAR(128)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7255,7 +7257,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7268,7 +7270,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7281,7 +7283,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -7324,12 +7326,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -7373,7 +7375,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -7438,7 +7440,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7451,7 +7453,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7464,7 +7466,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7477,7 +7479,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7490,7 +7492,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=2)",
+                                "nativeDataType": "CHAR(2)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7503,7 +7505,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7516,7 +7518,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7529,7 +7531,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -7572,12 +7574,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -7621,7 +7623,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -7686,7 +7688,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7699,7 +7701,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=16)",
+                                "nativeDataType": "VARCHAR(16)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7712,7 +7714,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=256)",
+                                "nativeDataType": "VARCHAR(256)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7725,7 +7727,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=8)",
+                                "nativeDataType": "VARCHAR(8)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7738,7 +7740,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=8)",
+                                "nativeDataType": "VARCHAR(8)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7751,7 +7753,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7764,7 +7766,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=256)",
+                                "nativeDataType": "VARCHAR(256)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7777,7 +7779,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7790,7 +7792,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=2)",
+                                "nativeDataType": "CHAR(2)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7803,7 +7805,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7816,7 +7818,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7829,7 +7831,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7842,7 +7844,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7855,7 +7857,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7868,7 +7870,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7881,7 +7883,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7894,7 +7896,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7907,7 +7909,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7920,7 +7922,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7933,7 +7935,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -7946,7 +7948,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -7989,12 +7991,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -8038,7 +8040,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -8103,7 +8105,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8116,7 +8118,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=8)",
+                                "nativeDataType": "VARCHAR(8)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8129,7 +8131,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=8)",
+                                "nativeDataType": "VARCHAR(8)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8142,7 +8144,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8155,7 +8157,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=8)",
+                                "nativeDataType": "VARCHAR(8)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8168,7 +8170,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8181,7 +8183,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8194,7 +8196,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8207,7 +8209,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=256)",
+                                "nativeDataType": "VARCHAR(256)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8220,7 +8222,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8233,7 +8235,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=2)",
+                                "nativeDataType": "CHAR(2)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8246,7 +8248,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=32)",
+                                "nativeDataType": "CHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8259,7 +8261,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8272,7 +8274,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8285,7 +8287,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8298,7 +8300,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8311,7 +8313,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8324,7 +8326,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -8367,12 +8369,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -8416,7 +8418,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -8481,7 +8483,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8494,7 +8496,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=20)",
+                                "nativeDataType": "VARCHAR(20)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8507,7 +8509,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=256)",
+                                "nativeDataType": "VARCHAR(256)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8520,7 +8522,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=60)",
+                                "nativeDataType": "VARCHAR(60)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8533,7 +8535,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=2)",
+                                "nativeDataType": "CHAR(2)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8546,7 +8548,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -8589,12 +8591,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -8638,7 +8640,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -8703,7 +8705,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8716,7 +8718,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=30)",
+                                "nativeDataType": "CHAR(30)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8729,7 +8731,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=10)",
+                                "nativeDataType": "CHAR(10)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8742,7 +8744,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=20)",
+                                "nativeDataType": "CHAR(20)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -8785,12 +8787,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -8834,7 +8836,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -8899,7 +8901,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8912,7 +8914,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8925,7 +8927,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8938,7 +8940,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8951,7 +8953,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -8964,7 +8966,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -9007,12 +9009,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -9056,7 +9058,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -9121,7 +9123,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9134,7 +9136,7 @@
                                         "com.linkedin.pegasus2avro.schema.TimeType": {}
                                     }
                                 },
-                                "nativeDataType": "TIMESTAMP_WITH_PRECISION()",
+                                "nativeDataType": "TIMESTAMP",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9147,7 +9149,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -9190,12 +9192,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -9239,7 +9241,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -9304,7 +9306,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -9347,12 +9349,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -9396,7 +9398,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+            "container": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
         }
     },
     "systemMetadata": {
@@ -9461,7 +9463,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=128)",
+                                "nativeDataType": "VARCHAR(128)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -9504,12 +9506,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4",
-                    "urn": "urn:li:container:eb682025a9113b5543ec7ed26bfa21e4"
+                    "id": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705",
+                    "urn": "urn:li:container:6f2fa3ed5b7c2d4f7cb8eeaefb9fb705"
                 }
             ]
         }
@@ -9522,7 +9524,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:342b43fc61f85b16580be55c11e89787",
+    "entityUrn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -9530,7 +9532,7 @@
             "customProperties": {
                 "platform": "vertica",
                 "env": "PROD",
-                "database": "vmart",
+                "database": "Vmart",
                 "schema": "store",
                 "projection_count": "3",
                 "udx_list": "",
@@ -9547,7 +9549,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:342b43fc61f85b16580be55c11e89787",
+    "entityUrn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -9563,7 +9565,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:342b43fc61f85b16580be55c11e89787",
+    "entityUrn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -9579,7 +9581,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:342b43fc61f85b16580be55c11e89787",
+    "entityUrn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -9597,12 +9599,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:342b43fc61f85b16580be55c11e89787",
+    "entityUrn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+            "container": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
         }
     },
     "systemMetadata": {
@@ -9644,7 +9646,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:342b43fc61f85b16580be55c11e89787"
+            "container": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44"
         }
     },
     "systemMetadata": {
@@ -9709,7 +9711,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9722,7 +9724,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9735,7 +9737,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9748,7 +9750,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=256)",
+                                "nativeDataType": "VARCHAR(256)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9761,7 +9763,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9774,7 +9776,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=2)",
+                                "nativeDataType": "CHAR(2)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9787,7 +9789,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9800,7 +9802,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9813,7 +9815,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9826,7 +9828,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9839,7 +9841,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9852,7 +9854,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9865,7 +9867,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9878,7 +9880,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9891,7 +9893,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9904,7 +9906,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9917,7 +9919,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -9930,7 +9932,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -9973,12 +9975,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:342b43fc61f85b16580be55c11e89787",
-                    "urn": "urn:li:container:342b43fc61f85b16580be55c11e89787"
+                    "id": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
+                    "urn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44"
                 }
             ]
         }
@@ -10022,7 +10024,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:342b43fc61f85b16580be55c11e89787"
+            "container": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44"
         }
     },
     "systemMetadata": {
@@ -10087,7 +10089,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10100,7 +10102,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10113,7 +10115,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10126,7 +10128,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10139,7 +10141,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10152,7 +10154,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10165,7 +10167,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10178,7 +10180,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10191,7 +10193,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10204,7 +10206,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10217,7 +10219,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10230,7 +10232,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10243,7 +10245,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=16)",
+                                "nativeDataType": "VARCHAR(16)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10256,7 +10258,7 @@
                                         "com.linkedin.pegasus2avro.schema.TimeType": {}
                                     }
                                 },
-                                "nativeDataType": "TIME()",
+                                "nativeDataType": "TIME",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10269,7 +10271,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=8)",
+                                "nativeDataType": "VARCHAR(8)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10282,7 +10284,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10295,7 +10297,7 @@
                                         "com.linkedin.pegasus2avro.schema.TimeType": {}
                                     }
                                 },
-                                "nativeDataType": "TIMESTAMP_WITH_PRECISION()",
+                                "nativeDataType": "TIMESTAMP",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -10338,12 +10340,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:342b43fc61f85b16580be55c11e89787",
-                    "urn": "urn:li:container:342b43fc61f85b16580be55c11e89787"
+                    "id": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
+                    "urn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44"
                 }
             ]
         }
@@ -10387,7 +10389,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:342b43fc61f85b16580be55c11e89787"
+            "container": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44"
         }
     },
     "systemMetadata": {
@@ -10452,7 +10454,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10465,7 +10467,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10478,7 +10480,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10491,7 +10493,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10504,7 +10506,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10517,7 +10519,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10530,7 +10532,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10543,7 +10545,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10556,7 +10558,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10569,7 +10571,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10582,7 +10584,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10595,7 +10597,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10608,7 +10610,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=32)",
+                                "nativeDataType": "VARCHAR(32)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10621,7 +10623,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10634,7 +10636,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10647,7 +10649,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10660,7 +10662,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10673,7 +10675,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10686,7 +10688,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -10729,12 +10731,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:342b43fc61f85b16580be55c11e89787",
-                    "urn": "urn:li:container:342b43fc61f85b16580be55c11e89787"
+                    "id": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44",
+                    "urn": "urn:li:container:2f662cbce881bdbfccbd2c74da9e0e44"
                 }
             ]
         }
@@ -10747,7 +10749,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
+    "entityUrn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
     "changeType": "UPSERT",
     "aspectName": "containerProperties",
     "aspect": {
@@ -10755,7 +10757,7 @@
             "customProperties": {
                 "platform": "vertica",
                 "env": "PROD",
-                "database": "vmart",
+                "database": "Vmart",
                 "schema": "online_sales",
                 "projection_count": "3",
                 "udx_list": "",
@@ -10772,7 +10774,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
+    "entityUrn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -10788,7 +10790,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
+    "entityUrn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -10804,7 +10806,7 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
+    "entityUrn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
     "changeType": "UPSERT",
     "aspectName": "subTypes",
     "aspect": {
@@ -10822,12 +10824,12 @@
 },
 {
     "entityType": "container",
-    "entityUrn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
+    "entityUrn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
     "changeType": "UPSERT",
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+            "container": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
         }
     },
     "systemMetadata": {
@@ -10869,7 +10871,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:ae8df3182db1bb8b3a612998126beae7"
+            "container": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557"
         }
     },
     "systemMetadata": {
@@ -10934,7 +10936,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10947,7 +10949,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10960,7 +10962,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10973,7 +10975,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10986,7 +10988,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=100)",
+                                "nativeDataType": "VARCHAR(100)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -10999,7 +11001,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=100)",
+                                "nativeDataType": "VARCHAR(100)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -11042,12 +11044,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
-                    "urn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7"
+                    "id": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
+                    "urn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557"
                 }
             ]
         }
@@ -11091,7 +11093,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:ae8df3182db1bb8b3a612998126beae7"
+            "container": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557"
         }
     },
     "systemMetadata": {
@@ -11156,7 +11158,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11169,7 +11171,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11182,7 +11184,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11195,7 +11197,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11208,7 +11210,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=50)",
+                                "nativeDataType": "VARCHAR(50)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11221,7 +11223,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11234,7 +11236,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=20)",
+                                "nativeDataType": "CHAR(20)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11247,7 +11249,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=40)",
+                                "nativeDataType": "VARCHAR(40)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11260,7 +11262,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=256)",
+                                "nativeDataType": "VARCHAR(256)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11273,7 +11275,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11286,7 +11288,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "CHAR(length=2)",
+                                "nativeDataType": "CHAR(2)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11299,7 +11301,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=64)",
+                                "nativeDataType": "VARCHAR(64)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -11342,12 +11344,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
-                    "urn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7"
+                    "id": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
+                    "urn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557"
                 }
             ]
         }
@@ -11391,7 +11393,7 @@
     "aspectName": "container",
     "aspect": {
         "json": {
-            "container": "urn:li:container:ae8df3182db1bb8b3a612998126beae7"
+            "container": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557"
         }
     },
     "systemMetadata": {
@@ -11456,7 +11458,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11469,7 +11471,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11482,7 +11484,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11495,7 +11497,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11508,7 +11510,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11521,7 +11523,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11534,7 +11536,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11547,7 +11549,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11560,7 +11562,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11573,7 +11575,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11586,7 +11588,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11599,7 +11601,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "INTEGER()",
+                                "nativeDataType": "INTEGER",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11612,7 +11614,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11625,7 +11627,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11638,7 +11640,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11651,7 +11653,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11664,7 +11666,7 @@
                                         "com.linkedin.pegasus2avro.schema.NumberType": {}
                                     }
                                 },
-                                "nativeDataType": "FLOAT()",
+                                "nativeDataType": "FLOAT",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11677,7 +11679,7 @@
                                         "com.linkedin.pegasus2avro.schema.StringType": {}
                                     }
                                 },
-                                "nativeDataType": "VARCHAR(length=16)",
+                                "nativeDataType": "VARCHAR(16)",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11690,7 +11692,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             },
@@ -11703,7 +11705,7 @@
                                         "com.linkedin.pegasus2avro.schema.DateType": {}
                                     }
                                 },
-                                "nativeDataType": "DATE()",
+                                "nativeDataType": "DATE",
                                 "recursive": false,
                                 "isPartOfKey": false
                             }
@@ -11746,12 +11748,12 @@
         "json": {
             "path": [
                 {
-                    "id": "urn:li:container:343f520ad0fb3259b298736800bb1385",
-                    "urn": "urn:li:container:343f520ad0fb3259b298736800bb1385"
+                    "id": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295",
+                    "urn": "urn:li:container:22a1e700b43e78dd5f8b2603aae8e295"
                 },
                 {
-                    "id": "urn:li:container:ae8df3182db1bb8b3a612998126beae7",
-                    "urn": "urn:li:container:ae8df3182db1bb8b3a612998126beae7"
+                    "id": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557",
+                    "urn": "urn:li:container:5df74c9464cf21d65e8b02a1977ab557"
                 }
             ]
         }
diff --git a/metadata-ingestion/tests/performance/bigquery/test_bigquery_usage.py b/metadata-ingestion/tests/performance/bigquery/test_bigquery_usage.py
index 92ad7b383dc1c0..9cb80ff02657bb 100644
--- a/metadata-ingestion/tests/performance/bigquery/test_bigquery_usage.py
+++ b/metadata-ingestion/tests/performance/bigquery/test_bigquery_usage.py
@@ -6,12 +6,12 @@
 import humanfriendly
 import psutil
 
-from datahub.emitter.mce_builder import make_dataset_urn
 from datahub.ingestion.source.bigquery_v2.bigquery_config import (
     BigQueryUsageConfig,
     BigQueryV2Config,
 )
 from datahub.ingestion.source.bigquery_v2.bigquery_report import BigQueryV2Report
+from datahub.ingestion.source.bigquery_v2.common import BigQueryIdentifierBuilder
 from datahub.ingestion.source.bigquery_v2.usage import BigQueryUsageExtractor
 from datahub.sql_parsing.schema_resolver import SchemaResolver
 from datahub.utilities.perf_timer import PerfTimer
@@ -49,9 +49,7 @@ def run_test():
         config,
         report,
         schema_resolver=SchemaResolver(platform="bigquery"),
-        dataset_urn_builder=lambda ref: make_dataset_urn(
-            "bigquery", str(ref.table_identifier)
-        ),
+        identifiers=BigQueryIdentifierBuilder(config, report),
     )
     report.set_ingestion_stage("All", "Event Generation")
 
diff --git a/metadata-ingestion/tests/performance/data_model.py b/metadata-ingestion/tests/performance/data_model.py
index 728bb6ddde2157..99b8820b45fba9 100644
--- a/metadata-ingestion/tests/performance/data_model.py
+++ b/metadata-ingestion/tests/performance/data_model.py
@@ -2,11 +2,12 @@
 from collections import OrderedDict
 from dataclasses import dataclass, field
 from datetime import datetime
-from enum import Enum
 from typing import Dict, List, Optional, Union
 
 from typing_extensions import Literal
 
+from datahub.utilities.str_enum import StrEnum
+
 StatementType = Literal[  # SELECT + values from OperationTypeClass
     "SELECT",
     "INSERT",
@@ -26,7 +27,7 @@ class Container:
     parent: Optional["Container"] = None
 
 
-class ColumnType(str, Enum):
+class ColumnType(StrEnum):
     # Can add types that take parameters in the future
 
     INTEGER = "INTEGER"
diff --git a/metadata-ingestion/tests/test_helpers/docker_helpers.py b/metadata-ingestion/tests/test_helpers/docker_helpers.py
index bacb8d80b9e721..20aec975787e4e 100644
--- a/metadata-ingestion/tests/test_helpers/docker_helpers.py
+++ b/metadata-ingestion/tests/test_helpers/docker_helpers.py
@@ -1,52 +1,16 @@
-import contextlib
 import logging
 import os
 import subprocess
-from typing import Callable, Iterator, List, Optional, Union
 
 import pytest
-import pytest_docker.plugin
 
-logger = logging.getLogger(__name__)
-
-
-def is_responsive(container_name: str, port: int, hostname: Optional[str]) -> bool:
-    """A cheap way to figure out if a port is responsive on a container"""
-    if hostname:
-        cmd = f"docker exec {container_name} /bin/bash -c 'echo -n > /dev/tcp/{hostname}/{port}'"
-    else:
-        # use the hostname of the container
-        cmd = f"docker exec {container_name} /bin/bash -c 'c_host=`hostname`;echo -n > /dev/tcp/$c_host/{port}'"
-    ret = subprocess.run(
-        cmd,
-        shell=True,
-    )
-    return ret.returncode == 0
+from datahub.testing.docker_utils import (  # noqa: F401
+    docker_compose_runner,
+    is_responsive,
+    wait_for_port,
+)
 
-
-def wait_for_port(
-    docker_services: pytest_docker.plugin.Services,
-    container_name: str,
-    container_port: int,
-    hostname: Optional[str] = None,
-    timeout: float = 30.0,
-    pause: float = 0.5,
-    checker: Optional[Callable[[], bool]] = None,
-) -> None:
-    try:
-        docker_services.wait_until_responsive(
-            timeout=timeout,
-            pause=pause,
-            check=(
-                checker
-                if checker
-                else lambda: is_responsive(container_name, container_port, hostname)
-            ),
-        )
-        logger.info(f"Container {container_name} is ready!")
-    finally:
-        # use check=True to raise an error if command gave bad exit code
-        subprocess.run(f"docker logs {container_name}", shell=True, check=True)
+logger = logging.getLogger(__name__)
 
 
 @pytest.fixture(scope="session")
@@ -58,28 +22,6 @@ def docker_compose_command():
     return "docker compose"
 
 
-@pytest.fixture(scope="module")
-def docker_compose_runner(
-    docker_compose_command, docker_compose_project_name, docker_setup, docker_cleanup
-):
-    @contextlib.contextmanager
-    def run(
-        compose_file_path: Union[str, List[str]], key: str, cleanup: bool = True
-    ) -> Iterator[pytest_docker.plugin.Services]:
-        with pytest_docker.plugin.get_docker_services(
-            docker_compose_command=docker_compose_command,
-            # We can remove the type ignore once this is merged:
-            # https://github.com/avast/pytest-docker/pull/108
-            docker_compose_file=compose_file_path,  # type: ignore
-            docker_compose_project_name=f"{docker_compose_project_name}-{key}",
-            docker_setup=docker_setup,
-            docker_cleanup=docker_cleanup if cleanup else [],
-        ) as docker_services:
-            yield docker_services
-
-    return run
-
-
 def cleanup_image(image_name: str) -> None:
     assert ":" not in image_name, "image_name should not contain a tag"
 
diff --git a/metadata-ingestion/tests/unit/api/entities/dataproducts/golden_dataproduct_out_upsert.json b/metadata-ingestion/tests/unit/api/entities/dataproducts/golden_dataproduct_out_upsert.json
index 66bc2ce0c2a0c0..8d072030d1209b 100644
--- a/metadata-ingestion/tests/unit/api/entities/dataproducts/golden_dataproduct_out_upsert.json
+++ b/metadata-ingestion/tests/unit/api/entities/dataproducts/golden_dataproduct_out_upsert.json
@@ -5,8 +5,59 @@
     "changeType": "PATCH",
     "aspectName": "dataProductProperties",
     "aspect": {
-        "value": "[{\"op\": \"add\", \"path\": \"/name\", \"value\": \"Pet of the Week Campaign\"}, {\"op\": \"add\", \"path\": \"/assets\", \"value\": [{\"destinationUrn\": \"urn:li:container:DATABASE\", \"created\": {\"time\": 1681455600000, \"actor\": \"urn:li:corpuser:datahub\", \"message\": \"yaml\"}}, {\"destinationUrn\": \"urn:li:container:SCHEMA\", \"created\": {\"time\": 1681455600000, \"actor\": \"urn:li:corpuser:datahub\", \"message\": \"yaml\"}}, {\"destinationUrn\": \"urn:li:mlFeatureTable:(urn:li:dataPlatform:feast,test_feature_table_all_feature_dtypes)\", \"created\": {\"time\": 1681455600000, \"actor\": \"urn:li:corpuser:datahub\", \"message\": \"yaml\"}}]}, {\"op\": \"add\", \"path\": \"/customProperties\", \"value\": {\"version\": \"2.0\", \"classification\": \"pii\"}}, {\"op\": \"add\", \"path\": \"/externalUrl\", \"value\": \"https://github.com/datahub-project/datahub\"}]",
-        "contentType": "application/json-patch+json"
+        "json": [
+            {
+                "op": "add",
+                "path": "/name",
+                "value": "Pet of the Week Campaign"
+            },
+            {
+                "op": "add",
+                "path": "/assets",
+                "value": [
+                    {
+                        "destinationUrn": "urn:li:container:DATABASE",
+                        "created": {
+                            "time": 1681455600000,
+                            "actor": "urn:li:corpuser:datahub",
+                            "message": "yaml"
+                        },
+                        "outputPort": false
+                    },
+                    {
+                        "destinationUrn": "urn:li:container:SCHEMA",
+                        "created": {
+                            "time": 1681455600000,
+                            "actor": "urn:li:corpuser:datahub",
+                            "message": "yaml"
+                        },
+                        "outputPort": false
+                    },
+                    {
+                        "destinationUrn": "urn:li:mlFeatureTable:(urn:li:dataPlatform:feast,test_feature_table_all_feature_dtypes)",
+                        "created": {
+                            "time": 1681455600000,
+                            "actor": "urn:li:corpuser:datahub",
+                            "message": "yaml"
+                        },
+                        "outputPort": false
+                    }
+                ]
+            },
+            {
+                "op": "add",
+                "path": "/customProperties",
+                "value": {
+                    "version": "2.0",
+                    "classification": "pii"
+                }
+            },
+            {
+                "op": "add",
+                "path": "/externalUrl",
+                "value": "https://github.com/datahub-project/datahub"
+            }
+        ]
     }
 },
 {
@@ -70,6 +121,7 @@
                     "type": "BUSINESS_OWNER"
                 }
             ],
+            "ownerTypes": {},
             "lastModified": {
                 "time": 0,
                 "actor": "urn:li:corpuser:unknown"
diff --git a/metadata-ingestion/tests/unit/glue/glue_mces_golden.json b/metadata-ingestion/tests/unit/glue/glue_mces_golden.json
index c688eb9a2d1150..77e8354e657a66 100644
--- a/metadata-ingestion/tests/unit/glue/glue_mces_golden.json
+++ b/metadata-ingestion/tests/unit/glue/glue_mces_golden.json
@@ -1,1342 +1,1342 @@
 [
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:0b9f1f731ecf6743be6207fec3dc9cba",
-    "changeType": "UPSERT",
-    "aspectName": "containerProperties",
-    "aspect": {
-        "json": {
-            "customProperties": {
-                "platform": "glue",
-                "env": "PROD",
-                "database": "flights-database",
-                "param1": "value1",
-                "param2": "value2",
-                "LocationUri": "s3://test-bucket/test-prefix",
-                "CreateTime": "June 09, 2021 at 14:14:19"
-            },
-            "name": "flights-database",
-            "qualifiedName": "arn:aws:glue:us-west-2:123412341234:database/flights-database"
+    {
+        "entityType": "container",
+        "entityUrn": "urn:li:container:0b9f1f731ecf6743be6207fec3dc9cba",
+        "changeType": "UPSERT",
+        "aspectName": "containerProperties",
+        "aspect": {
+            "json": {
+                "customProperties": {
+                    "platform": "glue",
+                    "env": "PROD",
+                    "database": "flights-database",
+                    "param1": "value1",
+                    "param2": "value2",
+                    "LocationUri": "s3://test-bucket/test-prefix",
+                    "CreateTime": "June 09, 2021 at 14:14:19"
+                },
+                "name": "flights-database",
+                "qualifiedName": "arn:aws:glue:us-west-2:123412341234:database/flights-database"
+            }
         }
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:0b9f1f731ecf6743be6207fec3dc9cba",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
+    },
+    {
+        "entityType": "container",
+        "entityUrn": "urn:li:container:0b9f1f731ecf6743be6207fec3dc9cba",
+        "changeType": "UPSERT",
+        "aspectName": "status",
+        "aspect": {
+            "json": {
+                "removed": false
+            }
         }
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:0b9f1f731ecf6743be6207fec3dc9cba",
-    "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
-    "aspect": {
-        "json": {
-            "platform": "urn:li:dataPlatform:glue"
+    },
+    {
+        "entityType": "container",
+        "entityUrn": "urn:li:container:0b9f1f731ecf6743be6207fec3dc9cba",
+        "changeType": "UPSERT",
+        "aspectName": "dataPlatformInstance",
+        "aspect": {
+            "json": {
+                "platform": "urn:li:dataPlatform:glue"
+            }
         }
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:0b9f1f731ecf6743be6207fec3dc9cba",
-    "changeType": "UPSERT",
-    "aspectName": "subTypes",
-    "aspect": {
-        "json": {
-            "typeNames": [
-                "Database"
-            ]
+    },
+    {
+        "entityType": "container",
+        "entityUrn": "urn:li:container:0b9f1f731ecf6743be6207fec3dc9cba",
+        "changeType": "UPSERT",
+        "aspectName": "subTypes",
+        "aspect": {
+            "json": {
+                "typeNames": [
+                    "Database"
+                ]
+            }
         }
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:bdf4342ea6899d162eae685bfe9074a7",
-    "changeType": "UPSERT",
-    "aspectName": "containerProperties",
-    "aspect": {
-        "json": {
-            "customProperties": {
-                "platform": "glue",
-                "env": "PROD",
-                "database": "test-database",
-                "CreateTime": "June 01, 2021 at 14:55:02"
-            },
-            "name": "test-database",
-            "qualifiedName": "arn:aws:glue:us-west-2:123412341234:database/test-database"
+    },
+    {
+        "entityType": "container",
+        "entityUrn": "urn:li:container:bdf4342ea6899d162eae685bfe9074a7",
+        "changeType": "UPSERT",
+        "aspectName": "containerProperties",
+        "aspect": {
+            "json": {
+                "customProperties": {
+                    "platform": "glue",
+                    "env": "PROD",
+                    "database": "test-database",
+                    "CreateTime": "June 01, 2021 at 14:55:02"
+                },
+                "name": "test-database",
+                "qualifiedName": "arn:aws:glue:us-west-2:123412341234:database/test-database"
+            }
         }
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:bdf4342ea6899d162eae685bfe9074a7",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
+    },
+    {
+        "entityType": "container",
+        "entityUrn": "urn:li:container:bdf4342ea6899d162eae685bfe9074a7",
+        "changeType": "UPSERT",
+        "aspectName": "status",
+        "aspect": {
+            "json": {
+                "removed": false
+            }
         }
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:bdf4342ea6899d162eae685bfe9074a7",
-    "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
-    "aspect": {
-        "json": {
-            "platform": "urn:li:dataPlatform:glue"
+    },
+    {
+        "entityType": "container",
+        "entityUrn": "urn:li:container:bdf4342ea6899d162eae685bfe9074a7",
+        "changeType": "UPSERT",
+        "aspectName": "dataPlatformInstance",
+        "aspect": {
+            "json": {
+                "platform": "urn:li:dataPlatform:glue"
+            }
         }
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:bdf4342ea6899d162eae685bfe9074a7",
-    "changeType": "UPSERT",
-    "aspectName": "subTypes",
-    "aspect": {
-        "json": {
-            "typeNames": [
-                "Database"
-            ]
+    },
+    {
+        "entityType": "container",
+        "entityUrn": "urn:li:container:bdf4342ea6899d162eae685bfe9074a7",
+        "changeType": "UPSERT",
+        "aspectName": "subTypes",
+        "aspect": {
+            "json": {
+                "typeNames": [
+                    "Database"
+                ]
+            }
         }
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:110bc08849d1c1bde5fc345dab5c3ae7",
-    "changeType": "UPSERT",
-    "aspectName": "containerProperties",
-    "aspect": {
-        "json": {
-            "customProperties": {
-                "platform": "glue",
-                "env": "PROD",
-                "database": "empty-database",
-                "CreateTime": "June 01, 2021 at 14:55:13"
-            },
-            "name": "empty-database",
-            "qualifiedName": "arn:aws:glue:us-west-2:123412341234:database/empty-database"
+    },
+    {
+        "entityType": "container",
+        "entityUrn": "urn:li:container:110bc08849d1c1bde5fc345dab5c3ae7",
+        "changeType": "UPSERT",
+        "aspectName": "containerProperties",
+        "aspect": {
+            "json": {
+                "customProperties": {
+                    "platform": "glue",
+                    "env": "PROD",
+                    "database": "empty-database",
+                    "CreateTime": "June 01, 2021 at 14:55:13"
+                },
+                "name": "empty-database",
+                "qualifiedName": "arn:aws:glue:us-west-2:123412341234:database/empty-database"
+            }
         }
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:110bc08849d1c1bde5fc345dab5c3ae7",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
+    },
+    {
+        "entityType": "container",
+        "entityUrn": "urn:li:container:110bc08849d1c1bde5fc345dab5c3ae7",
+        "changeType": "UPSERT",
+        "aspectName": "status",
+        "aspect": {
+            "json": {
+                "removed": false
+            }
         }
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:110bc08849d1c1bde5fc345dab5c3ae7",
-    "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
-    "aspect": {
-        "json": {
-            "platform": "urn:li:dataPlatform:glue"
+    },
+    {
+        "entityType": "container",
+        "entityUrn": "urn:li:container:110bc08849d1c1bde5fc345dab5c3ae7",
+        "changeType": "UPSERT",
+        "aspectName": "dataPlatformInstance",
+        "aspect": {
+            "json": {
+                "platform": "urn:li:dataPlatform:glue"
+            }
         }
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:110bc08849d1c1bde5fc345dab5c3ae7",
-    "changeType": "UPSERT",
-    "aspectName": "subTypes",
-    "aspect": {
-        "json": {
-            "typeNames": [
-                "Database"
-            ]
+    },
+    {
+        "entityType": "container",
+        "entityUrn": "urn:li:container:110bc08849d1c1bde5fc345dab5c3ae7",
+        "changeType": "UPSERT",
+        "aspectName": "subTypes",
+        "aspect": {
+            "json": {
+                "typeNames": [
+                    "Database"
+                ]
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
-            "urn": "urn:li:dataset:(urn:li:dataPlatform:glue,flights-database.avro,PROD)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.common.Status": {
-                        "removed": false
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
-                        "customProperties": {
-                            "CrawlerSchemaDeserializerVersion": "1.0",
-                            "CrawlerSchemaSerializerVersion": "1.0",
-                            "UPDATED_BY_CRAWLER": "flights-crawler",
-                            "averageRecordSize": "55",
-                            "avro.schema.literal": "{\"type\":\"record\",\"name\":\"flights_avro_subset\",\"namespace\":\"default\",\"fields\":[{\"name\":\"yr\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"flightdate\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"uniquecarrier\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"airlineid\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"carrier\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"flightnum\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"origin\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"dest\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"depdelay\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"carrierdelay\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"weatherdelay\",\"type\":[\"null\",\"int\"],\"default\":null}]}",
-                            "classification": "avro",
-                            "compressionType": "none",
-                            "objectCount": "30",
-                            "recordCount": "169222196",
-                            "sizeKey": "9503351413",
-                            "typeOfData": "file",
-                            "Location": "s3://crawler-public-us-west-2/flight/avro/",
-                            "InputFormat": "org.apache.hadoop.hive.ql.io.avro.AvroContainerInputFormat",
-                            "OutputFormat": "org.apache.hadoop.hive.ql.io.avro.AvroContainerOutputFormat",
-                            "Compressed": "False",
-                            "NumberOfBuckets": "-1",
-                            "SerdeInfo": "{'SerializationLibrary': 'org.apache.hadoop.hive.serde2.avro.AvroSerDe', 'Parameters': {'avro.schema.literal': '{\"type\":\"record\",\"name\":\"flights_avro_subset\",\"namespace\":\"default\",\"fields\":[{\"name\":\"yr\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"flightdate\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"uniquecarrier\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"airlineid\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"carrier\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"flightnum\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"origin\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"dest\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"depdelay\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"carrierdelay\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"weatherdelay\",\"type\":[\"null\",\"int\"],\"default\":null}]}', 'serialization.format': '1'}}",
-                            "BucketColumns": "[]",
-                            "SortColumns": "[]",
-                            "StoredAsSubDirectories": "False"
-                        },
-                        "name": "avro",
-                        "qualifiedName": "arn:aws:glue:us-west-2:123412341234:table/flights-database/avro",
-                        "tags": []
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
-                        "schemaName": "flights-database.avro",
-                        "platform": "urn:li:dataPlatform:glue",
-                        "version": 0,
-                        "created": {
-                            "time": 0,
-                            "actor": "urn:li:corpuser:unknown"
-                        },
-                        "lastModified": {
-                            "time": 0,
-                            "actor": "urn:li:corpuser:unknown"
-                        },
-                        "hash": "",
-                        "platformSchema": {
-                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
-                                "tableSchema": ""
-                            }
-                        },
-                        "fields": [
-                            {
-                                "fieldPath": "[version=2.0].[type=int].yr",
-                                "nullable": true,
-                                "description": "test comment",
-                                "type": {
-                                    "type": {
-                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
-                                    }
-                                },
-                                "nativeDataType": "int",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"int\", \"_nullable\": true}"
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+                "urn": "urn:li:dataset:(urn:li:dataPlatform:glue,flights-database.avro,PROD)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.common.Status": {
+                            "removed": false
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                            "customProperties": {
+                                "CrawlerSchemaDeserializerVersion": "1.0",
+                                "CrawlerSchemaSerializerVersion": "1.0",
+                                "UPDATED_BY_CRAWLER": "flights-crawler",
+                                "averageRecordSize": "55",
+                                "avro.schema.literal": "{\"type\":\"record\",\"name\":\"flights_avro_subset\",\"namespace\":\"default\",\"fields\":[{\"name\":\"yr\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"flightdate\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"uniquecarrier\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"airlineid\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"carrier\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"flightnum\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"origin\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"dest\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"depdelay\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"carrierdelay\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"weatherdelay\",\"type\":[\"null\",\"int\"],\"default\":null}]}",
+                                "classification": "avro",
+                                "compressionType": "none",
+                                "objectCount": "30",
+                                "recordCount": "169222196",
+                                "sizeKey": "9503351413",
+                                "typeOfData": "file",
+                                "Location": "s3://crawler-public-us-west-2/flight/avro/",
+                                "InputFormat": "org.apache.hadoop.hive.ql.io.avro.AvroContainerInputFormat",
+                                "OutputFormat": "org.apache.hadoop.hive.ql.io.avro.AvroContainerOutputFormat",
+                                "Compressed": "False",
+                                "NumberOfBuckets": "-1",
+                                "SerdeInfo": "{'SerializationLibrary': 'org.apache.hadoop.hive.serde2.avro.AvroSerDe', 'Parameters': {'avro.schema.literal': '{\"type\":\"record\",\"name\":\"flights_avro_subset\",\"namespace\":\"default\",\"fields\":[{\"name\":\"yr\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"flightdate\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"uniquecarrier\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"airlineid\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"carrier\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"flightnum\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"origin\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"dest\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"depdelay\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"carrierdelay\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"weatherdelay\",\"type\":[\"null\",\"int\"],\"default\":null}]}', 'serialization.format': '1'}}",
+                                "BucketColumns": "[]",
+                                "SortColumns": "[]",
+                                "StoredAsSubDirectories": "False"
+                            },
+                            "name": "avro",
+                            "qualifiedName": "arn:aws:glue:us-west-2:123412341234:table/flights-database/avro",
+                            "tags": []
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                            "schemaName": "flights-database.avro",
+                            "platform": "urn:li:dataPlatform:glue",
+                            "version": 0,
+                            "created": {
+                                "time": 0,
+                                "actor": "urn:li:corpuser:unknown"
                             },
-                            {
-                                "fieldPath": "[version=2.0].[type=string].flightdate",
-                                "nullable": true,
-                                "type": {
+                            "lastModified": {
+                                "time": 0,
+                                "actor": "urn:li:corpuser:unknown"
+                            },
+                            "hash": "",
+                            "platformSchema": {
+                                "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                    "tableSchema": ""
+                                }
+                            },
+                            "fields": [
+                                {
+                                    "fieldPath": "[version=2.0].[type=int].yr",
+                                    "nullable": true,
+                                    "description": "test comment",
                                     "type": {
-                                        "com.linkedin.pegasus2avro.schema.StringType": {}
-                                    }
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                        }
+                                    },
+                                    "nativeDataType": "int",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"int\", \"_nullable\": true}"
                                 },
-                                "nativeDataType": "string",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
-                            },
-                            {
-                                "fieldPath": "[version=2.0].[type=string].uniquecarrier",
-                                "nullable": true,
-                                "type": {
+                                {
+                                    "fieldPath": "[version=2.0].[type=string].flightdate",
+                                    "nullable": true,
                                     "type": {
-                                        "com.linkedin.pegasus2avro.schema.StringType": {}
-                                    }
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.StringType": {}
+                                        }
+                                    },
+                                    "nativeDataType": "string",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
                                 },
-                                "nativeDataType": "string",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
-                            },
-                            {
-                                "fieldPath": "[version=2.0].[type=int].airlineid",
-                                "nullable": true,
-                                "type": {
+                                {
+                                    "fieldPath": "[version=2.0].[type=string].uniquecarrier",
+                                    "nullable": true,
                                     "type": {
-                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
-                                    }
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.StringType": {}
+                                        }
+                                    },
+                                    "nativeDataType": "string",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
                                 },
-                                "nativeDataType": "int",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"int\", \"_nullable\": true}"
-                            },
-                            {
-                                "fieldPath": "[version=2.0].[type=string].carrier",
-                                "nullable": true,
-                                "type": {
+                                {
+                                    "fieldPath": "[version=2.0].[type=int].airlineid",
+                                    "nullable": true,
                                     "type": {
-                                        "com.linkedin.pegasus2avro.schema.StringType": {}
-                                    }
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                        }
+                                    },
+                                    "nativeDataType": "int",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"int\", \"_nullable\": true}"
                                 },
-                                "nativeDataType": "string",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
-                            },
-                            {
-                                "fieldPath": "[version=2.0].[type=string].flightnum",
-                                "nullable": true,
-                                "type": {
+                                {
+                                    "fieldPath": "[version=2.0].[type=string].carrier",
+                                    "nullable": true,
                                     "type": {
-                                        "com.linkedin.pegasus2avro.schema.StringType": {}
-                                    }
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.StringType": {}
+                                        }
+                                    },
+                                    "nativeDataType": "string",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
                                 },
-                                "nativeDataType": "string",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
-                            },
-                            {
-                                "fieldPath": "[version=2.0].[type=string].origin",
-                                "nullable": true,
-                                "type": {
+                                {
+                                    "fieldPath": "[version=2.0].[type=string].flightnum",
+                                    "nullable": true,
                                     "type": {
-                                        "com.linkedin.pegasus2avro.schema.StringType": {}
-                                    }
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.StringType": {}
+                                        }
+                                    },
+                                    "nativeDataType": "string",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
                                 },
-                                "nativeDataType": "string",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
-                            },
-                            {
-                                "fieldPath": "[version=2.0].[type=string].year",
-                                "nullable": true,
-                                "description": "partition test comment",
-                                "type": {
+                                {
+                                    "fieldPath": "[version=2.0].[type=string].origin",
+                                    "nullable": true,
                                     "type": {
-                                        "com.linkedin.pegasus2avro.schema.StringType": {}
-                                    }
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.StringType": {}
+                                        }
+                                    },
+                                    "nativeDataType": "string",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
                                 },
-                                "nativeDataType": "string",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.common.DataPlatformInstance": {
-                        "platform": "urn:li:dataPlatform:glue"
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.common.Ownership": {
-                        "owners": [
-                            {
-                                "owner": "urn:li:corpuser:owner",
-                                "type": "DATAOWNER"
-                            }
-                        ],
-                        "ownerTypes": {},
-                        "lastModified": {
-                            "time": 0,
-                            "actor": "urn:li:corpuser:unknown"
+                                {
+                                    "fieldPath": "[version=2.0].[type=string].year",
+                                    "nullable": true,
+                                    "description": "partition test comment",
+                                    "type": {
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.StringType": {}
+                                        }
+                                    },
+                                    "nativeDataType": "string",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
+                                }
+                            ]
                         }
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.common.GlobalTags": {
-                        "tags": [
-                            {
-                                "tag": "urn:li:tag:baz:bob"
-                            },
-                            {
-                                "tag": "urn:li:tag:foo:bar"
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.common.DataPlatformInstance": {
+                            "platform": "urn:li:dataPlatform:glue"
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.common.Ownership": {
+                            "owners": [
+                                {
+                                    "owner": "urn:li:corpuser:owner",
+                                    "type": "DATAOWNER"
+                                }
+                            ],
+                            "ownerTypes": {},
+                            "lastModified": {
+                                "time": 0,
+                                "actor": "urn:li:corpuser:unknown"
                             }
-                        ]
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.common.GlobalTags": {
+                            "tags": [
+                                {
+                                    "tag": "urn:li:tag:baz:bob"
+                                },
+                                {
+                                    "tag": "urn:li:tag:foo:bar"
+                                }
+                            ]
+                        }
                     }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:glue,flights-database.avro,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "subTypes",
-    "aspect": {
-        "json": {
-            "typeNames": [
-                "Table"
-            ]
+    },
+    {
+        "entityType": "dataset",
+        "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:glue,flights-database.avro,PROD)",
+        "changeType": "UPSERT",
+        "aspectName": "subTypes",
+        "aspect": {
+            "json": {
+                "typeNames": [
+                    "Table"
+                ]
+            }
         }
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:glue,flights-database.avro,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "container",
-    "aspect": {
-        "json": {
-            "container": "urn:li:container:0b9f1f731ecf6743be6207fec3dc9cba"
+    },
+    {
+        "entityType": "dataset",
+        "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:glue,flights-database.avro,PROD)",
+        "changeType": "UPSERT",
+        "aspectName": "container",
+        "aspect": {
+            "json": {
+                "container": "urn:li:container:0b9f1f731ecf6743be6207fec3dc9cba"
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
-            "urn": "urn:li:dataset:(urn:li:dataPlatform:glue,test-database.test_jsons_markers,PROD)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.common.Status": {
-                        "removed": false
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
-                        "customProperties": {
-                            "CrawlerSchemaDeserializerVersion": "1.0",
-                            "CrawlerSchemaSerializerVersion": "1.0",
-                            "UPDATED_BY_CRAWLER": "test-jsons",
-                            "averageRecordSize": "273",
-                            "classification": "json",
-                            "compressionType": "none",
-                            "objectCount": "1",
-                            "recordCount": "1",
-                            "sizeKey": "273",
-                            "typeOfData": "file",
-                            "Location": "s3://test-glue-jsons/markers/",
-                            "InputFormat": "org.apache.hadoop.mapred.TextInputFormat",
-                            "OutputFormat": "org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat",
-                            "Compressed": "False",
-                            "NumberOfBuckets": "-1",
-                            "SerdeInfo": "{'SerializationLibrary': 'org.openx.data.jsonserde.JsonSerDe', 'Parameters': {'paths': 'markers'}}",
-                            "BucketColumns": "[]",
-                            "SortColumns": "[]",
-                            "StoredAsSubDirectories": "False"
-                        },
-                        "name": "test_jsons_markers",
-                        "qualifiedName": "arn:aws:glue:us-west-2:795586375822:table/test-database/test_jsons_markers",
-                        "tags": []
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
-                        "schemaName": "test-database.test_jsons_markers",
-                        "platform": "urn:li:dataPlatform:glue",
-                        "version": 0,
-                        "created": {
-                            "time": 0,
-                            "actor": "urn:li:corpuser:unknown"
-                        },
-                        "lastModified": {
-                            "time": 0,
-                            "actor": "urn:li:corpuser:unknown"
-                        },
-                        "hash": "",
-                        "platformSchema": {
-                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
-                                "tableSchema": ""
-                            }
-                        },
-                        "fields": [
-                            {
-                                "fieldPath": "[version=2.0].[type=struct].[type=array].[type=struct].markers",
-                                "nullable": true,
-                                "type": {
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+                "urn": "urn:li:dataset:(urn:li:dataPlatform:glue,test-database.test_jsons_markers,PROD)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.common.Status": {
+                            "removed": false
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                            "customProperties": {
+                                "CrawlerSchemaDeserializerVersion": "1.0",
+                                "CrawlerSchemaSerializerVersion": "1.0",
+                                "UPDATED_BY_CRAWLER": "test-jsons",
+                                "averageRecordSize": "273",
+                                "classification": "json",
+                                "compressionType": "none",
+                                "objectCount": "1",
+                                "recordCount": "1",
+                                "sizeKey": "273",
+                                "typeOfData": "file",
+                                "Location": "s3://test-glue-jsons/markers/",
+                                "InputFormat": "org.apache.hadoop.mapred.TextInputFormat",
+                                "OutputFormat": "org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat",
+                                "Compressed": "False",
+                                "NumberOfBuckets": "-1",
+                                "SerdeInfo": "{'SerializationLibrary': 'org.openx.data.jsonserde.JsonSerDe', 'Parameters': {'paths': 'markers'}}",
+                                "BucketColumns": "[]",
+                                "SortColumns": "[]",
+                                "StoredAsSubDirectories": "False"
+                            },
+                            "name": "test_jsons_markers",
+                            "qualifiedName": "arn:aws:glue:us-west-2:795586375822:table/test-database/test_jsons_markers",
+                            "tags": []
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                            "schemaName": "test-database.test_jsons_markers",
+                            "platform": "urn:li:dataPlatform:glue",
+                            "version": 0,
+                            "created": {
+                                "time": 0,
+                                "actor": "urn:li:corpuser:unknown"
+                            },
+                            "lastModified": {
+                                "time": 0,
+                                "actor": "urn:li:corpuser:unknown"
+                            },
+                            "hash": "",
+                            "platformSchema": {
+                                "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                    "tableSchema": ""
+                                }
+                            },
+                            "fields": [
+                                {
+                                    "fieldPath": "[version=2.0].[type=struct].[type=array].[type=struct].markers",
+                                    "nullable": true,
                                     "type": {
-                                        "com.linkedin.pegasus2avro.schema.ArrayType": {
-                                            "nestedType": [
-                                                "record"
-                                            ]
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.ArrayType": {
+                                                "nestedType": [
+                                                    "record"
+                                                ]
+                                            }
                                         }
-                                    }
+                                    },
+                                    "nativeDataType": "array<struct<name:string,position:array<double>,location:array<double>>>",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"array<struct<name:string,position:array<double>,location:array<double>>>\"}"
                                 },
-                                "nativeDataType": "array<struct<name:string,position:array<double>,location:array<double>>>",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"array<struct<name:string,position:array<double>,location:array<double>>>\"}"
-                            },
-                            {
-                                "fieldPath": "[version=2.0].[type=struct].[type=array].[type=struct].markers.[type=string].name",
-                                "nullable": true,
-                                "type": {
+                                {
+                                    "fieldPath": "[version=2.0].[type=struct].[type=array].[type=struct].markers.[type=string].name",
+                                    "nullable": true,
                                     "type": {
-                                        "com.linkedin.pegasus2avro.schema.StringType": {}
-                                    }
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.StringType": {}
+                                        }
+                                    },
+                                    "nativeDataType": "string",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
                                 },
-                                "nativeDataType": "string",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
-                            },
-                            {
-                                "fieldPath": "[version=2.0].[type=struct].[type=array].[type=struct].markers.[type=array].[type=double].position",
-                                "nullable": true,
-                                "type": {
+                                {
+                                    "fieldPath": "[version=2.0].[type=struct].[type=array].[type=struct].markers.[type=array].[type=double].position",
+                                    "nullable": true,
                                     "type": {
-                                        "com.linkedin.pegasus2avro.schema.ArrayType": {
-                                            "nestedType": [
-                                                "double"
-                                            ]
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.ArrayType": {
+                                                "nestedType": [
+                                                    "double"
+                                                ]
+                                            }
                                         }
-                                    }
+                                    },
+                                    "nativeDataType": "array<double>",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"array<double>\"}"
                                 },
-                                "nativeDataType": "array<double>",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"array<double>\"}"
-                            },
-                            {
-                                "fieldPath": "[version=2.0].[type=struct].[type=array].[type=struct].markers.[type=array].[type=double].location",
-                                "nullable": true,
-                                "type": {
+                                {
+                                    "fieldPath": "[version=2.0].[type=struct].[type=array].[type=struct].markers.[type=array].[type=double].location",
+                                    "nullable": true,
                                     "type": {
-                                        "com.linkedin.pegasus2avro.schema.ArrayType": {
-                                            "nestedType": [
-                                                "double"
-                                            ]
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.ArrayType": {
+                                                "nestedType": [
+                                                    "double"
+                                                ]
+                                            }
                                         }
-                                    }
-                                },
-                                "nativeDataType": "array<double>",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"array<double>\"}"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.common.DataPlatformInstance": {
-                        "platform": "urn:li:dataPlatform:glue"
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.common.Ownership": {
-                        "owners": [
-                            {
-                                "owner": "urn:li:corpuser:owner",
-                                "type": "DATAOWNER"
-                            }
-                        ],
-                        "ownerTypes": {},
-                        "lastModified": {
-                            "time": 0,
-                            "actor": "urn:li:corpuser:unknown"
+                                    },
+                                    "nativeDataType": "array<double>",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"array<double>\"}"
+                                }
+                            ]
                         }
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.common.GlobalTags": {
-                        "tags": [
-                            {
-                                "tag": "urn:li:tag:baz:bob"
-                            },
-                            {
-                                "tag": "urn:li:tag:foo:bar"
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.common.DataPlatformInstance": {
+                            "platform": "urn:li:dataPlatform:glue"
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.common.Ownership": {
+                            "owners": [
+                                {
+                                    "owner": "urn:li:corpuser:owner",
+                                    "type": "DATAOWNER"
+                                }
+                            ],
+                            "ownerTypes": {},
+                            "lastModified": {
+                                "time": 0,
+                                "actor": "urn:li:corpuser:unknown"
                             }
-                        ]
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.common.GlobalTags": {
+                            "tags": [
+                                {
+                                    "tag": "urn:li:tag:baz:bob"
+                                },
+                                {
+                                    "tag": "urn:li:tag:foo:bar"
+                                }
+                            ]
+                        }
                     }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:glue,test-database.test_jsons_markers,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "subTypes",
-    "aspect": {
-        "json": {
-            "typeNames": [
-                "Table"
-            ]
+    },
+    {
+        "entityType": "dataset",
+        "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:glue,test-database.test_jsons_markers,PROD)",
+        "changeType": "UPSERT",
+        "aspectName": "subTypes",
+        "aspect": {
+            "json": {
+                "typeNames": [
+                    "Table"
+                ]
+            }
         }
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:glue,test-database.test_jsons_markers,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "container",
-    "aspect": {
-        "json": {
-            "container": "urn:li:container:bdf4342ea6899d162eae685bfe9074a7"
+    },
+    {
+        "entityType": "dataset",
+        "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:glue,test-database.test_jsons_markers,PROD)",
+        "changeType": "UPSERT",
+        "aspectName": "container",
+        "aspect": {
+            "json": {
+                "container": "urn:li:container:bdf4342ea6899d162eae685bfe9074a7"
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
-            "urn": "urn:li:dataset:(urn:li:dataPlatform:glue,test-database.test_parquet,PROD)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.common.Status": {
-                        "removed": false
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
-                        "customProperties": {
-                            "CrawlerSchemaDeserializerVersion": "1.0",
-                            "CrawlerSchemaSerializerVersion": "1.0",
-                            "UPDATED_BY_CRAWLER": "test",
-                            "averageRecordSize": "19",
-                            "classification": "parquet",
-                            "compressionType": "none",
-                            "objectCount": "60",
-                            "recordCount": "167497743",
-                            "sizeKey": "4463574900",
-                            "typeOfData": "file",
-                            "Location": "s3://crawler-public-us-west-2/flight/parquet/",
-                            "InputFormat": "org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat",
-                            "OutputFormat": "org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat",
-                            "Compressed": "False",
-                            "NumberOfBuckets": "-1",
-                            "SerdeInfo": "{'SerializationLibrary': 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe', 'Parameters': {'serialization.format': '1'}}",
-                            "BucketColumns": "[]",
-                            "SortColumns": "[]",
-                            "StoredAsSubDirectories": "False"
-                        },
-                        "name": "test_parquet",
-                        "qualifiedName": "arn:aws:glue:us-west-2:795586375822:table/test-database/test_parquet",
-                        "tags": []
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
-                        "schemaName": "test-database.test_parquet",
-                        "platform": "urn:li:dataPlatform:glue",
-                        "version": 0,
-                        "created": {
-                            "time": 0,
-                            "actor": "urn:li:corpuser:unknown"
-                        },
-                        "lastModified": {
-                            "time": 0,
-                            "actor": "urn:li:corpuser:unknown"
-                        },
-                        "hash": "",
-                        "platformSchema": {
-                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
-                                "tableSchema": ""
-                            }
-                        },
-                        "fields": [
-                            {
-                                "fieldPath": "[version=2.0].[type=int].yr",
-                                "nullable": true,
-                                "type": {
-                                    "type": {
-                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
-                                    }
-                                },
-                                "nativeDataType": "int",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"int\", \"_nullable\": true}"
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+                "urn": "urn:li:dataset:(urn:li:dataPlatform:glue,test-database.test_parquet,PROD)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.common.Status": {
+                            "removed": false
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                            "customProperties": {
+                                "CrawlerSchemaDeserializerVersion": "1.0",
+                                "CrawlerSchemaSerializerVersion": "1.0",
+                                "UPDATED_BY_CRAWLER": "test",
+                                "averageRecordSize": "19",
+                                "classification": "parquet",
+                                "compressionType": "none",
+                                "objectCount": "60",
+                                "recordCount": "167497743",
+                                "sizeKey": "4463574900",
+                                "typeOfData": "file",
+                                "Location": "s3://crawler-public-us-west-2/flight/parquet/",
+                                "InputFormat": "org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat",
+                                "OutputFormat": "org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat",
+                                "Compressed": "False",
+                                "NumberOfBuckets": "-1",
+                                "SerdeInfo": "{'SerializationLibrary': 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe', 'Parameters': {'serialization.format': '1'}}",
+                                "BucketColumns": "[]",
+                                "SortColumns": "[]",
+                                "StoredAsSubDirectories": "False"
+                            },
+                            "name": "test_parquet",
+                            "qualifiedName": "arn:aws:glue:us-west-2:795586375822:table/test-database/test_parquet",
+                            "tags": []
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                            "schemaName": "test-database.test_parquet",
+                            "platform": "urn:li:dataPlatform:glue",
+                            "version": 0,
+                            "created": {
+                                "time": 0,
+                                "actor": "urn:li:corpuser:unknown"
                             },
-                            {
-                                "fieldPath": "[version=2.0].[type=int].quarter",
-                                "nullable": true,
-                                "type": {
+                            "lastModified": {
+                                "time": 0,
+                                "actor": "urn:li:corpuser:unknown"
+                            },
+                            "hash": "",
+                            "platformSchema": {
+                                "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                    "tableSchema": ""
+                                }
+                            },
+                            "fields": [
+                                {
+                                    "fieldPath": "[version=2.0].[type=int].yr",
+                                    "nullable": true,
                                     "type": {
-                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
-                                    }
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                        }
+                                    },
+                                    "nativeDataType": "int",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"int\", \"_nullable\": true}"
                                 },
-                                "nativeDataType": "int",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"int\", \"_nullable\": true}"
-                            },
-                            {
-                                "fieldPath": "[version=2.0].[type=int].month",
-                                "nullable": true,
-                                "type": {
+                                {
+                                    "fieldPath": "[version=2.0].[type=int].quarter",
+                                    "nullable": true,
                                     "type": {
-                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
-                                    }
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                        }
+                                    },
+                                    "nativeDataType": "int",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"int\", \"_nullable\": true}"
                                 },
-                                "nativeDataType": "int",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"int\", \"_nullable\": true}"
-                            },
-                            {
-                                "fieldPath": "[version=2.0].[type=int].dayofmonth",
-                                "nullable": true,
-                                "type": {
+                                {
+                                    "fieldPath": "[version=2.0].[type=int].month",
+                                    "nullable": true,
                                     "type": {
-                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
-                                    }
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                        }
+                                    },
+                                    "nativeDataType": "int",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"int\", \"_nullable\": true}"
                                 },
-                                "nativeDataType": "int",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"int\", \"_nullable\": true}"
-                            },
-                            {
-                                "fieldPath": "[version=2.0].[type=string].year",
-                                "nullable": true,
-                                "type": {
+                                {
+                                    "fieldPath": "[version=2.0].[type=int].dayofmonth",
+                                    "nullable": true,
                                     "type": {
-                                        "com.linkedin.pegasus2avro.schema.StringType": {}
-                                    }
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                        }
+                                    },
+                                    "nativeDataType": "int",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"int\", \"_nullable\": true}"
                                 },
-                                "nativeDataType": "string",
-                                "recursive": false,
-                                "isPartOfKey": false,
-                                "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.common.DataPlatformInstance": {
-                        "platform": "urn:li:dataPlatform:glue"
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.common.Ownership": {
-                        "owners": [
-                            {
-                                "owner": "urn:li:corpuser:owner",
-                                "type": "DATAOWNER"
-                            }
-                        ],
-                        "ownerTypes": {},
-                        "lastModified": {
-                            "time": 0,
-                            "actor": "urn:li:corpuser:unknown"
+                                {
+                                    "fieldPath": "[version=2.0].[type=string].year",
+                                    "nullable": true,
+                                    "type": {
+                                        "type": {
+                                            "com.linkedin.pegasus2avro.schema.StringType": {}
+                                        }
+                                    },
+                                    "nativeDataType": "string",
+                                    "recursive": false,
+                                    "isPartOfKey": false,
+                                    "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
+                                }
+                            ]
                         }
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.common.GlobalTags": {
-                        "tags": [
-                            {
-                                "tag": "urn:li:tag:baz:bob"
-                            },
-                            {
-                                "tag": "urn:li:tag:foo:bar"
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.common.DataPlatformInstance": {
+                            "platform": "urn:li:dataPlatform:glue"
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.common.Ownership": {
+                            "owners": [
+                                {
+                                    "owner": "urn:li:corpuser:owner",
+                                    "type": "DATAOWNER"
+                                }
+                            ],
+                            "ownerTypes": {},
+                            "lastModified": {
+                                "time": 0,
+                                "actor": "urn:li:corpuser:unknown"
                             }
-                        ]
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.common.GlobalTags": {
+                            "tags": [
+                                {
+                                    "tag": "urn:li:tag:baz:bob"
+                                },
+                                {
+                                    "tag": "urn:li:tag:foo:bar"
+                                }
+                            ]
+                        }
                     }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:glue,test-database.test_parquet,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "subTypes",
-    "aspect": {
-        "json": {
-            "typeNames": [
-                "Table"
-            ]
+    },
+    {
+        "entityType": "dataset",
+        "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:glue,test-database.test_parquet,PROD)",
+        "changeType": "UPSERT",
+        "aspectName": "subTypes",
+        "aspect": {
+            "json": {
+                "typeNames": [
+                    "Table"
+                ]
+            }
         }
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:glue,test-database.test_parquet,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "container",
-    "aspect": {
-        "json": {
-            "container": "urn:li:container:bdf4342ea6899d162eae685bfe9074a7"
+    },
+    {
+        "entityType": "dataset",
+        "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:glue,test-database.test_parquet,PROD)",
+        "changeType": "UPSERT",
+        "aspectName": "container",
+        "aspect": {
+            "json": {
+                "container": "urn:li:container:bdf4342ea6899d162eae685bfe9074a7"
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DataFlowSnapshot": {
-            "urn": "urn:li:dataFlow:(glue,test-job-1,PROD)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataFlowInfo": {
-                        "customProperties": {
-                            "role": "arn:aws:iam::123412341234:role/service-role/AWSGlueServiceRole-glue-crawler",
-                            "created": "2021-06-10 16:51:25.690000",
-                            "modified": "2021-06-10 16:55:35.307000",
-                            "command": "s3://aws-glue-assets-123412341234-us-west-2/scripts/job-1.py"
-                        },
-                        "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-1/graph",
-                        "name": "test-job-1",
-                        "description": "The first test job"
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DataFlowSnapshot": {
+                "urn": "urn:li:dataFlow:(glue,test-job-1,PROD)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataFlowInfo": {
+                            "customProperties": {
+                                "role": "arn:aws:iam::123412341234:role/service-role/AWSGlueServiceRole-glue-crawler",
+                                "created": "2021-06-10 16:51:25.690000",
+                                "modified": "2021-06-10 16:55:35.307000",
+                                "command": "s3://aws-glue-assets-123412341234-us-west-2/scripts/job-1.py"
+                            },
+                            "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-1/graph",
+                            "name": "test-job-1",
+                            "description": "The first test job"
+                        }
                     }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DataFlowSnapshot": {
-            "urn": "urn:li:dataFlow:(glue,test-job-2,PROD)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataFlowInfo": {
-                        "customProperties": {
-                            "role": "arn:aws:iam::123412341234:role/service-role/AWSGlueServiceRole-glue-crawler",
-                            "created": "2021-06-10 16:58:32.469000",
-                            "modified": "2021-06-10 16:58:32.469000",
-                            "command": "s3://aws-glue-assets-123412341234-us-west-2/scripts/job-2.py"
-                        },
-                        "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-2/graph",
-                        "name": "test-job-2",
-                        "description": "The second test job"
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DataFlowSnapshot": {
+                "urn": "urn:li:dataFlow:(glue,test-job-2,PROD)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataFlowInfo": {
+                            "customProperties": {
+                                "role": "arn:aws:iam::123412341234:role/service-role/AWSGlueServiceRole-glue-crawler",
+                                "created": "2021-06-10 16:58:32.469000",
+                                "modified": "2021-06-10 16:58:32.469000",
+                                "command": "s3://aws-glue-assets-123412341234-us-west-2/scripts/job-2.py"
+                            },
+                            "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-2/graph",
+                            "name": "test-job-2",
+                            "description": "The second test job"
+                        }
                     }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
-            "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),Filter-Transform0_job1)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
-                        "customProperties": {
-                            "f": "lambda row : ()",
-                            "transformation_ctx": "\"Transform0\"",
-                            "transformType": "Filter",
-                            "nodeId": "Transform0_job1"
-                        },
-                        "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-1/graph",
-                        "name": "test-job-1:Filter-Transform0_job1",
-                        "type": {
-                            "string": "GLUE"
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
+                "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),Filter-Transform0_job1)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
+                            "customProperties": {
+                                "f": "lambda row : ()",
+                                "transformation_ctx": "\"Transform0\"",
+                                "transformType": "Filter",
+                                "nodeId": "Transform0_job1"
+                            },
+                            "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-1/graph",
+                            "name": "test-job-1:Filter-Transform0_job1",
+                            "type": {
+                                "string": "GLUE"
+                            }
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
+                            "inputDatasets": [],
+                            "outputDatasets": [],
+                            "inputDatajobs": [
+                                "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform2_job1)"
+                            ]
                         }
                     }
-                },
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
-                        "inputDatasets": [],
-                        "outputDatasets": [],
-                        "inputDatajobs": [
-                            "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform2_job1)"
-                        ]
-                    }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
-            "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform1_job1)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
-                        "customProperties": {
-                            "mappings": "[(\"yr\", \"int\", \"yr\", \"int\"), (\"flightdate\", \"string\", \"flightdate\", \"string\"), (\"uniquecarrier\", \"string\", \"uniquecarrier\", \"string\"), (\"airlineid\", \"int\", \"airlineid\", \"int\"), (\"carrier\", \"string\", \"carrier\", \"string\"), (\"flightnum\", \"string\", \"flightnum\", \"string\"), (\"origin\", \"string\", \"origin\", \"string\"), (\"dest\", \"string\", \"dest\", \"string\"), (\"depdelay\", \"int\", \"depdelay\", \"int\"), (\"carrierdelay\", \"int\", \"carrierdelay\", \"int\"), (\"weatherdelay\", \"int\", \"weatherdelay\", \"int\"), (\"year\", \"string\", \"year\", \"string\")]",
-                            "transformation_ctx": "\"Transform1\"",
-                            "transformType": "ApplyMapping",
-                            "nodeId": "Transform1_job1"
-                        },
-                        "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-1/graph",
-                        "name": "test-job-1:ApplyMapping-Transform1_job1",
-                        "type": {
-                            "string": "GLUE"
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
+                "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform1_job1)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
+                            "customProperties": {
+                                "mappings": "[(\"yr\", \"int\", \"yr\", \"int\"), (\"flightdate\", \"string\", \"flightdate\", \"string\"), (\"uniquecarrier\", \"string\", \"uniquecarrier\", \"string\"), (\"airlineid\", \"int\", \"airlineid\", \"int\"), (\"carrier\", \"string\", \"carrier\", \"string\"), (\"flightnum\", \"string\", \"flightnum\", \"string\"), (\"origin\", \"string\", \"origin\", \"string\"), (\"dest\", \"string\", \"dest\", \"string\"), (\"depdelay\", \"int\", \"depdelay\", \"int\"), (\"carrierdelay\", \"int\", \"carrierdelay\", \"int\"), (\"weatherdelay\", \"int\", \"weatherdelay\", \"int\"), (\"year\", \"string\", \"year\", \"string\")]",
+                                "transformation_ctx": "\"Transform1\"",
+                                "transformType": "ApplyMapping",
+                                "nodeId": "Transform1_job1"
+                            },
+                            "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-1/graph",
+                            "name": "test-job-1:ApplyMapping-Transform1_job1",
+                            "type": {
+                                "string": "GLUE"
+                            }
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
+                            "inputDatasets": [],
+                            "outputDatasets": [],
+                            "inputDatajobs": [
+                                "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),Filter-Transform0_job1)"
+                            ]
                         }
                     }
-                },
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
-                        "inputDatasets": [],
-                        "outputDatasets": [],
-                        "inputDatajobs": [
-                            "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),Filter-Transform0_job1)"
-                        ]
-                    }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
-            "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform2_job1)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
-                        "customProperties": {
-                            "mappings": "[(\"yr\", \"int\", \"yr\", \"int\"), (\"flightdate\", \"string\", \"flightdate\", \"string\"), (\"uniquecarrier\", \"string\", \"uniquecarrier\", \"string\"), (\"airlineid\", \"int\", \"airlineid\", \"int\"), (\"carrier\", \"string\", \"carrier\", \"string\"), (\"flightnum\", \"string\", \"flightnum\", \"string\"), (\"origin\", \"string\", \"origin\", \"string\"), (\"dest\", \"string\", \"dest\", \"string\"), (\"depdelay\", \"int\", \"depdelay\", \"int\"), (\"carrierdelay\", \"int\", \"carrierdelay\", \"int\"), (\"weatherdelay\", \"int\", \"weatherdelay\", \"int\"), (\"year\", \"string\", \"year\", \"string\")]",
-                            "transformation_ctx": "\"Transform2\"",
-                            "transformType": "ApplyMapping",
-                            "nodeId": "Transform2_job1"
-                        },
-                        "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-1/graph",
-                        "name": "test-job-1:ApplyMapping-Transform2_job1",
-                        "type": {
-                            "string": "GLUE"
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
+                "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform2_job1)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
+                            "customProperties": {
+                                "mappings": "[(\"yr\", \"int\", \"yr\", \"int\"), (\"flightdate\", \"string\", \"flightdate\", \"string\"), (\"uniquecarrier\", \"string\", \"uniquecarrier\", \"string\"), (\"airlineid\", \"int\", \"airlineid\", \"int\"), (\"carrier\", \"string\", \"carrier\", \"string\"), (\"flightnum\", \"string\", \"flightnum\", \"string\"), (\"origin\", \"string\", \"origin\", \"string\"), (\"dest\", \"string\", \"dest\", \"string\"), (\"depdelay\", \"int\", \"depdelay\", \"int\"), (\"carrierdelay\", \"int\", \"carrierdelay\", \"int\"), (\"weatherdelay\", \"int\", \"weatherdelay\", \"int\"), (\"year\", \"string\", \"year\", \"string\")]",
+                                "transformation_ctx": "\"Transform2\"",
+                                "transformType": "ApplyMapping",
+                                "nodeId": "Transform2_job1"
+                            },
+                            "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-1/graph",
+                            "name": "test-job-1:ApplyMapping-Transform2_job1",
+                            "type": {
+                                "string": "GLUE"
+                            }
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
+                            "inputDatasets": [
+                                "urn:li:dataset:(urn:li:dataPlatform:glue,flights-database.avro,PROD)"
+                            ],
+                            "outputDatasets": [],
+                            "inputDatajobs": []
                         }
                     }
-                },
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
-                        "inputDatasets": [
-                            "urn:li:dataset:(urn:li:dataPlatform:glue,flights-database.avro,PROD)"
-                        ],
-                        "outputDatasets": [],
-                        "inputDatajobs": []
-                    }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
-            "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),Join-Transform3_job1)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
-                        "customProperties": {
-                            "keys2": "[\"(right) flightdate\"]",
-                            "transformation_ctx": "\"Transform3\"",
-                            "keys1": "[\"yr\"]",
-                            "transformType": "Join",
-                            "nodeId": "Transform3_job1"
-                        },
-                        "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-1/graph",
-                        "name": "test-job-1:Join-Transform3_job1",
-                        "type": {
-                            "string": "GLUE"
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
+                "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),Join-Transform3_job1)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
+                            "customProperties": {
+                                "keys2": "[\"(right) flightdate\"]",
+                                "transformation_ctx": "\"Transform3\"",
+                                "keys1": "[\"yr\"]",
+                                "transformType": "Join",
+                                "nodeId": "Transform3_job1"
+                            },
+                            "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-1/graph",
+                            "name": "test-job-1:Join-Transform3_job1",
+                            "type": {
+                                "string": "GLUE"
+                            }
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
+                            "inputDatasets": [],
+                            "outputDatasets": [],
+                            "inputDatajobs": [
+                                "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform4_job1)"
+                            ]
                         }
                     }
-                },
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
-                        "inputDatasets": [],
-                        "outputDatasets": [],
-                        "inputDatajobs": [
-                            "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform4_job1)"
-                        ]
-                    }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
-            "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform4_job1)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
-                        "customProperties": {
-                            "mappings": "[(\"yr\", \"int\", \"yr\", \"int\"), (\"flightdate\", \"string\", \"flightdate\", \"string\"), (\"uniquecarrier\", \"string\", \"uniquecarrier\", \"string\"), (\"airlineid\", \"int\", \"airlineid\", \"int\"), (\"carrier\", \"string\", \"carrier\", \"string\"), (\"flightnum\", \"string\", \"flightnum\", \"string\"), (\"origin\", \"string\", \"origin\", \"string\"), (\"dest\", \"string\", \"dest\", \"string\"), (\"depdelay\", \"int\", \"depdelay\", \"int\"), (\"carrierdelay\", \"int\", \"carrierdelay\", \"int\"), (\"weatherdelay\", \"int\", \"weatherdelay\", \"int\"), (\"year\", \"string\", \"year\", \"string\")]",
-                            "transformation_ctx": "\"Transform4\"",
-                            "transformType": "ApplyMapping",
-                            "nodeId": "Transform4_job1"
-                        },
-                        "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-1/graph",
-                        "name": "test-job-1:ApplyMapping-Transform4_job1",
-                        "type": {
-                            "string": "GLUE"
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
+                "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform4_job1)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
+                            "customProperties": {
+                                "mappings": "[(\"yr\", \"int\", \"yr\", \"int\"), (\"flightdate\", \"string\", \"flightdate\", \"string\"), (\"uniquecarrier\", \"string\", \"uniquecarrier\", \"string\"), (\"airlineid\", \"int\", \"airlineid\", \"int\"), (\"carrier\", \"string\", \"carrier\", \"string\"), (\"flightnum\", \"string\", \"flightnum\", \"string\"), (\"origin\", \"string\", \"origin\", \"string\"), (\"dest\", \"string\", \"dest\", \"string\"), (\"depdelay\", \"int\", \"depdelay\", \"int\"), (\"carrierdelay\", \"int\", \"carrierdelay\", \"int\"), (\"weatherdelay\", \"int\", \"weatherdelay\", \"int\"), (\"year\", \"string\", \"year\", \"string\")]",
+                                "transformation_ctx": "\"Transform4\"",
+                                "transformType": "ApplyMapping",
+                                "nodeId": "Transform4_job1"
+                            },
+                            "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-1/graph",
+                            "name": "test-job-1:ApplyMapping-Transform4_job1",
+                            "type": {
+                                "string": "GLUE"
+                            }
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
+                            "inputDatasets": [],
+                            "outputDatasets": [],
+                            "inputDatajobs": []
                         }
                     }
-                },
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
-                        "inputDatasets": [],
-                        "outputDatasets": [],
-                        "inputDatajobs": []
-                    }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
-            "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform5_job1)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
-                        "customProperties": {
-                            "mappings": "[(\"yr\", \"int\", \"(right) yr\", \"int\"), (\"flightdate\", \"string\", \"(right) flightdate\", \"string\"), (\"uniquecarrier\", \"string\", \"(right) uniquecarrier\", \"string\"), (\"airlineid\", \"int\", \"(right) airlineid\", \"int\"), (\"carrier\", \"string\", \"(right) carrier\", \"string\"), (\"flightnum\", \"string\", \"(right) flightnum\", \"string\"), (\"origin\", \"string\", \"(right) origin\", \"string\"), (\"dest\", \"string\", \"(right) dest\", \"string\"), (\"depdelay\", \"int\", \"(right) depdelay\", \"int\"), (\"carrierdelay\", \"int\", \"(right) carrierdelay\", \"int\"), (\"weatherdelay\", \"int\", \"(right) weatherdelay\", \"int\"), (\"year\", \"string\", \"(right) year\", \"string\")]",
-                            "transformation_ctx": "\"Transform5\"",
-                            "transformType": "ApplyMapping",
-                            "nodeId": "Transform5_job1"
-                        },
-                        "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-1/graph",
-                        "name": "test-job-1:ApplyMapping-Transform5_job1",
-                        "type": {
-                            "string": "GLUE"
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
+                "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform5_job1)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
+                            "customProperties": {
+                                "mappings": "[(\"yr\", \"int\", \"(right) yr\", \"int\"), (\"flightdate\", \"string\", \"(right) flightdate\", \"string\"), (\"uniquecarrier\", \"string\", \"(right) uniquecarrier\", \"string\"), (\"airlineid\", \"int\", \"(right) airlineid\", \"int\"), (\"carrier\", \"string\", \"(right) carrier\", \"string\"), (\"flightnum\", \"string\", \"(right) flightnum\", \"string\"), (\"origin\", \"string\", \"(right) origin\", \"string\"), (\"dest\", \"string\", \"(right) dest\", \"string\"), (\"depdelay\", \"int\", \"(right) depdelay\", \"int\"), (\"carrierdelay\", \"int\", \"(right) carrierdelay\", \"int\"), (\"weatherdelay\", \"int\", \"(right) weatherdelay\", \"int\"), (\"year\", \"string\", \"(right) year\", \"string\")]",
+                                "transformation_ctx": "\"Transform5\"",
+                                "transformType": "ApplyMapping",
+                                "nodeId": "Transform5_job1"
+                            },
+                            "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-1/graph",
+                            "name": "test-job-1:ApplyMapping-Transform5_job1",
+                            "type": {
+                                "string": "GLUE"
+                            }
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
+                            "inputDatasets": [],
+                            "outputDatasets": [],
+                            "inputDatajobs": []
                         }
                     }
-                },
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
-                        "inputDatasets": [],
-                        "outputDatasets": [],
-                        "inputDatajobs": []
-                    }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
-            "urn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-glue-jsons,PROD)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.common.Status": {
-                        "removed": false
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
-                        "customProperties": {
-                            "connection_type": "s3",
-                            "format": "json",
-                            "connection_options": "{'path': 's3://test-glue-jsons/', 'partitionKeys': []}",
-                            "transformation_ctx": "DataSink1"
-                        },
-                        "tags": []
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+                "urn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-glue-jsons,PROD)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.common.Status": {
+                            "removed": false
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                            "customProperties": {
+                                "connection_type": "s3",
+                                "format": "json",
+                                "connection_options": "{'path': 's3://test-glue-jsons/', 'partitionKeys': []}",
+                                "transformation_ctx": "DataSink1"
+                            },
+                            "tags": []
+                        }
                     }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
-            "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),SplitFields-Transform0_job2)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
-                        "customProperties": {
-                            "paths": "[\"yr\", \"quarter\", \"month\", \"dayofmonth\", \"dayofweek\", \"flightdate\", \"uniquecarrier\"]",
-                            "name2": "\"Transform0Output1\"",
-                            "name1": "\"Transform0Output0\"",
-                            "transformation_ctx": "\"Transform0\"",
-                            "transformType": "SplitFields",
-                            "nodeId": "Transform0_job2"
-                        },
-                        "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-2/graph",
-                        "name": "test-job-2:SplitFields-Transform0_job2",
-                        "type": {
-                            "string": "GLUE"
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
+                "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),SplitFields-Transform0_job2)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
+                            "customProperties": {
+                                "paths": "[\"yr\", \"quarter\", \"month\", \"dayofmonth\", \"dayofweek\", \"flightdate\", \"uniquecarrier\"]",
+                                "name2": "\"Transform0Output1\"",
+                                "name1": "\"Transform0Output0\"",
+                                "transformation_ctx": "\"Transform0\"",
+                                "transformType": "SplitFields",
+                                "nodeId": "Transform0_job2"
+                            },
+                            "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-2/graph",
+                            "name": "test-job-2:SplitFields-Transform0_job2",
+                            "type": {
+                                "string": "GLUE"
+                            }
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
+                            "inputDatasets": [],
+                            "outputDatasets": [],
+                            "inputDatajobs": [
+                                "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),ApplyMapping-Transform1_job2)"
+                            ]
                         }
                     }
-                },
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
-                        "inputDatasets": [],
-                        "outputDatasets": [],
-                        "inputDatajobs": [
-                            "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),ApplyMapping-Transform1_job2)"
-                        ]
-                    }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
-            "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),ApplyMapping-Transform1_job2)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
-                        "customProperties": {
-                            "mappings": "[(\"yr\", \"int\", \"yr\", \"int\"), (\"quarter\", \"int\", \"quarter\", \"int\"), (\"month\", \"int\", \"month\", \"int\"), (\"dayofmonth\", \"int\", \"dayofmonth\", \"int\"), (\"dayofweek\", \"int\", \"dayofweek\", \"int\"), (\"flightdate\", \"string\", \"flightdate\", \"string\"), (\"uniquecarrier\", \"string\", \"uniquecarrier\", \"string\"), (\"airlineid\", \"int\", \"airlineid\", \"int\"), (\"carrier\", \"string\", \"carrier\", \"string\")]",
-                            "transformation_ctx": "\"Transform1\"",
-                            "transformType": "ApplyMapping",
-                            "nodeId": "Transform1_job2"
-                        },
-                        "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-2/graph",
-                        "name": "test-job-2:ApplyMapping-Transform1_job2",
-                        "type": {
-                            "string": "GLUE"
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
+                "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),ApplyMapping-Transform1_job2)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
+                            "customProperties": {
+                                "mappings": "[(\"yr\", \"int\", \"yr\", \"int\"), (\"quarter\", \"int\", \"quarter\", \"int\"), (\"month\", \"int\", \"month\", \"int\"), (\"dayofmonth\", \"int\", \"dayofmonth\", \"int\"), (\"dayofweek\", \"int\", \"dayofweek\", \"int\"), (\"flightdate\", \"string\", \"flightdate\", \"string\"), (\"uniquecarrier\", \"string\", \"uniquecarrier\", \"string\"), (\"airlineid\", \"int\", \"airlineid\", \"int\"), (\"carrier\", \"string\", \"carrier\", \"string\")]",
+                                "transformation_ctx": "\"Transform1\"",
+                                "transformType": "ApplyMapping",
+                                "nodeId": "Transform1_job2"
+                            },
+                            "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-2/graph",
+                            "name": "test-job-2:ApplyMapping-Transform1_job2",
+                            "type": {
+                                "string": "GLUE"
+                            }
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
+                            "inputDatasets": [
+                                "urn:li:dataset:(urn:li:dataPlatform:glue,test-database.test_parquet,PROD)"
+                            ],
+                            "outputDatasets": [],
+                            "inputDatajobs": []
                         }
                     }
-                },
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
-                        "inputDatasets": [
-                            "urn:li:dataset:(urn:li:dataPlatform:glue,test-database.test_parquet,PROD)"
-                        ],
-                        "outputDatasets": [],
-                        "inputDatajobs": []
-                    }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
-            "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),FillMissingValues-Transform2_job2)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
-                        "customProperties": {
-                            "missing_values_column": "\"dayofmonth\"",
-                            "transformation_ctx": "\"Transform2\"",
-                            "transformType": "FillMissingValues",
-                            "nodeId": "Transform2_job2"
-                        },
-                        "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-2/graph",
-                        "name": "test-job-2:FillMissingValues-Transform2_job2",
-                        "type": {
-                            "string": "GLUE"
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
+                "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),FillMissingValues-Transform2_job2)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
+                            "customProperties": {
+                                "missing_values_column": "\"dayofmonth\"",
+                                "transformation_ctx": "\"Transform2\"",
+                                "transformType": "FillMissingValues",
+                                "nodeId": "Transform2_job2"
+                            },
+                            "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-2/graph",
+                            "name": "test-job-2:FillMissingValues-Transform2_job2",
+                            "type": {
+                                "string": "GLUE"
+                            }
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
+                            "inputDatasets": [],
+                            "outputDatasets": [],
+                            "inputDatajobs": [
+                                "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),ApplyMapping-Transform1_job2)"
+                            ]
                         }
                     }
-                },
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
-                        "inputDatasets": [],
-                        "outputDatasets": [],
-                        "inputDatajobs": [
-                            "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),ApplyMapping-Transform1_job2)"
-                        ]
-                    }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
-            "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),SelectFields-Transform3_job2)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
-                        "customProperties": {
-                            "paths": "[]",
-                            "transformation_ctx": "\"Transform3\"",
-                            "transformType": "SelectFields",
-                            "nodeId": "Transform3_job2"
-                        },
-                        "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-2/graph",
-                        "name": "test-job-2:SelectFields-Transform3_job2",
-                        "type": {
-                            "string": "GLUE"
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot": {
+                "urn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),SelectFields-Transform3_job2)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInfo": {
+                            "customProperties": {
+                                "paths": "[]",
+                                "transformation_ctx": "\"Transform3\"",
+                                "transformType": "SelectFields",
+                                "nodeId": "Transform3_job2"
+                            },
+                            "externalUrl": "https://us-west-2.console.aws.amazon.com/gluestudio/home?region=us-west-2#/editor/job/test-job-2/graph",
+                            "name": "test-job-2:SelectFields-Transform3_job2",
+                            "type": {
+                                "string": "GLUE"
+                            }
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
+                            "inputDatasets": [],
+                            "outputDatasets": [
+                                "urn:li:dataset:(urn:li:dataPlatform:s3,test-glue-jsons,PROD)"
+                            ],
+                            "inputDatajobs": [
+                                "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),FillMissingValues-Transform2_job2)"
+                            ]
                         }
                     }
-                },
-                {
-                    "com.linkedin.pegasus2avro.datajob.DataJobInputOutput": {
-                        "inputDatasets": [],
-                        "outputDatasets": [
-                            "urn:li:dataset:(urn:li:dataPlatform:s3,test-glue-jsons,PROD)"
-                        ],
-                        "inputDatajobs": [
-                            "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),FillMissingValues-Transform2_job2)"
-                        ]
-                    }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "proposedSnapshot": {
-        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
-            "urn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-glue-jsons,PROD)",
-            "aspects": [
-                {
-                    "com.linkedin.pegasus2avro.common.Status": {
-                        "removed": false
-                    }
-                },
-                {
-                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
-                        "customProperties": {
-                            "connection_type": "s3",
-                            "format": "json",
-                            "connection_options": "{'path': 's3://test-glue-jsons/', 'partitionKeys': []}",
-                            "transformation_ctx": "DataSink0"
-                        },
-                        "tags": []
+    },
+    {
+        "proposedSnapshot": {
+            "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+                "urn": "urn:li:dataset:(urn:li:dataPlatform:s3,test-glue-jsons,PROD)",
+                "aspects": [
+                    {
+                        "com.linkedin.pegasus2avro.common.Status": {
+                            "removed": false
+                        }
+                    },
+                    {
+                        "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                            "customProperties": {
+                                "connection_type": "s3",
+                                "format": "json",
+                                "connection_options": "{'path': 's3://test-glue-jsons/', 'partitionKeys': []}",
+                                "transformation_ctx": "DataSink0"
+                            },
+                            "tags": []
+                        }
                     }
-                }
-            ]
+                ]
+            }
         }
-    }
-},
-{
-    "entityType": "dataFlow",
-    "entityUrn": "urn:li:dataFlow:(glue,test-job-1,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
+    },
+    {
+        "entityType": "dataFlow",
+        "entityUrn": "urn:li:dataFlow:(glue,test-job-1,PROD)",
+        "changeType": "UPSERT",
+        "aspectName": "status",
+        "aspect": {
+            "json": {
+                "removed": false
+            }
         }
-    }
-},
-{
-    "entityType": "dataFlow",
-    "entityUrn": "urn:li:dataFlow:(glue,test-job-2,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
+    },
+    {
+        "entityType": "dataFlow",
+        "entityUrn": "urn:li:dataFlow:(glue,test-job-2,PROD)",
+        "changeType": "UPSERT",
+        "aspectName": "status",
+        "aspect": {
+            "json": {
+                "removed": false
+            }
         }
-    }
-},
-{
-    "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform1_job1)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
+    },
+    {
+        "entityType": "dataJob",
+        "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform1_job1)",
+        "changeType": "UPSERT",
+        "aspectName": "status",
+        "aspect": {
+            "json": {
+                "removed": false
+            }
         }
-    }
-},
-{
-    "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform2_job1)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
+    },
+    {
+        "entityType": "dataJob",
+        "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform2_job1)",
+        "changeType": "UPSERT",
+        "aspectName": "status",
+        "aspect": {
+            "json": {
+                "removed": false
+            }
         }
-    }
-},
-{
-    "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform4_job1)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
+    },
+    {
+        "entityType": "dataJob",
+        "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform4_job1)",
+        "changeType": "UPSERT",
+        "aspectName": "status",
+        "aspect": {
+            "json": {
+                "removed": false
+            }
         }
-    }
-},
-{
-    "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform5_job1)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
+    },
+    {
+        "entityType": "dataJob",
+        "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),ApplyMapping-Transform5_job1)",
+        "changeType": "UPSERT",
+        "aspectName": "status",
+        "aspect": {
+            "json": {
+                "removed": false
+            }
         }
-    }
-},
-{
-    "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),Filter-Transform0_job1)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
+    },
+    {
+        "entityType": "dataJob",
+        "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),Filter-Transform0_job1)",
+        "changeType": "UPSERT",
+        "aspectName": "status",
+        "aspect": {
+            "json": {
+                "removed": false
+            }
         }
-    }
-},
-{
-    "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),Join-Transform3_job1)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
+    },
+    {
+        "entityType": "dataJob",
+        "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-1,PROD),Join-Transform3_job1)",
+        "changeType": "UPSERT",
+        "aspectName": "status",
+        "aspect": {
+            "json": {
+                "removed": false
+            }
         }
-    }
-},
-{
-    "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),ApplyMapping-Transform1_job2)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
+    },
+    {
+        "entityType": "dataJob",
+        "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),ApplyMapping-Transform1_job2)",
+        "changeType": "UPSERT",
+        "aspectName": "status",
+        "aspect": {
+            "json": {
+                "removed": false
+            }
         }
-    }
-},
-{
-    "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),FillMissingValues-Transform2_job2)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
+    },
+    {
+        "entityType": "dataJob",
+        "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),FillMissingValues-Transform2_job2)",
+        "changeType": "UPSERT",
+        "aspectName": "status",
+        "aspect": {
+            "json": {
+                "removed": false
+            }
         }
-    }
-},
-{
-    "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),SelectFields-Transform3_job2)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
+    },
+    {
+        "entityType": "dataJob",
+        "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),SelectFields-Transform3_job2)",
+        "changeType": "UPSERT",
+        "aspectName": "status",
+        "aspect": {
+            "json": {
+                "removed": false
+            }
         }
-    }
-},
-{
-    "entityType": "dataJob",
-    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),SplitFields-Transform0_job2)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
+    },
+    {
+        "entityType": "dataJob",
+        "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(glue,test-job-2,PROD),SplitFields-Transform0_job2)",
+        "changeType": "UPSERT",
+        "aspectName": "status",
+        "aspect": {
+            "json": {
+                "removed": false
+            }
         }
-    }
-},
-{
-    "entityType": "tag",
-    "entityUrn": "urn:li:tag:baz:bob",
-    "changeType": "UPSERT",
-    "aspectName": "tagKey",
-    "aspect": {
-        "json": {
-            "name": "baz:bob"
+    },
+    {
+        "entityType": "tag",
+        "entityUrn": "urn:li:tag:baz:bob",
+        "changeType": "UPSERT",
+        "aspectName": "tagKey",
+        "aspect": {
+            "json": {
+                "name": "baz:bob"
+            }
         }
-    }
-},
-{
-    "entityType": "tag",
-    "entityUrn": "urn:li:tag:foo:bar",
-    "changeType": "UPSERT",
-    "aspectName": "tagKey",
-    "aspect": {
-        "json": {
-            "name": "foo:bar"
+    },
+    {
+        "entityType": "tag",
+        "entityUrn": "urn:li:tag:foo:bar",
+        "changeType": "UPSERT",
+        "aspectName": "tagKey",
+        "aspect": {
+            "json": {
+                "name": "foo:bar"
+            }
         }
     }
-}
-]
\ No newline at end of file
+    ]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/glue/glue_mces_golden_profiling.json b/metadata-ingestion/tests/unit/glue/glue_mces_golden_profiling.json
new file mode 100644
index 00000000000000..800d36a13d2dc2
--- /dev/null
+++ b/metadata-ingestion/tests/unit/glue/glue_mces_golden_profiling.json
@@ -0,0 +1,289 @@
+[
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:77f8f4c39b47069d3a71191de1333b0e",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "glue",
+                "env": "PROD",
+                "database": "flights-database-profiling",
+                "param1": "value1",
+                "param2": "value2",
+                "LocationUri": "s3://test-bucket/test-prefix",
+                "CreateTime": "June 09, 2021 at 14:14:19"
+            },
+            "name": "flights-database-profiling",
+            "qualifiedName": "arn:aws:glue:us-west-2:123412341234:database/flights-database-profiling"
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:77f8f4c39b47069d3a71191de1333b0e",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:77f8f4c39b47069d3a71191de1333b0e",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:glue"
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:77f8f4c39b47069d3a71191de1333b0e",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Database"
+            ]
+        }
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:glue,flights-database-profiling.avro-profiling,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "CrawlerSchemaDeserializerVersion": "1.0",
+                            "CrawlerSchemaSerializerVersion": "1.0",
+                            "UPDATED_BY_CRAWLER": "flights-crawler",
+                            "averageRecordSize": "55",
+                            "avro.schema.literal": "{\"type\":\"record\",\"name\":\"flights_avro_subset\",\"namespace\":\"default\",\"fields\":[{\"name\":\"yr\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"flightdate\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"uniquecarrier\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"airlineid\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"carrier\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"flightnum\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"origin\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"dest\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"depdelay\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"carrierdelay\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"weatherdelay\",\"type\":[\"null\",\"int\"],\"default\":null}]}",
+                            "classification": "avro",
+                            "compressionType": "none",
+                            "objectCount": "30",
+                            "recordCount": "169222196",
+                            "sizeKey": "9503351413",
+                            "typeOfData": "file",
+                            "Location": "s3://crawler-public-us-west-2/flight/avro/",
+                            "InputFormat": "org.apache.hadoop.hive.ql.io.avro.AvroContainerInputFormat",
+                            "OutputFormat": "org.apache.hadoop.hive.ql.io.avro.AvroContainerOutputFormat",
+                            "Compressed": "False",
+                            "NumberOfBuckets": "-1",
+                            "SerdeInfo": "{'SerializationLibrary': 'org.apache.hadoop.hive.serde2.avro.AvroSerDe', 'Parameters': {'avro.schema.literal': '{\"type\":\"record\",\"name\":\"flights_avro_subset\",\"namespace\":\"default\",\"fields\":[{\"name\":\"yr\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"flightdate\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"uniquecarrier\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"airlineid\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"carrier\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"flightnum\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"origin\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"dest\",\"type\":[\"null\",\"string\"],\"default\":null},{\"name\":\"depdelay\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"carrierdelay\",\"type\":[\"null\",\"int\"],\"default\":null},{\"name\":\"weatherdelay\",\"type\":[\"null\",\"int\"],\"default\":null}]}', 'serialization.format': '1'}}",
+                            "BucketColumns": "[]",
+                            "SortColumns": "[]",
+                            "StoredAsSubDirectories": "False"
+                        },
+                        "name": "avro-profiling",
+                        "qualifiedName": "arn:aws:glue:us-west-2:123412341234:table/flights-database-profiling/avro-profiling",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "flights-database-profiling.avro-profiling",
+                        "platform": "urn:li:dataPlatform:glue",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "[version=2.0].[type=int].yr",
+                                "nullable": true,
+                                "description": "test comment",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "int",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"int\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=string].flightdate",
+                                "nullable": true,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=string].uniquecarrier",
+                                "nullable": true,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=int].airlineid",
+                                "nullable": true,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "int",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"int\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=string].carrier",
+                                "nullable": true,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=string].flightnum",
+                                "nullable": true,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=string].origin",
+                                "nullable": true,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.DataPlatformInstance": {
+                        "platform": "urn:li:dataPlatform:glue"
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Ownership": {
+                        "owners": [
+                            {
+                                "owner": "urn:li:corpuser:owner",
+                                "type": "DATAOWNER"
+                            }
+                        ],
+                        "ownerTypes": {},
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        }
+                    }
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:glue,flights-database-profiling.avro-profiling,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:glue,flights-database-profiling.avro-profiling,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:77f8f4c39b47069d3a71191de1333b0e"
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:glue,flights-database-profiling.avro-profiling,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProfile",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1586847600000,
+            "partitionSpec": {
+                "type": "FULL_TABLE",
+                "partition": "FULL_TABLE_SNAPSHOT"
+            },
+            "fieldProfiles": [
+                {
+                    "fieldPath": "yr",
+                    "uniqueCount": 1,
+                    "uniqueProportion": 2.0,
+                    "nullCount": 0,
+                    "nullProportion": 11.0,
+                    "min": "1",
+                    "max": "10",
+                    "mean": "1",
+                    "median": "2",
+                    "stdev": "3"
+                }
+            ]
+        }
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/s3/test_s3_source.py b/metadata-ingestion/tests/unit/s3/test_s3_source.py
index 2eb386e39b0e55..f826cf0179e221 100644
--- a/metadata-ingestion/tests/unit/s3/test_s3_source.py
+++ b/metadata-ingestion/tests/unit/s3/test_s3_source.py
@@ -1,4 +1,6 @@
-from typing import List
+from typing import List, Tuple
+
+import pytest
 
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.api.workunit import MetadataWorkUnit
@@ -70,6 +72,75 @@ def test_path_spec():
     assert path_spec.allowed(path)
 
 
+def test_path_spec_with_double_star_ending():
+    path_spec = PathSpec(
+        include="s3://my-bucket/{table}/**",
+        default_extension="csv",
+        allow_double_stars=True,
+    )
+    path = "s3://my-bucket/my-folder/year=2022/month=10/day=11/my_csv.csv"
+    assert path_spec.allowed(path)
+    vars = path_spec.get_named_vars(path)
+    assert vars
+    assert vars["table"] == "my-folder"
+
+
+@pytest.mark.parametrize(
+    "path_spec,path, expected",
+    [
+        pytest.param(
+            "s3://my-bucket/{table}/**",
+            "s3://my-bucket/my-folder/year=2022/month=10/day=11/my_csv",
+            [("year", "2022"), ("month", "10"), ("day", "11")],
+            id="autodetect_partitions",
+        ),
+        pytest.param(
+            "s3://my-bucket/{table}/{partition_key[0]}={partition_value[0]}/{partition_key[1]}={partition_value[1]}/{partition_key[2]}={partition_value[2]}/*.csv",
+            "s3://my-bucket/my-folder/year=2022/month=10/day=11/my_csv.csv",
+            [("year", "2022"), ("month", "10"), ("day", "11")],
+            id="partition_key and value set",
+        ),
+        pytest.param(
+            "s3://my-bucket/{table}/{partition_key[0]}={partition[0]}/{partition_key[1]}={partition[1]}/{partition_key[2]}={partition[2]}/*.csv",
+            "s3://my-bucket/my-folder/year=2022/month=10/day=11/my_csv.csv",
+            [("year", "2022"), ("month", "10"), ("day", "11")],
+            id="partition_key and partition set",
+        ),
+        pytest.param(
+            "s3://my-bucket/{table}/{year}/{month}/{day}/*.csv",
+            "s3://my-bucket/my-folder/2022/10/11/my_csv.csv",
+            [("year", "2022"), ("month", "10"), ("day", "11")],
+            id="named partition keys",
+        ),
+        pytest.param(
+            "s3://my-bucket/{table}/{part[0]}/{part[1]}/{part[2]}/*.csv",
+            "s3://my-bucket/my-folder/2022/10/11/my_csv.csv",
+            [("part_0", "2022"), ("part_1", "10"), ("part_2", "11")],
+            id="indexed partition keys",
+        ),
+        pytest.param(
+            "s3://my-bucket/{table}/**",
+            "s3://my-bucket/my-folder/2022/10/11/my_csv.csv",
+            [("partition_0", "2022"), ("partition_1", "10"), ("partition_2", "11")],
+            id="partition autodetect with partition values only",
+        ),
+        pytest.param(
+            "s3://my-bucket/{table}/**",
+            "s3://my-bucket/my-folder/my_csv.csv",
+            None,
+            id="partition autodetect with non partitioned path",
+        ),
+    ],
+)
+def test_path_spec_partition_detection(
+    path_spec: str, path: str, expected: List[Tuple[str, str]]
+) -> None:
+    ps = PathSpec(include=path_spec, default_extension="csv", allow_double_stars=True)
+    assert ps.allowed(path)
+    partitions = ps.get_partition_from_path(path)
+    assert partitions == expected
+
+
 def test_path_spec_dir_allowed():
     path_spec = PathSpec(
         include="s3://my-bucket/my-folder/year=*/month=*/day=*/*.csv",
diff --git a/metadata-ingestion/tests/unit/sagemaker/test_sagemaker_source.py b/metadata-ingestion/tests/unit/sagemaker/test_sagemaker_source.py
index 582d16f5d2612e..995d176c213b24 100644
--- a/metadata-ingestion/tests/unit/sagemaker/test_sagemaker_source.py
+++ b/metadata-ingestion/tests/unit/sagemaker/test_sagemaker_source.py
@@ -1,3 +1,5 @@
+from unittest.mock import patch
+
 from botocore.stub import Stubber
 from freezegun import freeze_time
 
@@ -220,8 +222,17 @@ def test_sagemaker_ingest(tmp_path, pytestconfig):
             {"ModelName": "the-second-model"},
         )
 
-        mce_objects = [wu.metadata for wu in sagemaker_source_instance.get_workunits()]
-        write_metadata_file(tmp_path / "sagemaker_mces.json", mce_objects)
+        # Patch the client factory's get_client method to return the stubbed client for jobs
+        with patch.object(
+            sagemaker_source_instance.client_factory,
+            "get_client",
+            return_value=sagemaker_source_instance.sagemaker_client,
+        ):
+            # Run the test and generate the MCEs
+            mce_objects = [
+                wu.metadata for wu in sagemaker_source_instance.get_workunits()
+            ]
+            write_metadata_file(tmp_path / "sagemaker_mces.json", mce_objects)
 
     # Verify the output.
     test_resources_dir = pytestconfig.rootpath / "tests/unit/sagemaker"
diff --git a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_basic_usage.json b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_basic_usage.json
new file mode 100644
index 00000000000000..6ea29520dc6883
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_basic_usage.json
@@ -0,0 +1,51 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.foo,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1707177600000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 2,
+            "totalSqlQueries": 6,
+            "topSqlQueries": [
+                "SELECT\n  *\nFROM foo",
+                "CREATE TABLE bar AS\nSELECT\n  b + c AS c\nFROM foo"
+            ],
+            "userCounts": [
+                {
+                    "user": "urn:li:corpuser:user1",
+                    "count": 5
+                },
+                {
+                    "user": "urn:li:corpuser:user2",
+                    "count": 1
+                }
+            ],
+            "fieldCounts": [
+                {
+                    "fieldPath": "b",
+                    "count": 6
+                },
+                {
+                    "fieldPath": "c",
+                    "count": 6
+                },
+                {
+                    "fieldPath": "a",
+                    "count": 5
+                }
+            ]
+        }
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_create_table_query_mcps.json b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_create_table_query_mcps.json
new file mode 100644
index 00000000000000..ddb6d931ac9a51
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_create_table_query_mcps.json
@@ -0,0 +1,77 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,dev.dataset.foo,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "operation",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1707182625000,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "operationType": "CREATE",
+            "customProperties": {
+                "query_urn": "urn:li:query:f2e61c641cf14eae74147b6280ae40648516c4b7b58cfca6c4f7fb14ab255ce2"
+            },
+            "lastUpdatedTimestamp": 1707182625000
+        }
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f2e61c641cf14eae74147b6280ae40648516c4b7b58cfca6c4f7fb14ab255ce2",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "CREATE OR REPLACE TABLE `dataset.foo` (\n  date_utc TIMESTAMP,\n  revenue INT64\n)",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1707182625000,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1707182625000,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f2e61c641cf14eae74147b6280ae40648516c4b7b58cfca6c4f7fb14ab255ce2",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,dev.dataset.foo,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,dev.dataset.foo,PROD),date_utc)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,dev.dataset.foo,PROD),revenue)"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:f2e61c641cf14eae74147b6280ae40648516c4b7b58cfca6c4f7fb14ab255ce2",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_lineage_via_temp_table_disordered_add.json b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_lineage_via_temp_table_disordered_add.json
new file mode 100644
index 00000000000000..51a732e7a24940
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_lineage_via_temp_table_disordered_add.json
@@ -0,0 +1,79 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.derived_from_foo,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1707182625000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.bar,PROD)",
+                    "type": "TRANSFORMED",
+                    "query": "urn:li:query:composite_39f4adf89c8ad4d6d307b628c82d8260e1c5cd7eb6fb3a8cbb437421f970c16f"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:composite_39f4adf89c8ad4d6d307b628c82d8260e1c5cd7eb6fb3a8cbb437421f970c16f",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "CREATE TEMPORARY TABLE foo AS\nSELECT\n  a,\n  b + c AS c\nFROM bar;\n\nCREATE TABLE derived_from_foo AS\nSELECT\n  *\nFROM foo",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1707182625000,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:composite_39f4adf89c8ad4d6d307b628c82d8260e1c5cd7eb6fb3a8cbb437421f970c16f",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.bar,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.derived_from_foo,PROD)"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:composite_39f4adf89c8ad4d6d307b628c82d8260e1c5cd7eb6fb3a8cbb437421f970c16f",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:redshift"
+        }
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sql_parsing/goldens/test_bigquery_alter_table_column.json b/metadata-ingestion/tests/unit/sql_parsing/goldens/test_bigquery_alter_table_column.json
new file mode 100644
index 00000000000000..3c6c9737e8e193
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sql_parsing/goldens/test_bigquery_alter_table_column.json
@@ -0,0 +1,14 @@
+{
+    "query_type": "UNKNOWN",
+    "query_type_props": {},
+    "query_fingerprint": "7d04253c3add0194c557942ef9b7485f38e68762d300dad364b9cec8656035b3",
+    "in_tables": [],
+    "out_tables": [
+        "urn:li:dataset:(urn:li:dataPlatform:bigquery,my-bq-project.covid_data.covid_deaths,PROD)"
+    ],
+    "column_lineage": null,
+    "debug_info": {
+        "confidence": 0.2,
+        "generalized_statement": "ALTER TABLE `my-bq-project.covid_data.covid_deaths` DROP COLUMN patient_name"
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sql_parsing/goldens/test_bigquery_information_schema_query.json b/metadata-ingestion/tests/unit/sql_parsing/goldens/test_bigquery_information_schema_query.json
index 4b9bbd06ecba65..f5f573f3d51136 100644
--- a/metadata-ingestion/tests/unit/sql_parsing/goldens/test_bigquery_information_schema_query.json
+++ b/metadata-ingestion/tests/unit/sql_parsing/goldens/test_bigquery_information_schema_query.json
@@ -1,7 +1,7 @@
 {
     "query_type": "SELECT",
     "query_type_props": {},
-    "query_fingerprint": "772187d1c6ce8dbed2dd1ba79975b108d4e733015ffb7bcbf9b7146e64cf9914",
+    "query_fingerprint": "c721ce16410601b36e5f32bd9c5c28488500a93e617363739faebfe71496f163",
     "in_tables": [
         "urn:li:dataset:(urn:li:dataPlatform:bigquery,acryl-staging-2.smoke_test_db_4.INFORMATION_SCHEMA.COLUMNS,PROD)",
         "urn:li:dataset:(urn:li:dataPlatform:bigquery,acryl-staging-2.smoke_test_db_4.INFORMATION_SCHEMA.COLUMN_FIELD_PATHS,PROD)"
@@ -178,6 +178,6 @@
     ],
     "debug_info": {
         "confidence": 0.2,
-        "generalized_statement": "SELECT c.table_catalog AS table_catalog, c.table_schema AS table_schema, c.table_name AS table_name, c.column_name AS column_name, c.ordinal_position AS ordinal_position, cfp.field_path AS field_path, c.is_nullable AS is_nullable, CASE WHEN CONTAINS_SUBSTR(field_path, ?) THEN NULL ELSE c.data_type END AS data_type, description AS comment, c.is_hidden AS is_hidden, c.is_partitioning_column AS is_partitioning_column, c.clustering_ordinal_position AS clustering_ordinal_position FROM `acryl-staging-2`.`smoke_test_db_4`.INFORMATION_SCHEMA.COLUMNS AS c JOIN `acryl-staging-2`.`smoke_test_db_4`.INFORMATION_SCHEMA.COLUMN_FIELD_PATHS AS cfp ON cfp.table_name = c.table_name AND cfp.column_name = c.column_name ORDER BY table_catalog, table_schema, table_name, ordinal_position ASC, data_type DESC"
+        "generalized_statement": "SELECT c.table_catalog AS table_catalog, c.table_schema AS table_schema, c.table_name AS table_name, c.column_name AS column_name, c.ordinal_position AS ordinal_position, cfp.field_path AS field_path, c.is_nullable AS is_nullable, CASE WHEN CONTAINS_SUBSTR(cfp.field_path, ?) THEN NULL ELSE c.data_type END AS data_type, description AS comment, c.is_hidden AS is_hidden, c.is_partitioning_column AS is_partitioning_column, c.clustering_ordinal_position AS clustering_ordinal_position FROM `acryl-staging-2`.`smoke_test_db_4`.INFORMATION_SCHEMA.COLUMNS AS c JOIN `acryl-staging-2`.`smoke_test_db_4`.INFORMATION_SCHEMA.COLUMN_FIELD_PATHS AS cfp ON cfp.table_name = c.table_name AND cfp.column_name = c.column_name ORDER BY table_catalog, table_schema, table_name, ordinal_position ASC, data_type DESC"
     }
 }
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sql_parsing/goldens/test_bigquery_view_from_union.json b/metadata-ingestion/tests/unit/sql_parsing/goldens/test_bigquery_view_from_union.json
index 6d41e1285a387b..7f57e02b7b2db1 100644
--- a/metadata-ingestion/tests/unit/sql_parsing/goldens/test_bigquery_view_from_union.json
+++ b/metadata-ingestion/tests/unit/sql_parsing/goldens/test_bigquery_view_from_union.json
@@ -3,7 +3,7 @@
     "query_type_props": {
         "kind": "VIEW"
     },
-    "query_fingerprint": "e947f7884942bae354b9f90cdb649c01efd85ab9fddf830b0bec194c22652639",
+    "query_fingerprint": "3c811a0b47858c50d1c8f666644986a3d9f4522c3f084249656af345741da690",
     "in_tables": [
         "urn:li:dataset:(urn:li:dataPlatform:bigquery,my_project_2.my_dataset_2.sometable,PROD)",
         "urn:li:dataset:(urn:li:dataPlatform:bigquery,my_project_2.my_dataset_2.sometable2,PROD)"
@@ -59,6 +59,6 @@
     ],
     "debug_info": {
         "confidence": 0.4,
-        "generalized_statement": "CREATE VIEW my_view AS SELECT * FROM my_project_2.my_dataset_2.sometable UNION DISTINCT SELECT * FROM my_project_2.my_dataset_2.sometable2 AS a"
+        "generalized_statement": "CREATE VIEW my_view AS SELECT * FROM my_project_2.my_dataset_2.sometable UNION ALL SELECT * FROM my_project_2.my_dataset_2.sometable2 AS a"
     }
 }
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sql_parsing/goldens/test_merge_from_union.json b/metadata-ingestion/tests/unit/sql_parsing/goldens/test_merge_from_union.json
index 4ba44d9e54c9db..1a75dde4c634f2 100644
--- a/metadata-ingestion/tests/unit/sql_parsing/goldens/test_merge_from_union.json
+++ b/metadata-ingestion/tests/unit/sql_parsing/goldens/test_merge_from_union.json
@@ -1,7 +1,7 @@
 {
     "query_type": "MERGE",
     "query_type_props": {},
-    "query_fingerprint": "38a78af8cc48333df0e4de7d6af5b9507a87dd8a2f129ef97c9b06dce2ca7b9f",
+    "query_fingerprint": "8001b852498d94a7f0f532dcd8cfa05328981ba437df6314466c764cc408969c",
     "in_tables": [
         "urn:li:dataset:(urn:li:dataPlatform:bigquery,demo-pipelines-stg.referrer.prep_from_ios,PROD)",
         "urn:li:dataset:(urn:li:dataPlatform:bigquery,demo-pipelines-stg.referrer.prep_from_web,PROD)"
@@ -12,6 +12,6 @@
     "column_lineage": null,
     "debug_info": {
         "confidence": 0.2,
-        "generalized_statement": "MERGE INTO `demo-pipelines-stg`.`referrer`.`base_union` AS DBT_INTERNAL_DEST USING (SELECT * FROM `demo-pipelines-stg`.`referrer`.`prep_from_ios` WHERE partition_time = ? UNION ALL SELECT * FROM `demo-pipelines-stg`.`referrer`.`prep_from_web` WHERE partition_time = ?) AS DBT_INTERNAL_SOURCE ON FALSE WHEN NOT MATCHED BY SOURCE AND timestamp_trunc(DBT_INTERNAL_DEST.partition_time, DAY) IN (TIMESTAMP(?)) THEN delete WHEN NOT MATCHED THEN INSERT (`platform`, `pageview_id`, `query`, `referrer`, `partition_time`) VALUES (`platform`, `pageview_id`, `query`, `referrer`, `partition_time`)"
+        "generalized_statement": "MERGE INTO `demo-pipelines-stg`.`referrer`.`base_union` AS DBT_INTERNAL_DEST USING (SELECT * FROM `demo-pipelines-stg`.`referrer`.`prep_from_ios` WHERE partition_time = ? UNION ALL SELECT * FROM `demo-pipelines-stg`.`referrer`.`prep_from_web` WHERE partition_time = ?) AS DBT_INTERNAL_SOURCE ON FALSE WHEN NOT MATCHED BY SOURCE AND timestamp_trunc(DBT_INTERNAL_DEST.partition_time, DAY) IN (timestamp(?)) THEN delete WHEN NOT MATCHED THEN INSERT (`platform`, `pageview_id`, `query`, `referrer`, `partition_time`) VALUES (`platform`, `pageview_id`, `query`, `referrer`, `partition_time`)"
     }
 }
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sql_parsing/goldens/test_snowflake_drop_schema.json b/metadata-ingestion/tests/unit/sql_parsing/goldens/test_snowflake_drop_schema.json
new file mode 100644
index 00000000000000..2784b8e9543b28
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sql_parsing/goldens/test_snowflake_drop_schema.json
@@ -0,0 +1,12 @@
+{
+    "query_type": "UNKNOWN",
+    "query_type_props": {},
+    "query_fingerprint": "4eefab57619a812a94030acce0071857561265945e79d798563adb53bd0b9646",
+    "in_tables": [],
+    "out_tables": [],
+    "column_lineage": null,
+    "debug_info": {
+        "confidence": 0.9,
+        "generalized_statement": "DROP SCHEMA my_schema"
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sql_parsing/goldens/test_sqlite_drop_table.json b/metadata-ingestion/tests/unit/sql_parsing/goldens/test_sqlite_drop_table.json
new file mode 100644
index 00000000000000..ae8b3f99897dc7
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sql_parsing/goldens/test_sqlite_drop_table.json
@@ -0,0 +1,14 @@
+{
+    "query_type": "UNKNOWN",
+    "query_type_props": {},
+    "query_fingerprint": "d1c29ad73325b08bb66e62ec00ba1d5be4412ec72b4bbc9c094f1272b9da4f86",
+    "in_tables": [],
+    "out_tables": [
+        "urn:li:dataset:(urn:li:dataPlatform:sqlite,my_schema.my_table,PROD)"
+    ],
+    "column_lineage": null,
+    "debug_info": {
+        "confidence": 0.2,
+        "generalized_statement": "DROP TABLE my_schema.my_table"
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sql_parsing/goldens/test_sqlite_drop_view.json b/metadata-ingestion/tests/unit/sql_parsing/goldens/test_sqlite_drop_view.json
new file mode 100644
index 00000000000000..6650ef396a5705
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sql_parsing/goldens/test_sqlite_drop_view.json
@@ -0,0 +1,14 @@
+{
+    "query_type": "UNKNOWN",
+    "query_type_props": {},
+    "query_fingerprint": "35a3c60e7ed98884dde3f1f5fe9079f844832430589a3326b97d617b8303f191",
+    "in_tables": [],
+    "out_tables": [
+        "urn:li:dataset:(urn:li:dataPlatform:sqlite,my_schema.my_view,PROD)"
+    ],
+    "column_lineage": null,
+    "debug_info": {
+        "confidence": 0.2,
+        "generalized_statement": "DROP VIEW my_schema.my_view"
+    }
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sql_parsing/test_sql_aggregator.py b/metadata-ingestion/tests/unit/sql_parsing/test_sql_aggregator.py
index 5c6abf4c9371d6..0d21936a74d072 100644
--- a/metadata-ingestion/tests/unit/sql_parsing/test_sql_aggregator.py
+++ b/metadata-ingestion/tests/unit/sql_parsing/test_sql_aggregator.py
@@ -4,9 +4,13 @@
 import pytest
 from freezegun import freeze_time
 
+from datahub.configuration.datetimes import parse_user_datetime
+from datahub.configuration.time_window_config import BucketDuration, get_time_bucket
+from datahub.ingestion.source.usage.usage_common import BaseUsageConfig
 from datahub.metadata.urns import CorpUserUrn, DatasetUrn
 from datahub.sql_parsing.sql_parsing_aggregator import (
     KnownQueryLineageInfo,
+    ObservedQuery,
     QueryLogSetting,
     SqlParsingAggregator,
 )
@@ -20,7 +24,7 @@
 from tests.test_helpers.click_helpers import run_datahub_cmd
 
 RESOURCE_DIR = pathlib.Path(__file__).parent / "aggregator_goldens"
-FROZEN_TIME = "2024-02-06 01:23:45"
+FROZEN_TIME = "2024-02-06T01:23:45Z"
 
 
 def _ts(ts: int) -> datetime:
@@ -38,9 +42,11 @@ def test_basic_lineage(pytestconfig: pytest.Config, tmp_path: pathlib.Path) -> N
     )
 
     aggregator.add_observed_query(
-        query="create table foo as select a, b from bar",
-        default_db="dev",
-        default_schema="public",
+        ObservedQuery(
+            query="create table foo as select a, b from bar",
+            default_db="dev",
+            default_schema="public",
+        )
     )
 
     mcps = list(aggregator.gen_metadata())
@@ -79,16 +85,20 @@ def test_overlapping_inserts(pytestconfig: pytest.Config) -> None:
     )
 
     aggregator.add_observed_query(
-        query="insert into downstream (a, b) select a, b from upstream1",
-        default_db="dev",
-        default_schema="public",
-        query_timestamp=_ts(20),
+        ObservedQuery(
+            query="insert into downstream (a, b) select a, b from upstream1",
+            default_db="dev",
+            default_schema="public",
+            timestamp=_ts(20),
+        )
     )
     aggregator.add_observed_query(
-        query="insert into downstream (a, c) select a, c from upstream2",
-        default_db="dev",
-        default_schema="public",
-        query_timestamp=_ts(25),
+        ObservedQuery(
+            query="insert into downstream (a, c) select a, c from upstream2",
+            default_db="dev",
+            default_schema="public",
+            timestamp=_ts(25),
+        )
     )
 
     mcps = list(aggregator.gen_metadata())
@@ -115,28 +125,36 @@ def test_temp_table(pytestconfig: pytest.Config) -> None:
     )
 
     aggregator.add_observed_query(
-        query="create table foo as select a, 2*b as b from bar",
-        default_db="dev",
-        default_schema="public",
-        session_id="session1",
+        ObservedQuery(
+            query="create table foo as select a, 2*b as b from bar",
+            default_db="dev",
+            default_schema="public",
+            session_id="session1",
+        )
     )
     aggregator.add_observed_query(
-        query="create temp table foo as select a, b+c as c from bar",
-        default_db="dev",
-        default_schema="public",
-        session_id="session2",
+        ObservedQuery(
+            query="create temp table foo as select a, b+c as c from bar",
+            default_db="dev",
+            default_schema="public",
+            session_id="session2",
+        )
     )
     aggregator.add_observed_query(
-        query="create table foo_session2 as select * from foo",
-        default_db="dev",
-        default_schema="public",
-        session_id="session2",
+        ObservedQuery(
+            query="create table foo_session2 as select * from foo",
+            default_db="dev",
+            default_schema="public",
+            session_id="session2",
+        )
     )
     aggregator.add_observed_query(
-        query="create table foo_session3 as select * from foo",
-        default_db="dev",
-        default_schema="public",
-        session_id="session3",
+        ObservedQuery(
+            query="create table foo_session3 as select * from foo",
+            default_db="dev",
+            default_schema="public",
+            session_id="session3",
+        )
     )
 
     # foo_session2 should come from bar (via temp table foo), have columns a and c, and depend on bar.{a,b,c}
@@ -161,28 +179,36 @@ def test_multistep_temp_table(pytestconfig: pytest.Config) -> None:
     )
 
     aggregator.add_observed_query(
-        query="create table #temp1 as select a, 2*b as b from upstream1",
-        default_db="dev",
-        default_schema="public",
-        session_id="session1",
+        ObservedQuery(
+            query="create table #temp1 as select a, 2*b as b from upstream1",
+            default_db="dev",
+            default_schema="public",
+            session_id="session1",
+        )
     )
     aggregator.add_observed_query(
-        query="create table #temp2 as select b, c from upstream2",
-        default_db="dev",
-        default_schema="public",
-        session_id="session1",
+        ObservedQuery(
+            query="create table #temp2 as select b, c from upstream2",
+            default_db="dev",
+            default_schema="public",
+            session_id="session1",
+        )
     )
     aggregator.add_observed_query(
-        query="create temp table staging_foo as select up1.a, up1.b, up2.c from #temp1 up1 left join #temp2 up2 on up1.b = up2.b where up1.b > 0",
-        default_db="dev",
-        default_schema="public",
-        session_id="session1",
+        ObservedQuery(
+            query="create temp table staging_foo as select up1.a, up1.b, up2.c from #temp1 up1 left join #temp2 up2 on up1.b = up2.b where up1.b > 0",
+            default_db="dev",
+            default_schema="public",
+            session_id="session1",
+        )
     )
     aggregator.add_observed_query(
-        query="insert into table prod_foo\nselect * from staging_foo",
-        default_db="dev",
-        default_schema="public",
-        session_id="session1",
+        ObservedQuery(
+            query="insert into table prod_foo\nselect * from staging_foo",
+            default_db="dev",
+            default_schema="public",
+            session_id="session1",
+        )
     )
 
     mcps = list(aggregator.gen_metadata())
@@ -221,46 +247,56 @@ def test_overlapping_inserts_from_temp_tables(pytestconfig: pytest.Config) -> No
     # #stage_online_returns is populated from "online_returns", "customer", and "online_survey".
 
     aggregator.add_observed_query(
-        query="create table #stage_in_person_returns as select ipr.customer_id, customer.customer_email, ipr.return_date "
-        "from in_person_returns ipr "
-        "left join customer on in_person_returns.customer_id = customer.customer_id",
-        default_db="dev",
-        default_schema="public",
-        session_id="1234",
+        ObservedQuery(
+            query="create table #stage_in_person_returns as select ipr.customer_id, customer.customer_email, ipr.return_date "
+            "from in_person_returns ipr "
+            "left join customer on in_person_returns.customer_id = customer.customer_id",
+            default_db="dev",
+            default_schema="public",
+            session_id="1234",
+        )
     )
 
     aggregator.add_observed_query(
-        query="create table #stage_online_returns as select online_ret.customer_id, customer.customer_email, online_ret.return_date, online_survey.return_reason "
-        "from online_returns online_ret "
-        "left join customer on online_ret.customer_id = customer.customer_id "
-        "left join online_survey on online_ret.customer_id = online_survey.customer_id and online_ret.return_id = online_survey.event_id",
-        default_db="dev",
-        default_schema="public",
-        session_id="2323",
+        ObservedQuery(
+            query="create table #stage_online_returns as select online_ret.customer_id, customer.customer_email, online_ret.return_date, online_survey.return_reason "
+            "from online_returns online_ret "
+            "left join customer on online_ret.customer_id = customer.customer_id "
+            "left join online_survey on online_ret.customer_id = online_survey.customer_id and online_ret.return_id = online_survey.event_id",
+            default_db="dev",
+            default_schema="public",
+            session_id="2323",
+        )
     )
 
     aggregator.add_observed_query(
-        query="insert into all_returns (customer_id, customer_email, return_date) select customer_id, customer_email, return_date from #stage_in_person_returns",
-        default_db="dev",
-        default_schema="public",
-        session_id="1234",
+        ObservedQuery(
+            query="insert into all_returns (customer_id, customer_email, return_date) select customer_id, customer_email, return_date from #stage_in_person_returns",
+            default_db="dev",
+            default_schema="public",
+            session_id="1234",
+        )
     )
 
     aggregator.add_observed_query(
-        query="insert into all_returns (customer_id, customer_email, return_date, return_reason) select customer_id, customer_email, return_date, return_reason from #stage_online_returns",
-        default_db="dev",
-        default_schema="public",
-        session_id="2323",
+        ObservedQuery(
+            query="insert into all_returns (customer_id, customer_email, return_date, return_reason) select customer_id, customer_email, return_date, return_reason from #stage_online_returns",
+            default_db="dev",
+            default_schema="public",
+            session_id="2323",
+        )
     )
 
     # We only have one create temp table, but the same insert command from multiple sessions.
     # This should get ignored.
     assert len(report.queries_with_non_authoritative_session) == 0
     aggregator.add_observed_query(
-        query="insert into all_returns (customer_id, customer_email, return_date, return_reason) select customer_id, customer_email, return_date, return_reason from #stage_online_returns",
-        default_db="dev",
-        default_schema="public",
-        session_id="5435",
+        ObservedQuery(
+            query="insert into all_returns (customer_id, customer_email, return_date, return_reason) select customer_id, customer_email, return_date, return_reason from #stage_online_returns",
+            default_db="dev",
+            default_schema="public",
+            session_id="5435",
+        )
     )
     assert len(report.queries_with_non_authoritative_session) == 1
 
@@ -283,25 +319,31 @@ def test_aggregate_operations(pytestconfig: pytest.Config) -> None:
     )
 
     aggregator.add_observed_query(
-        query="create table foo as select a, b from bar",
-        default_db="dev",
-        default_schema="public",
-        query_timestamp=_ts(20),
-        user=CorpUserUrn("user1"),
+        ObservedQuery(
+            query="create table foo as select a, b from bar",
+            default_db="dev",
+            default_schema="public",
+            timestamp=_ts(20),
+            user=CorpUserUrn("user1"),
+        )
     )
     aggregator.add_observed_query(
-        query="create table foo as select a, b from bar",
-        default_db="dev",
-        default_schema="public",
-        query_timestamp=_ts(25),
-        user=CorpUserUrn("user2"),
+        ObservedQuery(
+            query="create table foo as select a, b from bar",
+            default_db="dev",
+            default_schema="public",
+            timestamp=_ts(25),
+            user=CorpUserUrn("user2"),
+        )
     )
     aggregator.add_observed_query(
-        query="create table foo as select a, b+1 as b from bar",
-        default_db="dev",
-        default_schema="public",
-        query_timestamp=_ts(26),
-        user=CorpUserUrn("user3"),
+        ObservedQuery(
+            query="create table foo as select a, b+1 as b from bar",
+            default_db="dev",
+            default_schema="public",
+            timestamp=_ts(26),
+            user=CorpUserUrn("user3"),
+        )
     )
 
     # The first query will basically be ignored, as it's a duplicate of the second one.
@@ -394,14 +436,18 @@ def test_column_lineage_deduplication(pytestconfig: pytest.Config) -> None:
     )
 
     aggregator.add_observed_query(
-        query="/* query 1 */ insert into foo (a, b, c) select a, b, c from bar",
-        default_db="dev",
-        default_schema="public",
+        ObservedQuery(
+            query="/* query 1 */ insert into foo (a, b, c) select a, b, c from bar",
+            default_db="dev",
+            default_schema="public",
+        )
     )
     aggregator.add_observed_query(
-        query="/* query 2 */ insert into foo (a, b) select a, b from bar",
-        default_db="dev",
-        default_schema="public",
+        ObservedQuery(
+            query="/* query 2 */ insert into foo (a, b) select a, b from bar",
+            default_db="dev",
+            default_schema="public",
+        )
     )
 
     mcps = list(aggregator.gen_metadata())
@@ -480,16 +526,20 @@ def test_table_rename(pytestconfig: pytest.Config) -> None:
 
     # Add an unrelated query.
     aggregator.add_observed_query(
-        query="create table bar as select a, b from baz",
-        default_db="dev",
-        default_schema="public",
+        ObservedQuery(
+            query="create table bar as select a, b from baz",
+            default_db="dev",
+            default_schema="public",
+        )
     )
 
     # Add the query that created the staging table.
     aggregator.add_observed_query(
-        query="create table foo_staging as select a, b from foo_dep",
-        default_db="dev",
-        default_schema="public",
+        ObservedQuery(
+            query="create table foo_staging as select a, b from foo_dep",
+            default_db="dev",
+            default_schema="public",
+        )
     )
 
     mcps = list(aggregator.gen_metadata())
@@ -499,3 +549,115 @@ def test_table_rename(pytestconfig: pytest.Config) -> None:
         outputs=mcps,
         golden_path=RESOURCE_DIR / "test_table_rename.json",
     )
+
+
+@freeze_time(FROZEN_TIME)
+def test_create_table_query_mcps(pytestconfig: pytest.Config) -> None:
+    aggregator = SqlParsingAggregator(
+        platform="bigquery",
+        generate_lineage=True,
+        generate_usage_statistics=False,
+        generate_operations=True,
+    )
+
+    aggregator.add_observed_query(
+        ObservedQuery(
+            query="create or replace table `dataset.foo` (date_utc timestamp, revenue int);",
+            default_db="dev",
+            default_schema="public",
+            timestamp=datetime.now(),
+        )
+    )
+
+    mcps = list(aggregator.gen_metadata())
+
+    mce_helpers.check_goldens_stream(
+        pytestconfig,
+        outputs=mcps,
+        golden_path=RESOURCE_DIR / "test_create_table_query_mcps.json",
+    )
+
+
+@freeze_time(FROZEN_TIME)
+def test_table_lineage_via_temp_table_disordered_add(
+    pytestconfig: pytest.Config,
+) -> None:
+    aggregator = SqlParsingAggregator(
+        platform="redshift",
+        generate_lineage=True,
+        generate_usage_statistics=False,
+        generate_operations=False,
+    )
+
+    aggregator.add_observed_query(
+        ObservedQuery(
+            query="create table derived_from_foo as select * from foo",
+            default_db="dev",
+            default_schema="public",
+        )
+    )
+    aggregator.add_observed_query(
+        ObservedQuery(
+            query="create temp table foo as select a, b+c as c from bar",
+            default_db="dev",
+            default_schema="public",
+        )
+    )
+
+    mcps = list(aggregator.gen_metadata())
+
+    mce_helpers.check_goldens_stream(
+        pytestconfig,
+        outputs=mcps,
+        golden_path=RESOURCE_DIR
+        / "test_table_lineage_via_temp_table_disordered_add.json",
+    )
+
+
+@freeze_time(FROZEN_TIME)
+def test_basic_usage(pytestconfig: pytest.Config) -> None:
+
+    frozen_timestamp = parse_user_datetime(FROZEN_TIME)
+    aggregator = SqlParsingAggregator(
+        platform="redshift",
+        generate_lineage=False,
+        generate_usage_statistics=True,
+        generate_operations=False,
+        usage_config=BaseUsageConfig(
+            start_time=get_time_bucket(frozen_timestamp, BucketDuration.DAY),
+            end_time=frozen_timestamp,
+        ),
+    )
+
+    aggregator._schema_resolver.add_raw_schema_info(
+        DatasetUrn("redshift", "dev.public.foo").urn(),
+        {"a": "int", "b": "int", "c": "int"},
+    )
+
+    aggregator.add_observed_query(
+        ObservedQuery(
+            query="select * from foo",
+            default_db="dev",
+            default_schema="public",
+            usage_multiplier=5,
+            timestamp=frozen_timestamp,
+            user=CorpUserUrn("user1"),
+        )
+    )
+    aggregator.add_observed_query(
+        ObservedQuery(
+            query="create table bar as select b+c as c from foo",
+            default_db="dev",
+            default_schema="public",
+            timestamp=frozen_timestamp,
+            user=CorpUserUrn("user2"),
+        )
+    )
+
+    mcps = list(aggregator.gen_metadata())
+
+    mce_helpers.check_goldens_stream(
+        pytestconfig,
+        outputs=mcps,
+        golden_path=RESOURCE_DIR / "test_basic_usage.json",
+    )
diff --git a/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_lineage.py b/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_lineage.py
index e5b669329f16c4..fb1d2a0bc50110 100644
--- a/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_lineage.py
+++ b/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_lineage.py
@@ -2,11 +2,22 @@
 
 import pytest
 
+import datahub.testing.check_sql_parser_result as checker
 from datahub.testing.check_sql_parser_result import assert_sql_result
 
 RESOURCE_DIR = pathlib.Path(__file__).parent / "goldens"
 
 
+@pytest.fixture(autouse=True)
+def set_update_sql_parser(
+    pytestconfig: pytest.Config, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    update_golden = pytestconfig.getoption("--update-golden-files")
+
+    if update_golden:
+        monkeypatch.setattr(checker, "UPDATE_FILES", True)
+
+
 def test_invalid_sql():
     assert_sql_result(
         """
@@ -607,7 +618,7 @@ def test_bigquery_view_from_union():
         """
 CREATE VIEW my_view as
 select * from my_project_2.my_dataset_2.sometable
-union
+union all
 select * from my_project_2.my_dataset_2.sometable2 as a
 """,
         dialect="bigquery",
@@ -1188,7 +1199,7 @@ def test_bigquery_information_schema_query() -> None:
   c.ordinal_position as ordinal_position,
   cfp.field_path as field_path,
   c.is_nullable as is_nullable,
-  CASE WHEN CONTAINS_SUBSTR(field_path, ".") THEN NULL ELSE c.data_type END as data_type,
+  CASE WHEN CONTAINS_SUBSTR(cfp.field_path, ".") THEN NULL ELSE c.data_type END as data_type,
   description as comment,
   c.is_hidden as is_hidden,
   c.is_partitioning_column as is_partitioning_column,
@@ -1202,3 +1213,43 @@ def test_bigquery_information_schema_query() -> None:
         dialect="bigquery",
         expected_file=RESOURCE_DIR / "test_bigquery_information_schema_query.json",
     )
+
+
+def test_bigquery_alter_table_column() -> None:
+    assert_sql_result(
+        """\
+ALTER TABLE `my-bq-project.covid_data.covid_deaths` drop COLUMN patient_name
+    """,
+        dialect="bigquery",
+        expected_file=RESOURCE_DIR / "test_bigquery_alter_table_column.json",
+    )
+
+
+def test_sqlite_drop_table() -> None:
+    assert_sql_result(
+        """\
+DROP TABLE my_schema.my_table
+""",
+        dialect="sqlite",
+        expected_file=RESOURCE_DIR / "test_sqlite_drop_table.json",
+    )
+
+
+def test_sqlite_drop_view() -> None:
+    assert_sql_result(
+        """\
+DROP VIEW my_schema.my_view
+""",
+        dialect="sqlite",
+        expected_file=RESOURCE_DIR / "test_sqlite_drop_view.json",
+    )
+
+
+def test_snowflake_drop_schema() -> None:
+    assert_sql_result(
+        """\
+DROP SCHEMA my_schema
+""",
+        dialect="snowflake",
+        expected_file=RESOURCE_DIR / "test_snowflake_drop_schema.json",
+    )
diff --git a/metadata-ingestion/tests/unit/sql_parsing/test_tool_meta_extractor.py b/metadata-ingestion/tests/unit/sql_parsing/test_tool_meta_extractor.py
new file mode 100644
index 00000000000000..6f590b53071467
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sql_parsing/test_tool_meta_extractor.py
@@ -0,0 +1,55 @@
+from datahub.configuration.datetimes import parse_absolute_time
+from datahub.metadata.urns import CorpUserUrn
+from datahub.sql_parsing.sql_parsing_aggregator import PreparsedQuery
+from datahub.sql_parsing.tool_meta_extractor import ToolMetaExtractor
+
+
+def test_extract_mode_metadata() -> None:
+    extractor = ToolMetaExtractor()
+    query = """\
+select * from LONG_TAIL_COMPANIONS.ADOPTION.PET_PROFILES
+LIMIT 100
+-- {"user":"@foo","email":"foo@acryl.io","url":"https://modeanalytics.com/acryltest/reports/6234ff78bc7d/runs/662b21949629/queries/f0aad24d5b37","scheduled":false}
+"""
+
+    entry = PreparsedQuery(
+        query_id=None,
+        query_text=query,
+        upstreams=[],
+        downstream=None,
+        column_lineage=None,
+        column_usage=None,
+        inferred_schema=None,
+        user=CorpUserUrn("mode"),
+        timestamp=parse_absolute_time("2021-08-01T01:02:03Z"),
+    )
+
+    assert extractor.extract_bi_metadata(entry)
+    assert entry.user == CorpUserUrn("foo")
+
+    assert extractor.report.num_queries_meta_extracted["mode"] == 1
+
+
+def test_extract_no_metadata() -> None:
+    extractor = ToolMetaExtractor()
+    query = """\
+select * from LONG_TAIL_COMPANIONS.ADOPTION.PET_PROFILES
+LIMIT 100
+-- random comment on query
+"""
+
+    entry = PreparsedQuery(
+        query_id=None,
+        query_text=query,
+        upstreams=[],
+        downstream=None,
+        column_lineage=None,
+        column_usage=None,
+        inferred_schema=None,
+        user=CorpUserUrn("mode"),
+        timestamp=parse_absolute_time("2021-08-01T01:02:03Z"),
+    )
+
+    assert not extractor.extract_bi_metadata(entry)
+
+    assert extractor.report.num_queries_meta_extracted["mode"] == 0
diff --git a/metadata-ingestion/tests/unit/test_bigquery_lineage.py b/metadata-ingestion/tests/unit/test_bigquery_lineage.py
index 5d8c040b4123b5..7456f2fd1d91c2 100644
--- a/metadata-ingestion/tests/unit/test_bigquery_lineage.py
+++ b/metadata-ingestion/tests/unit/test_bigquery_lineage.py
@@ -3,13 +3,13 @@
 
 import pytest
 
-import datahub.emitter.mce_builder as builder
 from datahub.ingestion.source.bigquery_v2.bigquery_audit import (
     BigQueryTableRef,
     QueryEvent,
 )
 from datahub.ingestion.source.bigquery_v2.bigquery_config import BigQueryV2Config
 from datahub.ingestion.source.bigquery_v2.bigquery_report import BigQueryV2Report
+from datahub.ingestion.source.bigquery_v2.common import BigQueryIdentifierBuilder
 from datahub.ingestion.source.bigquery_v2.lineage import (
     BigqueryLineageExtractor,
     LineageEdge,
@@ -83,7 +83,10 @@ def test_lineage_with_timestamps(lineage_entries: List[QueryEvent]) -> None:
     config = BigQueryV2Config()
     report = BigQueryV2Report()
     extractor: BigqueryLineageExtractor = BigqueryLineageExtractor(
-        config, report, lambda x: builder.make_dataset_urn("bigquery", str(x))
+        config,
+        report,
+        schema_resolver=SchemaResolver(platform="bigquery"),
+        identifiers=BigQueryIdentifierBuilder(config, report),
     )
 
     bq_table = BigQueryTableRef.from_string_name(
@@ -91,8 +94,7 @@ def test_lineage_with_timestamps(lineage_entries: List[QueryEvent]) -> None:
     )
 
     lineage_map: Dict[str, Set[LineageEdge]] = extractor._create_lineage_map(
-        iter(lineage_entries),
-        sql_parser_schema_resolver=SchemaResolver(platform="bigquery"),
+        iter(lineage_entries)
     )
 
     upstream_lineage = extractor.get_lineage_for_table(
@@ -108,7 +110,10 @@ def test_column_level_lineage(lineage_entries: List[QueryEvent]) -> None:
     config = BigQueryV2Config(extract_column_lineage=True, incremental_lineage=False)
     report = BigQueryV2Report()
     extractor: BigqueryLineageExtractor = BigqueryLineageExtractor(
-        config, report, lambda x: builder.make_dataset_urn("bigquery", str(x))
+        config,
+        report,
+        schema_resolver=SchemaResolver(platform="bigquery"),
+        identifiers=BigQueryIdentifierBuilder(config, report),
     )
 
     bq_table = BigQueryTableRef.from_string_name(
@@ -117,7 +122,6 @@ def test_column_level_lineage(lineage_entries: List[QueryEvent]) -> None:
 
     lineage_map: Dict[str, Set[LineageEdge]] = extractor._create_lineage_map(
         lineage_entries[:1],
-        sql_parser_schema_resolver=SchemaResolver(platform="bigquery"),
     )
 
     upstream_lineage = extractor.get_lineage_for_table(
diff --git a/metadata-ingestion/tests/unit/test_bigquery_source.py b/metadata-ingestion/tests/unit/test_bigquery_source.py
index 746cf9b0acfc3e..8ec19e5bb9e56f 100644
--- a/metadata-ingestion/tests/unit/test_bigquery_source.py
+++ b/metadata-ingestion/tests/unit/test_bigquery_source.py
@@ -31,6 +31,7 @@
     BigqueryTable,
     BigqueryTableSnapshot,
     BigqueryView,
+    get_projects,
 )
 from datahub.ingestion.source.bigquery_v2.bigquery_schema_gen import (
     BigQuerySchemaGenerator,
@@ -170,7 +171,11 @@ def test_bigquery_uri_with_credential():
 
 
 @patch.object(BigQueryV2Config, "get_bigquery_client")
-def test_get_projects_with_project_ids(get_bq_client_mock):
+@patch.object(BigQueryV2Config, "get_projects_client")
+def test_get_projects_with_project_ids(
+    get_projects_client,
+    get_bq_client_mock,
+):
     client_mock = MagicMock()
     get_bq_client_mock.return_value = client_mock
     config = BigQueryV2Config.parse_obj(
@@ -179,7 +184,11 @@ def test_get_projects_with_project_ids(get_bq_client_mock):
         }
     )
     source = BigqueryV2Source(config=config, ctx=PipelineContext(run_id="test1"))
-    assert source._get_projects() == [
+    assert get_projects(
+        source.bq_schema_extractor.schema_api,
+        source.report,
+        source.filters,
+    ) == [
         BigqueryProject("test-1", "test-1"),
         BigqueryProject("test-2", "test-2"),
     ]
@@ -189,7 +198,11 @@ def test_get_projects_with_project_ids(get_bq_client_mock):
         {"project_ids": ["test-1", "test-2"], "project_id": "test-3"}
     )
     source = BigqueryV2Source(config=config, ctx=PipelineContext(run_id="test2"))
-    assert source._get_projects() == [
+    assert get_projects(
+        source.bq_schema_extractor.schema_api,
+        source.report,
+        source.filters,
+    ) == [
         BigqueryProject("test-1", "test-1"),
         BigqueryProject("test-2", "test-2"),
     ]
@@ -197,8 +210,10 @@ def test_get_projects_with_project_ids(get_bq_client_mock):
 
 
 @patch.object(BigQueryV2Config, "get_bigquery_client")
+@patch.object(BigQueryV2Config, "get_projects_client")
 def test_get_projects_with_project_ids_overrides_project_id_pattern(
-    get_bq_client_mock,
+    get_projects_client,
+    get_bigquery_client,
 ):
     config = BigQueryV2Config.parse_obj(
         {
@@ -207,7 +222,11 @@ def test_get_projects_with_project_ids_overrides_project_id_pattern(
         }
     )
     source = BigqueryV2Source(config=config, ctx=PipelineContext(run_id="test"))
-    projects = source._get_projects()
+    projects = get_projects(
+        source.bq_schema_extractor.schema_api,
+        source.report,
+        source.filters,
+    )
     assert projects == [
         BigqueryProject(id="test-project", name="test-project"),
         BigqueryProject(id="test-project-2", name="test-project-2"),
@@ -220,13 +239,19 @@ def test_platform_instance_config_always_none():
     )
     assert config.platform_instance is None
 
-    config = BigQueryV2Config(platform_instance="something", project_id="project_id")
-    assert config.project_id == "project_id"
+    config = BigQueryV2Config.parse_obj(
+        dict(platform_instance="something", project_id="project_id")
+    )
+    assert config.project_ids == ["project_id"]
     assert config.platform_instance is None
 
 
 @patch.object(BigQueryV2Config, "get_bigquery_client")
-def test_get_dataplatform_instance_aspect_returns_project_id(get_bq_client_mock):
+@patch.object(BigQueryV2Config, "get_projects_client")
+def test_get_dataplatform_instance_aspect_returns_project_id(
+    get_projects_client,
+    get_bq_client_mock,
+):
     project_id = "project_id"
     expected_instance = (
         f"urn:li:dataPlatformInstance:(urn:li:dataPlatform:bigquery,{project_id})"
@@ -247,7 +272,11 @@ def test_get_dataplatform_instance_aspect_returns_project_id(get_bq_client_mock)
 
 
 @patch.object(BigQueryV2Config, "get_bigquery_client")
-def test_get_dataplatform_instance_default_no_instance(get_bq_client_mock):
+@patch.object(BigQueryV2Config, "get_projects_client")
+def test_get_dataplatform_instance_default_no_instance(
+    get_projects_client,
+    get_bq_client_mock,
+):
     config = BigQueryV2Config.parse_obj({})
     source = BigqueryV2Source(config=config, ctx=PipelineContext(run_id="test"))
     schema_gen = source.bq_schema_extractor
@@ -263,21 +292,30 @@ def test_get_dataplatform_instance_default_no_instance(get_bq_client_mock):
 
 
 @patch.object(BigQueryV2Config, "get_bigquery_client")
-def test_get_projects_with_single_project_id(get_bq_client_mock):
+@patch.object(BigQueryV2Config, "get_projects_client")
+def test_get_projects_with_single_project_id(
+    get_projects_client,
+    get_bq_client_mock,
+):
     client_mock = MagicMock()
     get_bq_client_mock.return_value = client_mock
     config = BigQueryV2Config.parse_obj({"project_id": "test-3"})
     source = BigqueryV2Source(config=config, ctx=PipelineContext(run_id="test1"))
-    assert source._get_projects() == [
+    assert get_projects(
+        source.bq_schema_extractor.schema_api,
+        source.report,
+        source.filters,
+    ) == [
         BigqueryProject("test-3", "test-3"),
     ]
     assert client_mock.list_projects.call_count == 0
 
 
 @patch.object(BigQueryV2Config, "get_bigquery_client")
-def test_get_projects_by_list(get_bq_client_mock):
+@patch.object(BigQueryV2Config, "get_projects_client")
+def test_get_projects_by_list(get_projects_client, get_bigquery_client):
     client_mock = MagicMock()
-    get_bq_client_mock.return_value = client_mock
+    get_bigquery_client.return_value = client_mock
 
     first_page = MagicMock()
     first_page.__iter__.return_value = iter(
@@ -296,11 +334,16 @@ def test_get_projects_by_list(get_bq_client_mock):
         ]
     )
     second_page.next_page_token = None
+
     client_mock.list_projects.side_effect = [first_page, second_page]
 
     config = BigQueryV2Config.parse_obj({})
     source = BigqueryV2Source(config=config, ctx=PipelineContext(run_id="test1"))
-    assert source._get_projects() == [
+    assert get_projects(
+        source.bq_schema_extractor.schema_api,
+        source.report,
+        source.filters,
+    ) == [
         BigqueryProject("test-1", "one"),
         BigqueryProject("test-2", "two"),
         BigqueryProject("test-3", "three"),
@@ -311,7 +354,10 @@ def test_get_projects_by_list(get_bq_client_mock):
 
 @patch.object(BigQuerySchemaApi, "get_projects")
 @patch.object(BigQueryV2Config, "get_bigquery_client")
-def test_get_projects_filter_by_pattern(get_bq_client_mock, get_projects_mock):
+@patch.object(BigQueryV2Config, "get_projects_client")
+def test_get_projects_filter_by_pattern(
+    get_projects_client, get_bq_client_mock, get_projects_mock
+):
     get_projects_mock.return_value = [
         BigqueryProject("test-project", "Test Project"),
         BigqueryProject("test-project-2", "Test Project 2"),
@@ -321,7 +367,11 @@ def test_get_projects_filter_by_pattern(get_bq_client_mock, get_projects_mock):
         {"project_id_pattern": {"deny": ["^test-project$"]}}
     )
     source = BigqueryV2Source(config=config, ctx=PipelineContext(run_id="test"))
-    projects = source._get_projects()
+    projects = get_projects(
+        source.bq_schema_extractor.schema_api,
+        source.report,
+        source.filters,
+    )
     assert projects == [
         BigqueryProject(id="test-project-2", name="Test Project 2"),
     ]
@@ -329,20 +379,29 @@ def test_get_projects_filter_by_pattern(get_bq_client_mock, get_projects_mock):
 
 @patch.object(BigQuerySchemaApi, "get_projects")
 @patch.object(BigQueryV2Config, "get_bigquery_client")
-def test_get_projects_list_empty(get_bq_client_mock, get_projects_mock):
+@patch.object(BigQueryV2Config, "get_projects_client")
+def test_get_projects_list_empty(
+    get_projects_client, get_bq_client_mock, get_projects_mock
+):
     get_projects_mock.return_value = []
 
     config = BigQueryV2Config.parse_obj(
         {"project_id_pattern": {"deny": ["^test-project$"]}}
     )
     source = BigqueryV2Source(config=config, ctx=PipelineContext(run_id="test"))
-    projects = source._get_projects()
+    projects = get_projects(
+        source.bq_schema_extractor.schema_api,
+        source.report,
+        source.filters,
+    )
     assert len(source.report.failures) == 1
     assert projects == []
 
 
 @patch.object(BigQueryV2Config, "get_bigquery_client")
+@patch.object(BigQueryV2Config, "get_projects_client")
 def test_get_projects_list_failure(
+    get_projects_client: MagicMock,
     get_bq_client_mock: MagicMock,
     caplog: pytest.LogCaptureFixture,
 ) -> None:
@@ -357,7 +416,11 @@ def test_get_projects_list_failure(
     source = BigqueryV2Source(config=config, ctx=PipelineContext(run_id="test"))
     caplog.clear()
     with caplog.at_level(logging.ERROR):
-        projects = source._get_projects()
+        projects = get_projects(
+            source.bq_schema_extractor.schema_api,
+            source.report,
+            source.filters,
+        )
         assert len(caplog.records) == 2
         assert error_str in caplog.records[0].msg
     assert len(source.report.failures) == 1
@@ -366,14 +429,21 @@ def test_get_projects_list_failure(
 
 @patch.object(BigQuerySchemaApi, "get_projects")
 @patch.object(BigQueryV2Config, "get_bigquery_client")
-def test_get_projects_list_fully_filtered(get_projects_mock, get_bq_client_mock):
+@patch.object(BigQueryV2Config, "get_projects_client")
+def test_get_projects_list_fully_filtered(
+    get_projects_mock, get_bq_client_mock, get_projects_client
+):
     get_projects_mock.return_value = [BigqueryProject("test-project", "Test Project")]
 
     config = BigQueryV2Config.parse_obj(
         {"project_id_pattern": {"deny": ["^test-project$"]}}
     )
     source = BigqueryV2Source(config=config, ctx=PipelineContext(run_id="test"))
-    projects = source._get_projects()
+    projects = get_projects(
+        source.bq_schema_extractor.schema_api,
+        source.report,
+        source.filters,
+    )
     assert len(source.report.failures) == 0
     assert projects == []
 
@@ -399,7 +469,10 @@ def bigquery_table() -> BigqueryTable:
 
 
 @patch.object(BigQueryV2Config, "get_bigquery_client")
-def test_gen_table_dataset_workunits(get_bq_client_mock, bigquery_table):
+@patch.object(BigQueryV2Config, "get_projects_client")
+def test_gen_table_dataset_workunits(
+    get_projects_client, get_bq_client_mock, bigquery_table
+):
     project_id = "test-project"
     dataset_name = "test-dataset"
     config = BigQueryV2Config.parse_obj(
@@ -471,7 +544,8 @@ def test_gen_table_dataset_workunits(get_bq_client_mock, bigquery_table):
 
 
 @patch.object(BigQueryV2Config, "get_bigquery_client")
-def test_simple_upstream_table_generation(get_bq_client_mock):
+@patch.object(BigQueryV2Config, "get_projects_client")
+def test_simple_upstream_table_generation(get_bq_client_mock, get_projects_client):
     a: BigQueryTableRef = BigQueryTableRef(
         BigqueryTableIdentifier(
             project_id="test-project", dataset="test-dataset", table="a"
@@ -503,8 +577,10 @@ def test_simple_upstream_table_generation(get_bq_client_mock):
 
 
 @patch.object(BigQueryV2Config, "get_bigquery_client")
+@patch.object(BigQueryV2Config, "get_projects_client")
 def test_upstream_table_generation_with_temporary_table_without_temp_upstream(
     get_bq_client_mock,
+    get_projects_client,
 ):
     a: BigQueryTableRef = BigQueryTableRef(
         BigqueryTableIdentifier(
@@ -536,7 +612,10 @@ def test_upstream_table_generation_with_temporary_table_without_temp_upstream(
 
 
 @patch.object(BigQueryV2Config, "get_bigquery_client")
-def test_upstream_table_column_lineage_with_temp_table(get_bq_client_mock):
+@patch.object(BigQueryV2Config, "get_projects_client")
+def test_upstream_table_column_lineage_with_temp_table(
+    get_bq_client_mock, get_projects_client
+):
     from datahub.ingestion.api.common import PipelineContext
 
     a: BigQueryTableRef = BigQueryTableRef(
@@ -611,8 +690,9 @@ def test_upstream_table_column_lineage_with_temp_table(get_bq_client_mock):
 
 
 @patch.object(BigQueryV2Config, "get_bigquery_client")
+@patch.object(BigQueryV2Config, "get_projects_client")
 def test_upstream_table_generation_with_temporary_table_with_multiple_temp_upstream(
-    get_bq_client_mock,
+    get_bq_client_mock, get_projects_client
 ):
     a: BigQueryTableRef = BigQueryTableRef(
         BigqueryTableIdentifier(
@@ -675,7 +755,10 @@ def test_upstream_table_generation_with_temporary_table_with_multiple_temp_upstr
 
 @patch.object(BigQuerySchemaApi, "get_tables_for_dataset")
 @patch.object(BigQueryV2Config, "get_bigquery_client")
-def test_table_processing_logic(get_bq_client_mock, data_dictionary_mock):
+@patch.object(BigQueryV2Config, "get_projects_client")
+def test_table_processing_logic(
+    get_projects_client, get_bq_client_mock, data_dictionary_mock
+):
     client_mock = MagicMock()
     get_bq_client_mock.return_value = client_mock
     config = BigQueryV2Config.parse_obj(
@@ -747,8 +830,9 @@ def test_table_processing_logic(get_bq_client_mock, data_dictionary_mock):
 
 @patch.object(BigQuerySchemaApi, "get_tables_for_dataset")
 @patch.object(BigQueryV2Config, "get_bigquery_client")
+@patch.object(BigQueryV2Config, "get_projects_client")
 def test_table_processing_logic_date_named_tables(
-    get_bq_client_mock, data_dictionary_mock
+    get_projects_client, get_bq_client_mock, data_dictionary_mock
 ):
     client_mock = MagicMock()
     get_bq_client_mock.return_value = client_mock
@@ -859,8 +943,10 @@ def bigquery_view_2() -> BigqueryView:
 
 @patch.object(BigQuerySchemaApi, "get_query_result")
 @patch.object(BigQueryV2Config, "get_bigquery_client")
+@patch.object(BigQueryV2Config, "get_projects_client")
 def test_get_views_for_dataset(
     get_bq_client_mock: Mock,
+    get_projects_client: MagicMock,
     query_mock: Mock,
     bigquery_view_1: BigqueryView,
     bigquery_view_2: BigqueryView,
@@ -889,7 +975,9 @@ def test_get_views_for_dataset(
     )
     query_mock.return_value = [row1, row2]
     bigquery_data_dictionary = BigQuerySchemaApi(
-        BigQueryV2Report().schema_api_perf, client_mock
+        report=BigQueryV2Report().schema_api_perf,
+        client=client_mock,
+        projects_client=MagicMock(),
     )
 
     views = bigquery_data_dictionary.get_views_for_dataset(
@@ -905,8 +993,9 @@ def test_get_views_for_dataset(
     BigQuerySchemaGenerator, "gen_dataset_workunits", lambda *args, **kwargs: []
 )
 @patch.object(BigQueryV2Config, "get_bigquery_client")
+@patch.object(BigQueryV2Config, "get_projects_client")
 def test_gen_view_dataset_workunits(
-    get_bq_client_mock, bigquery_view_1, bigquery_view_2
+    get_projects_client, get_bq_client_mock, bigquery_view_1, bigquery_view_2
 ):
     project_id = "test-project"
     dataset_name = "test-dataset"
@@ -963,7 +1052,9 @@ def bigquery_snapshot() -> BigqueryTableSnapshot:
 
 @patch.object(BigQuerySchemaApi, "get_query_result")
 @patch.object(BigQueryV2Config, "get_bigquery_client")
+@patch.object(BigQueryV2Config, "get_projects_client")
 def test_get_snapshots_for_dataset(
+    get_projects_client: MagicMock,
     get_bq_client_mock: Mock,
     query_mock: Mock,
     bigquery_snapshot: BigqueryTableSnapshot,
@@ -988,7 +1079,9 @@ def test_get_snapshots_for_dataset(
     )
     query_mock.return_value = [row1]
     bigquery_data_dictionary = BigQuerySchemaApi(
-        BigQueryV2Report().schema_api_perf, client_mock
+        report=BigQueryV2Report().schema_api_perf,
+        client=client_mock,
+        projects_client=MagicMock(),
     )
 
     snapshots = bigquery_data_dictionary.get_snapshots_for_dataset(
@@ -1001,7 +1094,10 @@ def test_get_snapshots_for_dataset(
 
 
 @patch.object(BigQueryV2Config, "get_bigquery_client")
-def test_gen_snapshot_dataset_workunits(get_bq_client_mock, bigquery_snapshot):
+@patch.object(BigQueryV2Config, "get_projects_client")
+def test_gen_snapshot_dataset_workunits(
+    get_bq_client_mock, get_projects_client, bigquery_snapshot
+):
     project_id = "test-project"
     dataset_name = "test-dataset"
     config = BigQueryV2Config.parse_obj(
@@ -1140,7 +1236,9 @@ def test_default_config_for_excluding_projects_and_datasets():
 
 @patch.object(BigQueryConnectionConfig, "get_bigquery_client", new=lambda self: None)
 @patch.object(BigQuerySchemaApi, "get_datasets_for_project_id")
+@patch.object(BigQueryV2Config, "get_projects_client")
 def test_excluding_empty_projects_from_ingestion(
+    get_projects_client,
     get_datasets_for_project_id_mock,
 ):
     project_id_with_datasets = "project-id-with-datasets"
@@ -1173,3 +1271,62 @@ def get_datasets_for_project_id_side_effect(
     config = BigQueryV2Config.parse_obj({**base_config, "exclude_empty_projects": True})
     source = BigqueryV2Source(config=config, ctx=PipelineContext(run_id="test-2"))
     assert len({wu.metadata.entityUrn for wu in source.get_workunits()}) == 1  # type: ignore
+
+
+def test_bigquery_config_deprecated_schema_pattern():
+    base_config = {
+        "include_usage_statistics": False,
+        "include_table_lineage": False,
+    }
+
+    config = BigQueryV2Config.parse_obj(base_config)
+    assert config.dataset_pattern == AllowDenyPattern(allow=[".*"])  # default
+
+    config_with_schema_pattern = {
+        **base_config,
+        "schema_pattern": AllowDenyPattern(deny=[".*"]),
+    }
+    config = BigQueryV2Config.parse_obj(config_with_schema_pattern)
+    assert config.dataset_pattern == AllowDenyPattern(deny=[".*"])  # schema_pattern
+
+    config_with_dataset_pattern = {
+        **base_config,
+        "dataset_pattern": AllowDenyPattern(deny=["temp.*"]),
+    }
+    config = BigQueryV2Config.parse_obj(config_with_dataset_pattern)
+    assert config.dataset_pattern == AllowDenyPattern(
+        deny=["temp.*"]
+    )  # dataset_pattern
+
+
+@patch.object(BigQueryV2Config, "get_bigquery_client")
+@patch.object(BigQueryV2Config, "get_projects_client")
+def test_get_projects_with_project_labels(
+    get_projects_client,
+    get_bq_client_mock,
+):
+    client_mock = MagicMock()
+
+    get_projects_client.return_value = client_mock
+
+    client_mock.search_projects.return_value = [
+        SimpleNamespace(project_id="dev", display_name="dev_project"),
+        SimpleNamespace(project_id="qa", display_name="qa_project"),
+    ]
+
+    config = BigQueryV2Config.parse_obj(
+        {
+            "project_labels": ["environment:dev", "environment:qa"],
+        }
+    )
+
+    source = BigqueryV2Source(config=config, ctx=PipelineContext(run_id="test1"))
+
+    assert get_projects(
+        source.bq_schema_extractor.schema_api,
+        source.report,
+        source.filters,
+    ) == [
+        BigqueryProject("dev", "dev_project"),
+        BigqueryProject("qa", "qa_project"),
+    ]
diff --git a/metadata-ingestion/tests/unit/test_bigquery_sql_lineage.py b/metadata-ingestion/tests/unit/test_bigquery_sql_lineage.py
index b685f12fae7747..b2b92f18d0ae93 100644
--- a/metadata-ingestion/tests/unit/test_bigquery_sql_lineage.py
+++ b/metadata-ingestion/tests/unit/test_bigquery_sql_lineage.py
@@ -289,7 +289,7 @@ def test_bigquery_sql_lineage_create_or_replace_view_name_with_hyphens_is_accept
             CREATE OR REPLACE VIEW test-project.dataset.test_view AS
             SELECT *
             FROM project.dataset.src_table_a
-            UNION
+            UNION ALL
             SELECT * FROM `project.dataset.src_table_b`
         """,
         schema_resolver=SchemaResolver(platform="bigquery"),
diff --git a/metadata-ingestion/tests/unit/test_bigquery_usage.py b/metadata-ingestion/tests/unit/test_bigquery_usage.py
index f476e62dd01704..7ff83bff4a72a5 100644
--- a/metadata-ingestion/tests/unit/test_bigquery_usage.py
+++ b/metadata-ingestion/tests/unit/test_bigquery_usage.py
@@ -8,7 +8,6 @@
 from freezegun import freeze_time
 
 from datahub.configuration.time_window_config import BucketDuration
-from datahub.emitter.mce_builder import make_dataset_urn
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.source.bigquery_v2.bigquery_audit import (
@@ -23,6 +22,7 @@
     BigQueryV2Config,
 )
 from datahub.ingestion.source.bigquery_v2.bigquery_report import BigQueryV2Report
+from datahub.ingestion.source.bigquery_v2.common import BigQueryIdentifierBuilder
 from datahub.ingestion.source.bigquery_v2.usage import (
     OPERATION_STATEMENT_TYPES,
     BigQueryUsageExtractor,
@@ -162,21 +162,23 @@ def query_view_1_and_table_1(timestamp: datetime = TS_1, actor: str = ACTOR_1) -
 
 
 def make_usage_workunit(
-    table: Table, dataset_usage_statistics: DatasetUsageStatisticsClass
+    table: Table,
+    dataset_usage_statistics: DatasetUsageStatisticsClass,
+    identifiers: BigQueryIdentifierBuilder,
 ) -> MetadataWorkUnit:
     resource = BigQueryTableRef.from_string_name(TABLE_REFS[table.name])
     return MetadataChangeProposalWrapper(
-        entityUrn=resource.to_urn("PROD"),
+        entityUrn=identifiers.gen_dataset_urn_from_raw_ref(resource),
         aspectName=dataset_usage_statistics.get_aspect_name(),
         aspect=dataset_usage_statistics,
     ).as_workunit()
 
 
 def make_operational_workunit(
-    resource: str, operation: OperationClass
+    resource_urn: str, operation: OperationClass
 ) -> MetadataWorkUnit:
     return MetadataChangeProposalWrapper(
-        entityUrn=BigQueryTableRef.from_string_name(resource).to_urn("PROD"),
+        entityUrn=resource_urn,
         aspectName=operation.get_aspect_name(),
         aspect=operation,
     ).as_workunit()
@@ -204,14 +206,15 @@ def usage_extractor(config: BigQueryV2Config) -> BigQueryUsageExtractor:
         config,
         report,
         schema_resolver=SchemaResolver(platform="bigquery"),
-        dataset_urn_builder=lambda ref: make_dataset_urn(
-            "bigquery", str(ref.table_identifier)
-        ),
+        identifiers=BigQueryIdentifierBuilder(config, report),
     )
 
 
 def make_zero_usage_workunit(
-    table: Table, time: datetime, bucket_duration: BucketDuration = BucketDuration.DAY
+    table: Table,
+    time: datetime,
+    identifiers: BigQueryIdentifierBuilder,
+    bucket_duration: BucketDuration = BucketDuration.DAY,
 ) -> MetadataWorkUnit:
     return make_usage_workunit(
         table=table,
@@ -224,6 +227,7 @@ def make_zero_usage_workunit(
             userCounts=[],
             fieldCounts=[],
         ),
+        identifiers=identifiers,
     )
 
 
@@ -294,9 +298,10 @@ def test_usage_counts_single_bucket_resource_project(
                     ),
                 ],
             ),
+            identifiers=usage_extractor.identifiers,
         ),
-        make_zero_usage_workunit(TABLE_2, TS_1),
-        make_zero_usage_workunit(VIEW_1, TS_1),
+        make_zero_usage_workunit(TABLE_2, TS_1, usage_extractor.identifiers),
+        make_zero_usage_workunit(VIEW_1, TS_1, usage_extractor.identifiers),
     ]
     compare_workunits(workunits, expected)
 
@@ -377,6 +382,7 @@ def test_usage_counts_multiple_buckets_and_resources_view_usage(
                     ),
                 ],
             ),
+            identifiers=usage_extractor.identifiers,
         ),
         make_usage_workunit(
             table=VIEW_1,
@@ -404,6 +410,7 @@ def test_usage_counts_multiple_buckets_and_resources_view_usage(
                 ],
                 fieldCounts=[],
             ),
+            identifiers=usage_extractor.identifiers,
         ),
         make_usage_workunit(
             table=TABLE_2,
@@ -435,6 +442,7 @@ def test_usage_counts_multiple_buckets_and_resources_view_usage(
                     ),
                 ],
             ),
+            identifiers=usage_extractor.identifiers,
         ),
         # TS 2
         make_usage_workunit(
@@ -479,6 +487,7 @@ def test_usage_counts_multiple_buckets_and_resources_view_usage(
                     ),
                 ],
             ),
+            identifiers=usage_extractor.identifiers,
         ),
         make_usage_workunit(
             table=VIEW_1,
@@ -499,6 +508,7 @@ def test_usage_counts_multiple_buckets_and_resources_view_usage(
                 ],
                 fieldCounts=[],
             ),
+            identifiers=usage_extractor.identifiers,
         ),
         make_usage_workunit(
             table=TABLE_2,
@@ -532,6 +542,7 @@ def test_usage_counts_multiple_buckets_and_resources_view_usage(
                     ),
                 ],
             ),
+            identifiers=usage_extractor.identifiers,
         ),
     ]
     compare_workunits(workunits, expected)
@@ -622,6 +633,7 @@ def test_usage_counts_multiple_buckets_and_resources_no_view_usage(
                     ),
                 ],
             ),
+            identifiers=usage_extractor.identifiers,
         ),
         make_usage_workunit(
             table=TABLE_2,
@@ -664,6 +676,7 @@ def test_usage_counts_multiple_buckets_and_resources_no_view_usage(
                     ),
                 ],
             ),
+            identifiers=usage_extractor.identifiers,
         ),
         # TS 2
         make_usage_workunit(
@@ -713,6 +726,7 @@ def test_usage_counts_multiple_buckets_and_resources_no_view_usage(
                     ),
                 ],
             ),
+            identifiers=usage_extractor.identifiers,
         ),
         make_usage_workunit(
             table=TABLE_2,
@@ -764,8 +778,9 @@ def test_usage_counts_multiple_buckets_and_resources_no_view_usage(
                     ),
                 ],
             ),
+            identifiers=usage_extractor.identifiers,
         ),
-        make_zero_usage_workunit(VIEW_1, TS_1),
+        make_zero_usage_workunit(VIEW_1, TS_1, usage_extractor.identifiers),
         # TS_2 not included as only 1 minute of it was ingested
     ]
     compare_workunits(workunits, expected)
@@ -793,7 +808,7 @@ def test_usage_counts_no_query_event(
         workunits = usage_extractor._get_workunits_internal([event], [str(ref)])
         expected = [
             MetadataChangeProposalWrapper(
-                entityUrn=ref.to_urn("PROD"),
+                entityUrn=usage_extractor.identifiers.gen_dataset_urn_from_raw_ref(ref),
                 aspect=DatasetUsageStatisticsClass(
                     timestampMillis=int(TS_1.timestamp() * 1000),
                     eventGranularity=TimeWindowSizeClass(
@@ -872,6 +887,7 @@ def test_usage_counts_no_columns(
                     ],
                     fieldCounts=[],
                 ),
+                identifiers=usage_extractor.identifiers,
             )
         ]
         compare_workunits(workunits, expected)
@@ -991,6 +1007,7 @@ def test_usage_counts_no_columns_and_top_n_limit_hit(
                     ],
                     fieldCounts=[],
                 ),
+                identifiers=usage_extractor.identifiers,
             )
         ]
         compare_workunits(workunits, expected)
@@ -1036,7 +1053,11 @@ def test_operational_stats(
     workunits = usage_extractor._get_workunits_internal(events, table_refs.values())
     expected = [
         make_operational_workunit(
-            table_refs[query.object_modified.name],
+            usage_extractor.identifiers.gen_dataset_urn_from_raw_ref(
+                BigQueryTableRef.from_string_name(
+                    table_refs[query.object_modified.name]
+                )
+            ),
             OperationClass(
                 timestampMillis=int(FROZEN_TIME.timestamp() * 1000),
                 lastUpdatedTimestamp=int(query.timestamp.timestamp() * 1000),
@@ -1053,18 +1074,20 @@ def test_operational_stats(
                 ),
                 affectedDatasets=list(
                     dict.fromkeys(  # Preserve order
-                        BigQueryTableRef.from_string_name(
-                            table_refs[field.table.name]
-                        ).to_urn("PROD")
+                        usage_extractor.identifiers.gen_dataset_urn_from_raw_ref(
+                            BigQueryTableRef.from_string_name(
+                                table_refs[field.table.name]
+                            )
+                        )
                         for field in query.fields_accessed
                         if not field.table.is_view()
                     )
                 )
                 + list(
                     dict.fromkeys(  # Preserve order
-                        BigQueryTableRef.from_string_name(
-                            table_refs[parent.name]
-                        ).to_urn("PROD")
+                        usage_extractor.identifiers.gen_dataset_urn_from_raw_ref(
+                            BigQueryTableRef.from_string_name(table_refs[parent.name])
+                        )
                         for field in query.fields_accessed
                         if field.table.is_view()
                         for parent in field.table.upstreams
diff --git a/metadata-ingestion/tests/unit/test_bigqueryv2_usage_source.py b/metadata-ingestion/tests/unit/test_bigqueryv2_usage_source.py
index 21787af1b0cb9a..63de742b201a97 100644
--- a/metadata-ingestion/tests/unit/test_bigqueryv2_usage_source.py
+++ b/metadata-ingestion/tests/unit/test_bigqueryv2_usage_source.py
@@ -12,6 +12,7 @@
     unquote_and_decode_unicode_escape_seq,
 )
 from datahub.ingestion.source.bigquery_v2.bigquery_report import BigQueryV2Report
+from datahub.ingestion.source.bigquery_v2.common import BigQueryIdentifierBuilder
 from datahub.ingestion.source.bigquery_v2.usage import BigQueryUsageExtractor
 from datahub.sql_parsing.schema_resolver import SchemaResolver
 
@@ -117,11 +118,12 @@ def test_bigqueryv2_filters():
 
     corrected_start_time = config.start_time - config.max_query_duration
     corrected_end_time = config.end_time + config.max_query_duration
+    report = BigQueryV2Report()
     filter: str = BigQueryUsageExtractor(
         config,
-        BigQueryV2Report(),
+        report,
         schema_resolver=SchemaResolver(platform="bigquery"),
-        dataset_urn_builder=lambda x: "",
+        identifiers=BigQueryIdentifierBuilder(config, report),
     )._generate_filter(corrected_start_time, corrected_end_time)
     assert filter == expected_filter
 
diff --git a/metadata-ingestion/tests/unit/test_cli_utils.py b/metadata-ingestion/tests/unit/test_cli_utils.py
index 68cb985af47340..af3a184d97e41c 100644
--- a/metadata-ingestion/tests/unit/test_cli_utils.py
+++ b/metadata-ingestion/tests/unit/test_cli_utils.py
@@ -2,7 +2,7 @@
 from unittest import mock
 
 from datahub.cli import cli_utils
-from datahub.ingestion.graph.client import get_details_from_env
+from datahub.cli.config_utils import _get_config_from_env
 
 
 def test_first_non_null():
@@ -17,14 +17,14 @@ def test_first_non_null():
 
 @mock.patch.dict(os.environ, {"DATAHUB_GMS_HOST": "http://localhost:9092"})
 def test_correct_url_when_gms_host_in_old_format():
-    assert get_details_from_env() == ("http://localhost:9092", None)
+    assert _get_config_from_env() == ("http://localhost:9092", None)
 
 
 @mock.patch.dict(
     os.environ, {"DATAHUB_GMS_HOST": "localhost", "DATAHUB_GMS_PORT": "8080"}
 )
 def test_correct_url_when_gms_host_and_port_set():
-    assert get_details_from_env() == ("http://localhost:8080", None)
+    assert _get_config_from_env() == ("http://localhost:8080", None)
 
 
 @mock.patch.dict(
@@ -36,7 +36,7 @@ def test_correct_url_when_gms_host_and_port_set():
     },
 )
 def test_correct_url_when_gms_host_port_url_set():
-    assert get_details_from_env() == ("http://localhost:8080", None)
+    assert _get_config_from_env() == ("http://localhost:8080", None)
 
 
 @mock.patch.dict(
@@ -49,7 +49,7 @@ def test_correct_url_when_gms_host_port_url_set():
     },
 )
 def test_correct_url_when_gms_host_port_url_protocol_set():
-    assert get_details_from_env() == ("https://localhost:8080", None)
+    assert _get_config_from_env() == ("https://localhost:8080", None)
 
 
 @mock.patch.dict(
@@ -59,7 +59,7 @@ def test_correct_url_when_gms_host_port_url_protocol_set():
     },
 )
 def test_correct_url_when_url_set():
-    assert get_details_from_env() == ("https://example.com", None)
+    assert _get_config_from_env() == ("https://example.com", None)
 
 
 def test_fixup_gms_url():
diff --git a/metadata-ingestion/tests/unit/test_dbt_source.py b/metadata-ingestion/tests/unit/test_dbt_source.py
index 99387ab4e6ae48..90ff78b16f652b 100644
--- a/metadata-ingestion/tests/unit/test_dbt_source.py
+++ b/metadata-ingestion/tests/unit/test_dbt_source.py
@@ -7,7 +7,10 @@
 
 from datahub.emitter import mce_builder
 from datahub.ingestion.api.common import PipelineContext
-from datahub.ingestion.source.dbt.dbt_cloud import DBTCloudConfig
+from datahub.ingestion.source.dbt.dbt_cloud import (
+    DBTCloudConfig,
+    infer_metadata_endpoint,
+)
 from datahub.ingestion.source.dbt.dbt_core import (
     DBTCoreConfig,
     DBTCoreSource,
@@ -226,6 +229,31 @@ def test_dbt_config_skip_sources_in_lineage():
     assert config.skip_sources_in_lineage is True
 
 
+def test_dbt_config_prefer_sql_parser_lineage():
+    with pytest.raises(
+        ValidationError,
+        match="prefer_sql_parser_lineage.*requires.*skip_sources_in_lineage",
+    ):
+        config_dict = {
+            "manifest_path": "dummy_path",
+            "catalog_path": "dummy_path",
+            "target_platform": "dummy_platform",
+            "prefer_sql_parser_lineage": True,
+        }
+        config = DBTCoreConfig.parse_obj(config_dict)
+
+    config_dict = {
+        "manifest_path": "dummy_path",
+        "catalog_path": "dummy_path",
+        "target_platform": "dummy_platform",
+        "skip_sources_in_lineage": True,
+        "prefer_sql_parser_lineage": True,
+    }
+    config = DBTCoreConfig.parse_obj(config_dict)
+    assert config.skip_sources_in_lineage is True
+    assert config.prefer_sql_parser_lineage is True
+
+
 def test_dbt_s3_config():
     # test missing aws config
     config_dict: dict = {
@@ -340,7 +368,7 @@ def test_dbt_entity_emission_configuration_helpers():
 
 def test_dbt_cloud_config_access_url():
     config_dict = {
-        "access_url": "https://my-dbt-cloud.dbt.com",
+        "access_url": "https://emea.getdbt.com",
         "token": "dummy_token",
         "account_id": "123456",
         "project_id": "1234567",
@@ -349,8 +377,8 @@ def test_dbt_cloud_config_access_url():
         "target_platform": "dummy_platform",
     }
     config = DBTCloudConfig.parse_obj(config_dict)
-    assert config.access_url == "https://my-dbt-cloud.dbt.com"
-    assert config.metadata_endpoint == "https://metadata.my-dbt-cloud.dbt.com/graphql"
+    assert config.access_url == "https://emea.getdbt.com"
+    assert config.metadata_endpoint == "https://metadata.emea.getdbt.com/graphql"
 
 
 def test_dbt_cloud_config_with_defined_metadata_endpoint():
@@ -372,6 +400,20 @@ def test_dbt_cloud_config_with_defined_metadata_endpoint():
     )
 
 
+def test_infer_metadata_endpoint() -> None:
+    assert (
+        infer_metadata_endpoint("https://cloud.getdbt.com")
+        == "https://metadata.cloud.getdbt.com/graphql"
+    )
+    assert (
+        infer_metadata_endpoint("https://prefix.us1.dbt.com")
+        == "https://prefix.metadata.us1.dbt.com/graphql"
+    )
+    assert (
+        infer_metadata_endpoint("http://dbt.corp.internal")
+    ) == "http://metadata.dbt.corp.internal/graphql"
+
+
 def test_dbt_time_parsing() -> None:
     time_formats = [
         "2024-03-28T05:56:15.236210Z",
diff --git a/metadata-ingestion/tests/unit/test_glue_source.py b/metadata-ingestion/tests/unit/test_glue_source.py
index b43db47ae00711..45b9899eacaa77 100644
--- a/metadata-ingestion/tests/unit/test_glue_source.py
+++ b/metadata-ingestion/tests/unit/test_glue_source.py
@@ -13,7 +13,11 @@
 from datahub.ingestion.extractor.schema_util import avro_schema_to_mce_fields
 from datahub.ingestion.graph.client import DatahubClientConfig, DataHubGraph
 from datahub.ingestion.sink.file import write_metadata_file
-from datahub.ingestion.source.aws.glue import GlueSource, GlueSourceConfig
+from datahub.ingestion.source.aws.glue import (
+    GlueProfilingConfig,
+    GlueSource,
+    GlueSourceConfig,
+)
 from datahub.ingestion.source.state.sql_common_state import (
     BaseSQLAlchemyCheckpointState,
 )
@@ -38,6 +42,7 @@
     get_databases_delta_response,
     get_databases_response,
     get_databases_response_for_lineage,
+    get_databases_response_profiling,
     get_databases_response_with_resource_link,
     get_dataflow_graph_response_1,
     get_dataflow_graph_response_2,
@@ -54,9 +59,11 @@
     get_tables_response_1,
     get_tables_response_2,
     get_tables_response_for_target_database,
+    get_tables_response_profiling_1,
     resource_link_database,
     tables_1,
     tables_2,
+    tables_profiling_1,
     target_database_tables,
 )
 
@@ -93,6 +100,42 @@ def glue_source(
     )
 
 
+def glue_source_with_profiling(
+    platform_instance: Optional[str] = None,
+    use_s3_bucket_tags: bool = False,
+    use_s3_object_tags: bool = False,
+    extract_delta_schema_from_parameters: bool = False,
+) -> GlueSource:
+    profiling_config = GlueProfilingConfig(
+        enabled=True,
+        profile_table_level_only=False,
+        row_count="row_count",
+        column_count="column_count",
+        unique_count="unique_count",
+        unique_proportion="unique_proportion",
+        null_count="null_count",
+        null_proportion="null_proportion",
+        min="min",
+        max="max",
+        mean="mean",
+        median="median",
+        stdev="stdev",
+    )
+
+    return GlueSource(
+        ctx=PipelineContext(run_id="glue-source-test"),
+        config=GlueSourceConfig(
+            aws_region="us-west-2",
+            extract_transforms=False,
+            platform_instance=platform_instance,
+            use_s3_bucket_tags=use_s3_bucket_tags,
+            use_s3_object_tags=use_s3_object_tags,
+            extract_delta_schema_from_parameters=extract_delta_schema_from_parameters,
+            profiling=profiling_config,
+        ),
+    )
+
+
 column_type_test_cases: Dict[str, Tuple[str, Type]] = {
     "char": ("char", StringTypeClass),
     "array": ("array<int>", ArrayTypeClass),
@@ -641,3 +684,41 @@ def fake_schema_metadata(entity_urn: str) -> models.SchemaMetadataClass:
         output_path=tmp_path / mce_file,
         golden_path=test_resources_dir / mce_golden_file,
     )
+
+
+@freeze_time(FROZEN_TIME)
+def test_glue_ingest_with_profiling(
+    tmp_path: Path,
+    pytestconfig: PytestConfig,
+) -> None:
+    glue_source_instance = glue_source_with_profiling()
+    mce_file = "glue_mces.json"
+    mce_golden_file = "glue_mces_golden_profiling.json"
+    with Stubber(glue_source_instance.glue_client) as glue_stubber:
+        glue_stubber.add_response("get_databases", get_databases_response_profiling, {})
+
+        glue_stubber.add_response(
+            "get_tables",
+            get_tables_response_profiling_1,
+            {"DatabaseName": "flights-database-profiling"},
+        )
+
+        glue_stubber.add_response(
+            "get_table",
+            {"Table": tables_profiling_1[0]},
+            {"DatabaseName": "flights-database-profiling", "Name": "avro-profiling"},
+        )
+
+        mce_objects = [wu.metadata for wu in glue_source_instance.get_workunits()]
+
+        glue_stubber.assert_no_pending_responses()
+
+        write_metadata_file(tmp_path / mce_file, mce_objects)
+
+    # Verify the output.
+    test_resources_dir = pytestconfig.rootpath / "tests/unit/glue"
+    mce_helpers.check_golden_file(
+        pytestconfig,
+        output_path=tmp_path / mce_file,
+        golden_path=test_resources_dir / mce_golden_file,
+    )
diff --git a/metadata-ingestion/tests/unit/test_glue_source_stubs.py b/metadata-ingestion/tests/unit/test_glue_source_stubs.py
index f44a384a02c4ab..46ab65234c22df 100644
--- a/metadata-ingestion/tests/unit/test_glue_source_stubs.py
+++ b/metadata-ingestion/tests/unit/test_glue_source_stubs.py
@@ -973,6 +973,112 @@
 get_tables_lineage_response_1 = {"TableList": tables_lineage_1}
 
 
+get_databases_response_profiling = {
+    "DatabaseList": [
+        {
+            "Name": "flights-database-profiling",
+            "CreateTime": datetime.datetime(2021, 6, 9, 14, 14, 19),
+            "CreateTableDefaultPermissions": [
+                {
+                    "Principal": {
+                        "DataLakePrincipalIdentifier": "IAM_ALLOWED_PRINCIPALS"
+                    },
+                    "Permissions": ["ALL"],
+                }
+            ],
+            "CatalogId": "123412341234",
+            "LocationUri": "s3://test-bucket/test-prefix",
+            "Parameters": {"param1": "value1", "param2": "value2"},
+        },
+    ]
+}
+
+tables_profiling_1 = [
+    {
+        "Name": "avro-profiling",
+        "DatabaseName": "flights-database-profiling",
+        "Owner": "owner",
+        "CreateTime": datetime.datetime(2021, 6, 9, 14, 17, 35),
+        "UpdateTime": datetime.datetime(2021, 6, 9, 14, 17, 35),
+        "LastAccessTime": datetime.datetime(2021, 6, 9, 14, 17, 35),
+        "Retention": 0,
+        "StorageDescriptor": {
+            "Columns": [
+                {
+                    "Name": "yr",
+                    "Type": "int",
+                    "Comment": "test comment",
+                    "Parameters": {
+                        "unique_proportion": "2",
+                        "min": "1",
+                        "median": "2",
+                        "max": "10",
+                        "mean": "1",
+                        "null_proportion": "11",
+                        "unique_count": "1",
+                        "stdev": "3",
+                        "null_count": "0",
+                    },
+                },
+                {"Name": "flightdate", "Type": "string"},
+                {"Name": "uniquecarrier", "Type": "string"},
+                {"Name": "airlineid", "Type": "int"},
+                {"Name": "carrier", "Type": "string"},
+                {"Name": "flightnum", "Type": "string"},
+                {"Name": "origin", "Type": "string"},
+            ],
+            "Location": "s3://crawler-public-us-west-2/flight/avro/",
+            "InputFormat": "org.apache.hadoop.hive.ql.io.avro.AvroContainerInputFormat",
+            "OutputFormat": "org.apache.hadoop.hive.ql.io.avro.AvroContainerOutputFormat",
+            "Compressed": False,
+            "NumberOfBuckets": -1,
+            "SerdeInfo": {
+                "SerializationLibrary": "org.apache.hadoop.hive.serde2.avro.AvroSerDe",
+                "Parameters": {
+                    "avro.schema.literal": '{"type":"record","name":"flights_avro_subset","namespace":"default","fields":[{"name":"yr","type":["null","int"],"default":null},{"name":"flightdate","type":["null","string"],"default":null},{"name":"uniquecarrier","type":["null","string"],"default":null},{"name":"airlineid","type":["null","int"],"default":null},{"name":"carrier","type":["null","string"],"default":null},{"name":"flightnum","type":["null","string"],"default":null},{"name":"origin","type":["null","string"],"default":null},{"name":"dest","type":["null","string"],"default":null},{"name":"depdelay","type":["null","int"],"default":null},{"name":"carrierdelay","type":["null","int"],"default":null},{"name":"weatherdelay","type":["null","int"],"default":null}]}',
+                    "serialization.format": "1",
+                },
+            },
+            "BucketColumns": [],
+            "SortColumns": [],
+            "Parameters": {
+                "CrawlerSchemaDeserializerVersion": "1.0",
+                "CrawlerSchemaSerializerVersion": "1.0",
+                "UPDATED_BY_CRAWLER": "flights-crawler",
+                "averageRecordSize": "55",
+                "avro.schema.literal": '{"type":"record","name":"flights_avro_subset","namespace":"default","fields":[{"name":"yr","type":["null","int"],"default":null},{"name":"flightdate","type":["null","string"],"default":null},{"name":"uniquecarrier","type":["null","string"],"default":null},{"name":"airlineid","type":["null","int"],"default":null},{"name":"carrier","type":["null","string"],"default":null},{"name":"flightnum","type":["null","string"],"default":null},{"name":"origin","type":["null","string"],"default":null},{"name":"dest","type":["null","string"],"default":null},{"name":"depdelay","type":["null","int"],"default":null},{"name":"carrierdelay","type":["null","int"],"default":null},{"name":"weatherdelay","type":["null","int"],"default":null}]}',
+                "classification": "avro",
+                "compressionType": "none",
+                "objectCount": "30",
+                "recordCount": "169222196",
+                "sizeKey": "9503351413",
+                "typeOfData": "file",
+            },
+            "StoredAsSubDirectories": False,
+        },
+        "PartitionKeys": [],
+        "TableType": "EXTERNAL_TABLE",
+        "Parameters": {
+            "CrawlerSchemaDeserializerVersion": "1.0",
+            "CrawlerSchemaSerializerVersion": "1.0",
+            "UPDATED_BY_CRAWLER": "flights-crawler",
+            "averageRecordSize": "55",
+            "avro.schema.literal": '{"type":"record","name":"flights_avro_subset","namespace":"default","fields":[{"name":"yr","type":["null","int"],"default":null},{"name":"flightdate","type":["null","string"],"default":null},{"name":"uniquecarrier","type":["null","string"],"default":null},{"name":"airlineid","type":["null","int"],"default":null},{"name":"carrier","type":["null","string"],"default":null},{"name":"flightnum","type":["null","string"],"default":null},{"name":"origin","type":["null","string"],"default":null},{"name":"dest","type":["null","string"],"default":null},{"name":"depdelay","type":["null","int"],"default":null},{"name":"carrierdelay","type":["null","int"],"default":null},{"name":"weatherdelay","type":["null","int"],"default":null}]}',
+            "classification": "avro",
+            "compressionType": "none",
+            "objectCount": "30",
+            "recordCount": "169222196",
+            "sizeKey": "9503351413",
+            "typeOfData": "file",
+        },
+        "CreatedBy": "arn:aws:sts::123412341234:assumed-role/AWSGlueServiceRole-flights-crawler/AWS-Crawler",
+        "IsRegisteredWithLakeFormation": False,
+        "CatalogId": "123412341234",
+    }
+]
+get_tables_response_profiling_1 = {"TableList": tables_profiling_1}
+
+
 def mock_get_object_response(raw_body: str) -> Dict[str, Any]:
     """
     Mock s3 client get_object() response object.
diff --git a/metadata-ingestion/tests/unit/test_mapping.py b/metadata-ingestion/tests/unit/test_mapping.py
index 0e176710bb4f39..75eacf9509a533 100644
--- a/metadata-ingestion/tests/unit/test_mapping.py
+++ b/metadata-ingestion/tests/unit/test_mapping.py
@@ -186,8 +186,9 @@ def test_operation_processor_advanced_matching_owners():
 def test_operation_processor_ownership_category():
     raw_props = {
         "user_owner": "@test_user",
-        "business_owner": "alice",
+        "business_owner": "alice,urn:li:corpGroup:biz-data-team",
         "architect": "bob",
+        "producer": "urn:li:corpGroup:producer-group",
     }
     processor = OperationProcessor(
         operation_defs={
@@ -215,6 +216,14 @@ def test_operation_processor_ownership_category():
                     "owner_category": "urn:li:ownershipType:architect",
                 },
             },
+            "producer": {
+                "match": ".*",
+                "operation": "add_owner",
+                "config": {
+                    # Testing using full urns without any owner_type set.
+                    "owner_category": OwnershipTypeClass.PRODUCER,
+                },
+            },
         },
         owner_source_type="SOURCE_CONTROL",
     )
@@ -222,20 +231,30 @@ def test_operation_processor_ownership_category():
     assert "add_owner" in aspect_map
 
     ownership_aspect: OwnershipClass = aspect_map["add_owner"]
-    assert len(ownership_aspect.owners) == 3
+    assert len(ownership_aspect.owners) == 5
+    assert all(
+        new_owner.source and new_owner.source.type == "SOURCE_CONTROL"
+        for new_owner in ownership_aspect.owners
+    )
+
     new_owner: OwnerClass = ownership_aspect.owners[0]
+    assert new_owner.owner == "urn:li:corpGroup:biz-data-team"
+    assert new_owner.type and new_owner.type == OwnershipTypeClass.BUSINESS_OWNER
+
+    new_owner = ownership_aspect.owners[1]
+    assert new_owner.owner == "urn:li:corpGroup:producer-group"
+    assert new_owner.type and new_owner.type == OwnershipTypeClass.PRODUCER
+
+    new_owner = ownership_aspect.owners[2]
     assert new_owner.owner == "urn:li:corpGroup:test_user"
-    assert new_owner.source and new_owner.source.type == "SOURCE_CONTROL"
     assert new_owner.type and new_owner.type == OwnershipTypeClass.DATA_STEWARD
 
-    new_owner = ownership_aspect.owners[1]
+    new_owner = ownership_aspect.owners[3]
     assert new_owner.owner == "urn:li:corpuser:alice"
-    assert new_owner.source and new_owner.source.type == "SOURCE_CONTROL"
     assert new_owner.type and new_owner.type == OwnershipTypeClass.BUSINESS_OWNER
 
-    new_owner = ownership_aspect.owners[2]
+    new_owner = ownership_aspect.owners[4]
     assert new_owner.owner == "urn:li:corpuser:bob"
-    assert new_owner.source and new_owner.source.type == "SOURCE_CONTROL"
     assert new_owner.type == OwnershipTypeClass.CUSTOM
     assert new_owner.typeUrn == "urn:li:ownershipType:architect"
 
diff --git a/metadata-ingestion/tests/unit/test_packages.py b/metadata-ingestion/tests/unit/test_packages.py
index 69fe42e9f1e8a2..f4045bac6e6ef4 100644
--- a/metadata-ingestion/tests/unit/test_packages.py
+++ b/metadata-ingestion/tests/unit/test_packages.py
@@ -2,6 +2,7 @@
 import setuptools
 
 from datahub.testing.check_imports import ensure_no_indirect_model_imports
+from datahub.testing.check_str_enum import ensure_no_enum_mixin
 
 
 def test_package_list_match_inits():
@@ -15,3 +16,9 @@ def test_check_import_paths(pytestconfig: pytest.Config) -> None:
     root = pytestconfig.rootpath
 
     ensure_no_indirect_model_imports([root / "src", root / "tests"])
+
+
+def test_check_str_enum_usage(pytestconfig: pytest.Config) -> None:
+    root = pytestconfig.rootpath
+
+    ensure_no_enum_mixin([root / "src", root / "tests"])
diff --git a/metadata-ingestion/tests/unit/test_pipeline.py b/metadata-ingestion/tests/unit/test_pipeline.py
index 01403163bbfbdf..defa117e370f00 100644
--- a/metadata-ingestion/tests/unit/test_pipeline.py
+++ b/metadata-ingestion/tests/unit/test_pipeline.py
@@ -11,6 +11,7 @@
 from datahub.ingestion.api.source import Source, SourceReport
 from datahub.ingestion.api.transform import Transformer
 from datahub.ingestion.api.workunit import MetadataWorkUnit
+from datahub.ingestion.graph.config import DatahubClientConfig
 from datahub.ingestion.run.pipeline import Pipeline, PipelineContext
 from datahub.ingestion.sink.datahub_rest import DatahubRestSink
 from datahub.metadata.com.linkedin.pegasus2avro.mxe import SystemMetadata
@@ -60,7 +61,13 @@ def test_configure(self, mock_sink, mock_source, mock_consumer):
         "datahub.ingestion.graph.client.DataHubGraph.get_config",
         return_value={"noCode": True},
     )
-    def test_configure_without_sink(self, mock_emitter, mock_graph):
+    @patch(
+        "datahub.cli.config_utils.load_client_config",
+        return_value=DatahubClientConfig(server="http://fake-gms-server:8080"),
+    )
+    def test_configure_without_sink(
+        self, mock_emitter, mock_graph, mock_load_client_config
+    ):
         pipeline = Pipeline.create(
             {
                 "source": {
@@ -71,8 +78,44 @@ def test_configure_without_sink(self, mock_emitter, mock_graph):
         )
         # assert that the default sink is a DatahubRestSink
         assert isinstance(pipeline.sink, DatahubRestSink)
-        assert pipeline.sink.config.server == "http://localhost:8080"
-        # token value is read from ~/.datahubenv which may be None or not
+        assert pipeline.sink.config.server == "http://fake-gms-server:8080"
+        assert pipeline.sink.config.token is None
+
+    @freeze_time(FROZEN_TIME)
+    @patch(
+        "datahub.emitter.rest_emitter.DatahubRestEmitter.test_connection",
+        return_value={"noCode": True},
+    )
+    @patch(
+        "datahub.ingestion.graph.client.DataHubGraph.get_config",
+        return_value={"noCode": True},
+    )
+    @patch(
+        "datahub.cli.config_utils.load_client_config",
+        return_value=DatahubClientConfig(server="http://fake-internal-server:8080"),
+    )
+    @patch(
+        "datahub.cli.config_utils.get_system_auth",
+        return_value="Basic user:pass",
+    )
+    def test_configure_without_sink_use_system_auth(
+        self, mock_emitter, mock_graph, mock_load_client_config, mock_get_system_auth
+    ):
+        pipeline = Pipeline.create(
+            {
+                "source": {
+                    "type": "file",
+                    "config": {"path": "test_file.json"},
+                },
+            }
+        )
+        # assert that the default sink is a DatahubRestSink
+        assert isinstance(pipeline.sink, DatahubRestSink)
+        assert pipeline.sink.config.server == "http://fake-internal-server:8080"
+        assert pipeline.sink.config.token is None
+        assert (
+            pipeline.sink.emitter._session.headers["Authorization"] == "Basic user:pass"
+        )
 
     @freeze_time(FROZEN_TIME)
     @patch(
diff --git a/metadata-ingestion/tests/unit/test_rest_sink.py b/metadata-ingestion/tests/unit/test_rest_sink.py
index efa6c6678a8c75..a76f96039c2c71 100644
--- a/metadata-ingestion/tests/unit/test_rest_sink.py
+++ b/metadata-ingestion/tests/unit/test_rest_sink.py
@@ -1,7 +1,9 @@
 import json
+from datetime import datetime, timezone
 
 import pytest
 import requests
+from freezegun import freeze_time
 
 import datahub.metadata.schema_classes as models
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
@@ -9,6 +11,7 @@
 
 MOCK_GMS_ENDPOINT = "http://fakegmshost:8080"
 
+FROZEN_TIME = 1618987484580
 basicAuditStamp = models.AuditStampClass(
     time=1618987484580,
     actor="urn:li:corpuser:datahub",
@@ -76,7 +79,7 @@
                     }
                 },
                 "systemMetadata": {
-                    "lastObserved": 0,
+                    "lastObserved": FROZEN_TIME,
                     "lastRunId": "no-run-id-provided",
                     "properties": {
                         "clientId": "acryl-datahub",
@@ -134,7 +137,7 @@
                     }
                 },
                 "systemMetadata": {
-                    "lastObserved": 0,
+                    "lastObserved": FROZEN_TIME,
                     "lastRunId": "no-run-id-provided",
                     "properties": {
                         "clientId": "acryl-datahub",
@@ -178,7 +181,7 @@
                     }
                 },
                 "systemMetadata": {
-                    "lastObserved": 0,
+                    "lastObserved": FROZEN_TIME,
                     "lastRunId": "no-run-id-provided",
                     "properties": {
                         "clientId": "acryl-datahub",
@@ -263,7 +266,7 @@
                         "contentType": "application/json",
                     },
                     "systemMetadata": {
-                        "lastObserved": 0,
+                        "lastObserved": FROZEN_TIME,
                         "lastRunId": "no-run-id-provided",
                         "properties": {
                             "clientId": "acryl-datahub",
@@ -276,6 +279,7 @@
         ),
     ],
 )
+@freeze_time(datetime.fromtimestamp(FROZEN_TIME / 1000, tz=timezone.utc))
 def test_datahub_rest_emitter(requests_mock, record, path, snapshot):
     def match_request_text(request: requests.Request) -> bool:
         requested_snapshot = request.json()
diff --git a/metadata-ingestion/tests/unit/test_tableau_source.py b/metadata-ingestion/tests/unit/test_tableau_source.py
index f5410b161ed703..c81aa0bd8a1b1a 100644
--- a/metadata-ingestion/tests/unit/test_tableau_source.py
+++ b/metadata-ingestion/tests/unit/test_tableau_source.py
@@ -1,8 +1,37 @@
+from typing import Any, Dict
+
 import pytest
 
-import datahub.ingestion.source.tableau_constant as c
-from datahub.ingestion.source.tableau import TableauSiteSource
-from datahub.ingestion.source.tableau_common import get_filter_pages, make_filter
+import datahub.ingestion.source.tableau.tableau_constant as c
+from datahub.ingestion.source.tableau.tableau import TableauSiteSource
+from datahub.ingestion.source.tableau.tableau_common import (
+    get_filter_pages,
+    make_filter,
+    tableau_field_to_schema_field,
+)
+from datahub.metadata.com.linkedin.pegasus2avro.schema import SchemaField
+
+
+def test_tablea_source_handles_none_nativedatatype():
+    field: Dict[str, Any] = {
+        "__typename": "CalculatedField",
+        "id": "abcd",
+        "name": "Test Field",
+        "description": None,
+        "isHidden": False,
+        "folderName": None,
+        "upstreamFields": [],
+        "upstreamColumns": [],
+        "role": None,
+        "dataType": None,
+        "defaultFormat": "s",
+        "aggregation": None,
+        "formula": "a/b + d",
+    }
+    schema_field: SchemaField = tableau_field_to_schema_field(
+        field=field, ingest_tags=False
+    )
+    assert schema_field.nativeDataType == "UNKNOWN"
 
 
 def test_tableau_source_unescapes_lt():
diff --git a/metadata-ingestion/tests/unit/test_transform_dataset.py b/metadata-ingestion/tests/unit/test_transform_dataset.py
index 4c4e1620f4faae..b8a1222125d103 100644
--- a/metadata-ingestion/tests/unit/test_transform_dataset.py
+++ b/metadata-ingestion/tests/unit/test_transform_dataset.py
@@ -71,6 +71,7 @@
     DatasetTagDomainMapper,
 )
 from datahub.ingestion.transformer.dataset_transformer import (
+    ContainerTransformer,
     DatasetTransformer,
     TagTransformer,
 )
@@ -88,7 +89,10 @@
 from datahub.ingestion.transformer.remove_dataset_ownership import (
     SimpleRemoveDatasetOwnership,
 )
-from datahub.ingestion.transformer.replace_external_url import ReplaceExternalUrl
+from datahub.ingestion.transformer.replace_external_url import (
+    ReplaceExternalUrlContainer,
+    ReplaceExternalUrlDataset,
+)
 from datahub.ingestion.transformer.tags_to_terms import TagsToTermMapper
 from datahub.metadata.schema_classes import (
     BrowsePathsClass,
@@ -134,6 +138,22 @@ def make_generic_dataset_mcp(
     )
 
 
+def make_generic_container_mcp(
+    entity_urn: str = "urn:li:container:6338f55439c7ae58243a62c4d6fbffeee",
+    aspect_name: str = "status",
+    aspect: Any = None,
+) -> MetadataChangeProposalWrapper:
+    if aspect is None:
+        aspect = models.StatusClass(removed=False)
+    return MetadataChangeProposalWrapper(
+        entityUrn=entity_urn,
+        entityType=Urn.create_from_string(entity_urn).get_type(),
+        aspectName=aspect_name,
+        changeType="UPSERT",
+        aspect=aspect,
+    )
+
+
 def create_and_run_test_pipeline(
     events: List[Union[MetadataChangeEventClass, MetadataChangeProposalWrapper]],
     transformers: List[Dict[str, Any]],
@@ -1929,6 +1949,41 @@ def run_dataset_transformer_pipeline(
     return outputs
 
 
+def run_container_transformer_pipeline(
+    transformer_type: Type[ContainerTransformer],
+    aspect: Optional[builder.Aspect],
+    config: dict,
+    pipeline_context: Optional[PipelineContext] = None,
+    use_mce: bool = False,
+) -> List[RecordEnvelope]:
+    if pipeline_context is None:
+        pipeline_context = PipelineContext(run_id="transformer_pipe_line")
+    transformer: ContainerTransformer = cast(
+        ContainerTransformer, transformer_type.create(config, pipeline_context)
+    )
+
+    container: Union[MetadataChangeEventClass, MetadataChangeProposalWrapper]
+    if use_mce:
+        container = MetadataChangeEventClass(
+            proposedSnapshot=models.DatasetSnapshotClass(
+                urn="urn:li:container:6338f55439c7ae58243a62c4d6fbffde",
+                aspects=[],
+            )
+        )
+    else:
+        assert aspect
+        container = make_generic_container_mcp(
+            aspect=aspect, aspect_name=transformer.aspect_name()
+        )
+
+    outputs = list(
+        transformer.transform(
+            [RecordEnvelope(input, metadata={}) for input in [container, EndOfStream()]]
+        )
+    )
+    return outputs
+
+
 def test_simple_add_dataset_domain_aspect_name(mock_datahub_graph):
     pipeline_context: PipelineContext = PipelineContext(
         run_id="test_simple_add_dataset_domain"
@@ -3235,7 +3290,7 @@ def test_replace_external_url_word_replace(
     pipeline_context.graph = mock_datahub_graph(DatahubClientConfig)
 
     output = run_dataset_transformer_pipeline(
-        transformer_type=ReplaceExternalUrl,
+        transformer_type=ReplaceExternalUrlDataset,
         aspect=models.DatasetPropertiesClass(
             externalUrl="https://github.com/datahub/looker-demo/blob/master/foo.view.lkml",
             customProperties=EXISTING_PROPERTIES.copy(),
@@ -3262,7 +3317,7 @@ def test_replace_external_regex_replace_1(
     pipeline_context.graph = mock_datahub_graph(DatahubClientConfig)
 
     output = run_dataset_transformer_pipeline(
-        transformer_type=ReplaceExternalUrl,
+        transformer_type=ReplaceExternalUrlDataset,
         aspect=models.DatasetPropertiesClass(
             externalUrl="https://github.com/datahub/looker-demo/blob/master/foo.view.lkml",
             customProperties=EXISTING_PROPERTIES.copy(),
@@ -3289,7 +3344,7 @@ def test_replace_external_regex_replace_2(
     pipeline_context.graph = mock_datahub_graph(DatahubClientConfig)
 
     output = run_dataset_transformer_pipeline(
-        transformer_type=ReplaceExternalUrl,
+        transformer_type=ReplaceExternalUrlDataset,
         aspect=models.DatasetPropertiesClass(
             externalUrl="https://github.com/datahub/looker-demo/blob/master/foo.view.lkml",
             customProperties=EXISTING_PROPERTIES.copy(),
@@ -3867,3 +3922,87 @@ def fake_get_partial_match_tags(entity_urn: str) -> models.GlobalTagsClass:
     assert isinstance(terms_aspect, models.GlossaryTermsClass)
     assert len(terms_aspect.terms) == 1
     assert terms_aspect.terms[0].urn == "urn:li:glossaryTerm:example1"
+
+
+def test_replace_external_url_container_word_replace(
+    mock_datahub_graph,
+):
+    pipeline_context: PipelineContext = PipelineContext(
+        run_id="test_replace_external_url_container"
+    )
+    pipeline_context.graph = mock_datahub_graph(DatahubClientConfig)
+
+    output = run_container_transformer_pipeline(
+        transformer_type=ReplaceExternalUrlContainer,
+        aspect=models.ContainerPropertiesClass(
+            externalUrl="https://github.com/datahub/looker-demo/blob/master/foo.view.lkml",
+            customProperties=EXISTING_PROPERTIES.copy(),
+            name="sample_test",
+        ),
+        config={"input_pattern": "datahub", "replacement": "starhub"},
+        pipeline_context=pipeline_context,
+    )
+
+    assert len(output) == 2
+    assert output[0].record
+    assert output[0].record.aspect
+    assert (
+        output[0].record.aspect.externalUrl
+        == "https://github.com/starhub/looker-demo/blob/master/foo.view.lkml"
+    )
+
+
+def test_replace_external_regex_container_replace_1(
+    mock_datahub_graph,
+):
+    pipeline_context: PipelineContext = PipelineContext(
+        run_id="test_replace_external_url_container"
+    )
+    pipeline_context.graph = mock_datahub_graph(DatahubClientConfig)
+
+    output = run_container_transformer_pipeline(
+        transformer_type=ReplaceExternalUrlContainer,
+        aspect=models.ContainerPropertiesClass(
+            externalUrl="https://github.com/datahub/looker-demo/blob/master/foo.view.lkml",
+            customProperties=EXISTING_PROPERTIES.copy(),
+            name="sample_test",
+        ),
+        config={"input_pattern": r"datahub/.*/", "replacement": "starhub/test/"},
+        pipeline_context=pipeline_context,
+    )
+
+    assert len(output) == 2
+    assert output[0].record
+    assert output[0].record.aspect
+    assert (
+        output[0].record.aspect.externalUrl
+        == "https://github.com/starhub/test/foo.view.lkml"
+    )
+
+
+def test_replace_external_regex_container_replace_2(
+    mock_datahub_graph,
+):
+    pipeline_context: PipelineContext = PipelineContext(
+        run_id="test_replace_external_url_container"
+    )
+    pipeline_context.graph = mock_datahub_graph(DatahubClientConfig)
+
+    output = run_container_transformer_pipeline(
+        transformer_type=ReplaceExternalUrlContainer,
+        aspect=models.ContainerPropertiesClass(
+            externalUrl="https://github.com/datahub/looker-demo/blob/master/foo.view.lkml",
+            customProperties=EXISTING_PROPERTIES.copy(),
+            name="sample_test",
+        ),
+        config={"input_pattern": r"\b\w*hub\b", "replacement": "test"},
+        pipeline_context=pipeline_context,
+    )
+
+    assert len(output) == 2
+    assert output[0].record
+    assert output[0].record.aspect
+    assert (
+        output[0].record.aspect.externalUrl
+        == "https://test.com/test/looker-demo/blob/master/foo.view.lkml"
+    )
diff --git a/metadata-ingestion/tests/unit/utilities/test_file_backed_collections.py b/metadata-ingestion/tests/unit/utilities/test_file_backed_collections.py
index 06d1cfc7d154d4..f4062f9a911453 100644
--- a/metadata-ingestion/tests/unit/utilities/test_file_backed_collections.py
+++ b/metadata-ingestion/tests/unit/utilities/test_file_backed_collections.py
@@ -186,6 +186,42 @@ def test_file_dict_stores_counter() -> None:
         assert in_memory_counters[i].most_common(2) == cache[str(i)].most_common(2)
 
 
+def test_file_dict_ordering() -> None:
+    """
+    We require that FileBackedDict maintains insertion order, similar to Python's
+    built-in dict. This test makes one of each and validates that they behave the same.
+    """
+
+    cache = FileBackedDict[int](
+        serializer=str,
+        deserializer=int,
+        cache_max_size=1,
+    )
+    data = {}
+
+    num_items = 14
+
+    for i in range(num_items):
+        cache[str(i)] = i
+        data[str(i)] = i
+
+    assert list(cache.items()) == list(data.items())
+
+    # Try some deletes.
+    for i in range(3, num_items, 3):
+        del cache[str(i)]
+        del data[str(i)]
+
+    assert list(cache.items()) == list(data.items())
+
+    # And some updates + inserts.
+    for i in range(2, num_items, 2):
+        cache[str(i)] = i * 10
+        data[str(i)] = i * 10
+
+    assert list(cache.items()) == list(data.items())
+
+
 @dataclass
 class Pair:
     x: int
diff --git a/metadata-ingestion/tests/unit/utilities/test_incremental_lineage_helper.py b/metadata-ingestion/tests/unit/utilities/test_incremental_lineage_helper.py
new file mode 100644
index 00000000000000..1db4e48fce6088
--- /dev/null
+++ b/metadata-ingestion/tests/unit/utilities/test_incremental_lineage_helper.py
@@ -0,0 +1,40 @@
+from typing import Optional
+
+from datahub.ingestion.api.incremental_lineage_helper import convert_chart_info_to_patch
+from datahub.ingestion.api.workunit import MetadataWorkUnit
+from datahub.metadata.schema_classes import (
+    ChangeAuditStampsClass,
+    ChartInfoClass,
+    MetadataChangeProposalClass,
+)
+
+
+def test_convert_chart_info_to_patch():
+    chart_info_class: ChartInfoClass = ChartInfoClass(
+        title="foo",
+        description="Checking patch",
+        inputs=[
+            "urn:li:dataset:(urn:li:dataPlatform:dbt,long_tail_companions.analytics.pet_details,PROD)",
+            "urn:li:dataset:(urn:li:dataPlatform:dbt,calm-pagoda-323403.jaffle_shop.customers,PROD)",
+        ],
+        lastModified=ChangeAuditStampsClass(),
+    )
+
+    mw: Optional[MetadataWorkUnit] = convert_chart_info_to_patch(
+        urn="urn:li:chart:(looker,dashboard_elements.1)",
+        aspect=chart_info_class,
+        system_metadata=None,
+    )
+
+    assert mw
+
+    assert mw.id == "urn:li:chart:(looker,dashboard_elements.1)-chartInfo"
+
+    assert isinstance(mw.metadata, MetadataChangeProposalClass)
+
+    assert mw.metadata.aspect
+
+    assert (
+        mw.metadata.aspect.value
+        == b'[{"op": "add", "path": "/title", "value": "foo"}, {"op": "add", "path": "/lastModified", "value": {"created": {"time": 0, "actor": "urn:li:corpuser:unknown"}, "lastModified": {"time": 0, "actor": "urn:li:corpuser:unknown"}}}, {"op": "add", "path": "/description", "value": "Checking patch"}, {"op": "add", "path": "/inputs/urn:li:dataset:(urn:li:dataPlatform:dbt,long_tail_companions.analytics.pet_details,PROD)", "value": "urn:li:dataset:(urn:li:dataPlatform:dbt,long_tail_companions.analytics.pet_details,PROD)"}, {"op": "add", "path": "/inputs/urn:li:dataset:(urn:li:dataPlatform:dbt,calm-pagoda-323403.jaffle_shop.customers,PROD)", "value": "urn:li:dataset:(urn:li:dataPlatform:dbt,calm-pagoda-323403.jaffle_shop.customers,PROD)"}]'
+    )
diff --git a/metadata-ingestion/tests/unit/utilities/test_sqlalchemy_type_converter.py b/metadata-ingestion/tests/unit/utilities/test_sqlalchemy_type_converter.py
index 6c719d351c4c20..b080819cea95be 100644
--- a/metadata-ingestion/tests/unit/utilities/test_sqlalchemy_type_converter.py
+++ b/metadata-ingestion/tests/unit/utilities/test_sqlalchemy_type_converter.py
@@ -1,6 +1,8 @@
 from typing import no_type_check
+from unittest.mock import MagicMock
 
 from sqlalchemy import types
+from sqlalchemy.engine.default import DefaultDialect
 from sqlalchemy_bigquery import STRUCT
 
 from datahub.metadata.schema_classes import (
@@ -17,8 +19,11 @@
 
 
 def test_get_avro_schema_for_sqlalchemy_column():
+    inspector_magic_mock = MagicMock()
+    inspector_magic_mock.dialect = DefaultDialect()
+
     schema_fields = get_schema_fields_for_sqlalchemy_column(
-        column_name="test", column_type=types.INTEGER()
+        column_name="test", column_type=types.INTEGER(), inspector=inspector_magic_mock
     )
     assert len(schema_fields) == 1
     assert schema_fields[0].fieldPath == "[version=2.0].[type=int].test"
@@ -27,7 +32,10 @@ def test_get_avro_schema_for_sqlalchemy_column():
     assert schema_fields[0].nullable is True
 
     schema_fields = get_schema_fields_for_sqlalchemy_column(
-        column_name="test", column_type=types.String(), nullable=False
+        column_name="test",
+        column_type=types.String(),
+        nullable=False,
+        inspector=inspector_magic_mock,
     )
     assert len(schema_fields) == 1
     assert schema_fields[0].fieldPath == "[version=2.0].[type=string].test"
@@ -37,8 +45,13 @@ def test_get_avro_schema_for_sqlalchemy_column():
 
 
 def test_get_avro_schema_for_sqlalchemy_array_column():
+    inspector_magic_mock = MagicMock()
+    inspector_magic_mock.dialect = DefaultDialect()
+
     schema_fields = get_schema_fields_for_sqlalchemy_column(
-        column_name="test", column_type=types.ARRAY(types.FLOAT())
+        column_name="test",
+        column_type=types.ARRAY(types.FLOAT()),
+        inspector=inspector_magic_mock,
     )
     assert len(schema_fields) == 1
     assert (
@@ -50,8 +63,13 @@ def test_get_avro_schema_for_sqlalchemy_array_column():
 
 
 def test_get_avro_schema_for_sqlalchemy_map_column():
+    inspector_magic_mock = MagicMock()
+    inspector_magic_mock.dialect = DefaultDialect()
+
     schema_fields = get_schema_fields_for_sqlalchemy_column(
-        column_name="test", column_type=MapType(types.String(), types.BOOLEAN())
+        column_name="test",
+        column_type=MapType(types.String(), types.BOOLEAN()),
+        inspector=inspector_magic_mock,
     )
     assert len(schema_fields) == 1
     assert (
@@ -65,9 +83,13 @@ def test_get_avro_schema_for_sqlalchemy_map_column():
 
 
 def test_get_avro_schema_for_sqlalchemy_struct_column() -> None:
+    inspector_magic_mock = MagicMock()
+    inspector_magic_mock.dialect = DefaultDialect()
 
     schema_fields = get_schema_fields_for_sqlalchemy_column(
-        column_name="test", column_type=STRUCT(("test", types.INTEGER()))
+        column_name="test",
+        column_type=STRUCT(("test", types.INTEGER())),
+        inspector=inspector_magic_mock,
     )
     assert len(schema_fields) == 2
     assert (
@@ -86,7 +108,12 @@ def test_get_avro_schema_for_sqlalchemy_struct_column() -> None:
 
 @no_type_check
 def test_get_avro_schema_for_sqlalchemy_unknown_column():
-    schema_fields = get_schema_fields_for_sqlalchemy_column("invalid", "test")
+    inspector_magic_mock = MagicMock()
+    inspector_magic_mock.dialect = DefaultDialect()
+
+    schema_fields = get_schema_fields_for_sqlalchemy_column(
+        "invalid", "test", inspector=inspector_magic_mock
+    )
     assert len(schema_fields) == 1
     assert schema_fields[0].type.type == NullTypeClass()
     assert schema_fields[0].fieldPath == "[version=2.0].[type=null]"
diff --git a/metadata-integration/java/acryl-spark-lineage/README.md b/metadata-integration/java/acryl-spark-lineage/README.md
index 81108aa7b914d4..9caa5a6dec65db 100644
--- a/metadata-integration/java/acryl-spark-lineage/README.md
+++ b/metadata-integration/java/acryl-spark-lineage/README.md
@@ -24,7 +24,7 @@ When running jobs using spark-submit, the agent needs to be configured in the co
 
 ```text
 #Configuring DataHub spark agent jar
-spark.jars.packages                          io.acryl:acryl-spark-lineage:0.2.15
+spark.jars.packages                          io.acryl:acryl-spark-lineage:0.2.16
 spark.extraListeners                         datahub.spark.DatahubSparkListener
 spark.datahub.rest.server                    http://localhost:8080
 ```
@@ -32,7 +32,7 @@ spark.datahub.rest.server                    http://localhost:8080
 ## spark-submit command line
 
 ```sh
-spark-submit --packages io.acryl:acryl-spark-lineage:0.2.15 --conf "spark.extraListeners=datahub.spark.DatahubSparkListener" my_spark_job_to_run.py
+spark-submit --packages io.acryl:acryl-spark-lineage:0.2.16 --conf "spark.extraListeners=datahub.spark.DatahubSparkListener" my_spark_job_to_run.py
 ```
 
 ### Configuration Instructions:  Amazon EMR
@@ -41,7 +41,7 @@ Set the following spark-defaults configuration properties as it
 stated [here](https://docs.aws.amazon.com/emr/latest/ReleaseGuide/emr-spark-configure.html)
 
 ```text
-spark.jars.packages                          io.acryl:acryl-spark-lineage:0.2.15
+spark.jars.packages                          io.acryl:acryl-spark-lineage:0.2.16
 spark.extraListeners                         datahub.spark.DatahubSparkListener
 spark.datahub.rest.server                    https://your_datahub_host/gms
 #If you have authentication set up then you also need to specify the Datahub access token
@@ -56,7 +56,7 @@ When running interactive jobs from a notebook, the listener can be configured wh
 spark = SparkSession.builder
 .master("spark://spark-master:7077")
 .appName("test-application")
-.config("spark.jars.packages", "io.acryl:acryl-spark-lineage:0.2.15")
+.config("spark.jars.packages", "io.acryl:acryl-spark-lineage:0.2.16")
 .config("spark.extraListeners", "datahub.spark.DatahubSparkListener")
 .config("spark.datahub.rest.server", "http://localhost:8080")
 .enableHiveSupport()
@@ -79,7 +79,7 @@ appName("test-application")
 config("spark.master","spark://spark-master:7077")
         .
 
-config("spark.jars.packages","io.acryl:acryl-spark-lineage:0.2.13")
+config("spark.jars.packages","io.acryl:acryl-spark-lineage:0.2.16")
         .
 
 config("spark.extraListeners","datahub.spark.DatahubSparkListener")
@@ -356,6 +356,9 @@ Use Java 8 to build the project. The project uses Gradle as the build tool. To b
 + 
 ## Changelog
 
+### Version 0.2.16
+- Remove logging DataHub config into logs
+
 ### Version 0.2.15
 - Add Kafka emitter to emit lineage to kafka
 - Add File emitter to emit lineage to file
diff --git a/metadata-integration/java/acryl-spark-lineage/build.gradle b/metadata-integration/java/acryl-spark-lineage/build.gradle
index 99b87b9b89bf4c..6620c34021ac4a 100644
--- a/metadata-integration/java/acryl-spark-lineage/build.gradle
+++ b/metadata-integration/java/acryl-spark-lineage/build.gradle
@@ -49,6 +49,8 @@ dependencies {
   implementation externalDependency.typesafeConfig
   implementation externalDependency.json
 
+  implementation project(':metadata-integration:java:openlineage-converter')
+
   implementation project(path: ':metadata-integration:java:datahub-client', configuration: 'shadow')
   implementation project(path: ':metadata-integration:java:openlineage-converter', configuration: 'shadow')
 
diff --git a/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/DatahubSparkListener.java b/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/DatahubSparkListener.java
index d64e159482c1be..52507a682a1f8b 100644
--- a/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/DatahubSparkListener.java
+++ b/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/DatahubSparkListener.java
@@ -257,7 +257,6 @@ private synchronized SparkLineageConf loadDatahubConfig(
       this.appContext.setDatabricksTags(databricksTags.orElse(null));
     }
 
-    log.info("Datahub configuration: {}", datahubConf.root().render());
     Optional<DatahubEmitterConfig> emitterConfig = initializeEmitter(datahubConf);
     SparkLineageConf sparkLineageConf =
         SparkLineageConf.toSparkLineageConf(datahubConf, appContext, emitterConfig.orElse(null));
diff --git a/metadata-integration/java/as-a-library.md b/metadata-integration/java/as-a-library.md
index e38cfef080f5f1..dea0a2c94545e7 100644
--- a/metadata-integration/java/as-a-library.md
+++ b/metadata-integration/java/as-a-library.md
@@ -40,7 +40,7 @@ import datahub.client.rest.RestEmitter;
 //...
 RestEmitter emitter = RestEmitter.create(b -> b
                                               .server("http://localhost:8080")
-//Auth token for Managed DataHub              .token(AUTH_TOKEN_IF_NEEDED)
+//Auth token for DataHub Cloud              .token(AUTH_TOKEN_IF_NEEDED)
 //Override default timeout of 10 seconds      .timeoutSec(OVERRIDE_DEFAULT_TIMEOUT_IN_SECONDS)
 //Add additional headers                      .extraHeaders(Collections.singletonMap("Session-token", "MY_SESSION"))
 // Customize HttpClient's connection ttl      .customizeHttpAsyncClient(c -> c.setConnectionTimeToLive(30, TimeUnit.SECONDS))
diff --git a/metadata-integration/java/datahub-client/src/main/java/datahub/client/kafka/KafkaEmitter.java b/metadata-integration/java/datahub-client/src/main/java/datahub/client/kafka/KafkaEmitter.java
index a9340d18749ade..d00dc09669045f 100644
--- a/metadata-integration/java/datahub-client/src/main/java/datahub/client/kafka/KafkaEmitter.java
+++ b/metadata-integration/java/datahub-client/src/main/java/datahub/client/kafka/KafkaEmitter.java
@@ -160,7 +160,7 @@ private static MetadataWriteResponse mapResponse(RecordMetadata metadata, Except
     return builder.build();
   }
 
-  public Properties getKafkaConfgiProperties() {
+  public Properties getKafkaConfigProperties() {
     return kafkaConfigProperties;
   }
 }
diff --git a/metadata-integration/java/datahub-protobuf/scripts/check_jar.sh b/metadata-integration/java/datahub-protobuf/scripts/check_jar.sh
index e3aa181c588019..fe3dd8d18f6999 100755
--- a/metadata-integration/java/datahub-protobuf/scripts/check_jar.sh
+++ b/metadata-integration/java/datahub-protobuf/scripts/check_jar.sh
@@ -39,7 +39,9 @@ jar -tvf $jarFile |\
       grep -v "darwin" |\
       grep -v "MetadataChangeProposal.avsc" |\
       grep -v "aix" |\
-      grep -v "com/sun/"
+      grep -v "com/sun/" |\
+      grep -v "VersionInfo.java" |\
+      grep -v "mime.types"
 
 if [ $? -ne 0 ]; then
   echo "✅ No unexpected class paths found in ${jarFile}"
diff --git a/metadata-integration/java/datahub-protobuf/src/main/java/datahub/protobuf/ProtobufUtils.java b/metadata-integration/java/datahub-protobuf/src/main/java/datahub/protobuf/ProtobufUtils.java
index ef5bc52aaee7af..c19b98f1780435 100644
--- a/metadata-integration/java/datahub-protobuf/src/main/java/datahub/protobuf/ProtobufUtils.java
+++ b/metadata-integration/java/datahub-protobuf/src/main/java/datahub/protobuf/ProtobufUtils.java
@@ -7,7 +7,6 @@
 import com.linkedin.util.Pair;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -22,23 +21,14 @@ public class ProtobufUtils {
   private ProtobufUtils() {}
 
   public static String collapseLocationComments(DescriptorProtos.SourceCodeInfo.Location location) {
-    String orig =
-        Stream.concat(
-                location.getLeadingDetachedCommentsList().stream(),
-                Stream.of(location.getLeadingComments(), location.getTrailingComments()))
-            .filter(Objects::nonNull)
-            .flatMap(line -> Arrays.stream(line.split("\n")))
-            .map(line -> line.replaceFirst("^[*/ ]+", ""))
-            .collect(Collectors.joining("\n"))
-            .trim();
-
-    /*
-     * Sometimes DataHub doesn't like these strings. Not sure if its DataHub
-     * or protobuf issue: https://github.com/protocolbuffers/protobuf/issues/4691
-     *
-     * We essentially smash utf8 chars to ascii here
-     */
-    return new String(orig.getBytes(StandardCharsets.ISO_8859_1));
+    return Stream.concat(
+            location.getLeadingDetachedCommentsList().stream(),
+            Stream.of(location.getLeadingComments(), location.getTrailingComments()))
+        .filter(Objects::nonNull)
+        .flatMap(line -> Arrays.stream(line.split("\n")))
+        .map(line -> line.replaceFirst("^[*/ ]+", ""))
+        .collect(Collectors.joining("\n"))
+        .trim();
   }
 
   /*
diff --git a/metadata-integration/java/datahub-protobuf/src/main/java/datahub/protobuf/model/ProtobufField.java b/metadata-integration/java/datahub-protobuf/src/main/java/datahub/protobuf/model/ProtobufField.java
index c3ede2e62c3148..88cde57fd9f8e2 100644
--- a/metadata-integration/java/datahub-protobuf/src/main/java/datahub/protobuf/model/ProtobufField.java
+++ b/metadata-integration/java/datahub-protobuf/src/main/java/datahub/protobuf/model/ProtobufField.java
@@ -1,5 +1,6 @@
 package datahub.protobuf.model;
 
+import com.google.protobuf.DescriptorProtos;
 import com.google.protobuf.DescriptorProtos.DescriptorProto;
 import com.google.protobuf.DescriptorProtos.FieldDescriptorProto;
 import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
@@ -19,7 +20,10 @@
 import datahub.protobuf.visitors.ProtobufModelVisitor;
 import datahub.protobuf.visitors.VisitContext;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -330,4 +334,66 @@ public boolean equals(Object o) {
   public int hashCode() {
     return fullName().hashCode();
   }
+
+  public boolean isEnum() {
+    return getFieldProto().getType() == DescriptorProtos.FieldDescriptorProto.Type.TYPE_ENUM;
+  }
+
+  public Optional<DescriptorProtos.EnumDescriptorProto> getEnumDescriptor() {
+    if (!isEnum()) {
+      return Optional.empty();
+    }
+
+    String enumTypeName = getFieldProto().getTypeName();
+    String shortEnumTypeName = enumTypeName.substring(enumTypeName.lastIndexOf('.') + 1);
+
+    return getProtobufMessage().fileProto().getEnumTypeList().stream()
+        .filter(enumType -> enumType.getName().equals(shortEnumTypeName))
+        .findFirst();
+  }
+
+  public List<DescriptorProtos.EnumValueDescriptorProto> getEnumValues() {
+    return getEnumDescriptor()
+        .map(DescriptorProtos.EnumDescriptorProto::getValueList)
+        .orElse(Collections.emptyList());
+  }
+
+  public Map<String, String> getEnumValuesWithComments() {
+    Optional<DescriptorProtos.EnumDescriptorProto> enumProtoOpt = getEnumDescriptor();
+    if (enumProtoOpt.isEmpty()) {
+      return Collections.emptyMap();
+    }
+
+    DescriptorProtos.EnumDescriptorProto enumProto = enumProtoOpt.get();
+    Map<String, String> valueComments = new LinkedHashMap<>();
+    List<DescriptorProtos.EnumValueDescriptorProto> values = enumProto.getValueList();
+    List<DescriptorProtos.SourceCodeInfo.Location> locations =
+        getProtobufMessage().fileProto().getSourceCodeInfo().getLocationList();
+
+    int enumIndex = getProtobufMessage().fileProto().getEnumTypeList().indexOf(enumProto);
+
+    for (int i = 0; i < values.size(); i++) {
+      DescriptorProtos.EnumValueDescriptorProto value = values.get(i);
+      int finalI = i;
+      String comment =
+          locations.stream()
+              .filter(loc -> isEnumValueLocation(loc, enumIndex, finalI))
+              .findFirst()
+              .map(ProtobufUtils::collapseLocationComments)
+              .orElse("");
+
+      valueComments.put(value.getName(), comment);
+    }
+
+    return valueComments;
+  }
+
+  private boolean isEnumValueLocation(
+      DescriptorProtos.SourceCodeInfo.Location location, int enumIndex, int valueIndex) {
+    return location.getPathCount() > 3
+        && location.getPath(0) == DescriptorProtos.FileDescriptorProto.ENUM_TYPE_FIELD_NUMBER
+        && location.getPath(1) == enumIndex
+        && location.getPath(2) == DescriptorProtos.EnumDescriptorProto.VALUE_FIELD_NUMBER
+        && location.getPath(3) == valueIndex;
+  }
 }
diff --git a/metadata-integration/java/datahub-protobuf/src/main/java/datahub/protobuf/visitors/field/ProtobufExtensionFieldVisitor.java b/metadata-integration/java/datahub-protobuf/src/main/java/datahub/protobuf/visitors/field/ProtobufExtensionFieldVisitor.java
index 240cf7b6d168b9..2919d0d37defac 100644
--- a/metadata-integration/java/datahub-protobuf/src/main/java/datahub/protobuf/visitors/field/ProtobufExtensionFieldVisitor.java
+++ b/metadata-integration/java/datahub-protobuf/src/main/java/datahub/protobuf/visitors/field/ProtobufExtensionFieldVisitor.java
@@ -13,13 +13,17 @@
 import com.linkedin.schema.SchemaField;
 import com.linkedin.tag.TagProperties;
 import com.linkedin.util.Pair;
+import datahub.protobuf.model.FieldTypeEdge;
+import datahub.protobuf.model.ProtobufElement;
 import datahub.protobuf.model.ProtobufField;
 import datahub.protobuf.visitors.ProtobufExtensionUtil;
 import datahub.protobuf.visitors.VisitContext;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.jgrapht.GraphPath;
 
 public class ProtobufExtensionFieldVisitor extends SchemaFieldVisitor {
 
@@ -30,45 +34,103 @@ public Stream<Pair<SchemaField, Double>> visitField(ProtobufField field, VisitCo
             .map(Pair::getKey)
             .anyMatch(fieldDesc -> fieldDesc.getName().matches("(?i).*primary_?key"));
 
-    List<TagAssociation> tags =
-        Stream.concat(
-                ProtobufExtensionUtil.extractTagPropertiesFromOptions(
-                    getFieldOptions(field.getFieldProto()), context.getGraph().getRegistry()),
-                promotedTags(field, context))
-            .distinct()
-            .map(tag -> new TagAssociation().setTag(new TagUrn(tag.getName())))
-            .sorted(Comparator.comparing(t -> t.getTag().getName()))
-            .collect(Collectors.toList());
-
-    List<GlossaryTermAssociation> terms =
-        Stream.concat(
-                ProtobufExtensionUtil.extractTermAssociationsFromOptions(
-                    getFieldOptions(field.getFieldProto()), context.getGraph().getRegistry()),
-                promotedTerms(field, context))
-            .distinct()
-            .sorted(Comparator.comparing(a -> a.getUrn().getNameEntity()))
-            .collect(Collectors.toList());
+    List<TagAssociation> tags = getTagAssociations(field, context);
+    List<GlossaryTermAssociation> terms = getGlossaryTermAssociations(field, context);
 
     return context
         .streamAllPaths(field)
         .map(
             path ->
                 Pair.of(
-                    new SchemaField()
-                        .setFieldPath(context.getFieldPath(path))
-                        .setNullable(!isPrimaryKey)
-                        .setIsPartOfKey(isPrimaryKey)
-                        .setDescription(field.comment())
-                        .setNativeDataType(field.nativeType())
-                        .setType(field.schemaFieldDataType())
-                        .setGlobalTags(new GlobalTags().setTags(new TagAssociationArray(tags)))
-                        .setGlossaryTerms(
-                            new GlossaryTerms()
-                                .setTerms(new GlossaryTermAssociationArray(terms))
-                                .setAuditStamp(context.getAuditStamp())),
+                    createSchemaField(field, context, path, isPrimaryKey, tags, terms),
                     context.calculateSortOrder(path, field)));
   }
 
+  private SchemaField createSchemaField(
+      ProtobufField field,
+      VisitContext context,
+      GraphPath<ProtobufElement, FieldTypeEdge> path,
+      boolean isPrimaryKey,
+      List<TagAssociation> tags,
+      List<GlossaryTermAssociation> terms) {
+    String description = createFieldDescription(field);
+
+    return new SchemaField()
+        .setFieldPath(context.getFieldPath(path))
+        .setNullable(!isPrimaryKey)
+        .setIsPartOfKey(isPrimaryKey)
+        .setDescription(description)
+        .setNativeDataType(field.nativeType())
+        .setType(field.schemaFieldDataType())
+        .setGlobalTags(new GlobalTags().setTags(new TagAssociationArray(tags)))
+        .setGlossaryTerms(
+            new GlossaryTerms()
+                .setTerms(new GlossaryTermAssociationArray(terms))
+                .setAuditStamp(context.getAuditStamp()));
+  }
+
+  private String createFieldDescription(ProtobufField field) {
+    StringBuilder description = new StringBuilder(field.comment());
+
+    if (field.isEnum()) {
+      description.append("\n\n");
+      Map<String, String> enumValuesWithComments = field.getEnumValuesWithComments();
+      if (!enumValuesWithComments.isEmpty()) {
+        appendEnumValues(description, field, enumValuesWithComments);
+      }
+    }
+
+    return description.toString();
+  }
+
+  private void appendEnumValues(
+      StringBuilder description, ProtobufField field, Map<String, String> enumValuesWithComments) {
+    enumValuesWithComments.forEach(
+        (name, comment) -> {
+          field.getEnumValues().stream()
+              .filter(v -> v.getName().equals(name))
+              .findFirst()
+              .ifPresent(
+                  value -> {
+                    description.append(String.format("%d: %s", value.getNumber(), name));
+                    if (!comment.isEmpty()) {
+                      description.append(" - ").append(comment);
+                    }
+                    description.append("\n");
+                  });
+        });
+  }
+
+  private List<TagAssociation> getTagAssociations(ProtobufField field, VisitContext context) {
+    Stream<TagAssociation> fieldTags =
+        ProtobufExtensionUtil.extractTagPropertiesFromOptions(
+                getFieldOptions(field.getFieldProto()), context.getGraph().getRegistry())
+            .map(tag -> new TagAssociation().setTag(new TagUrn(tag.getName())));
+
+    Stream<TagAssociation> promotedTags =
+        promotedTags(field, context)
+            .map(tag -> new TagAssociation().setTag(new TagUrn(tag.getName())));
+
+    return Stream.concat(fieldTags, promotedTags)
+        .distinct()
+        .sorted(Comparator.comparing(t -> t.getTag().getName()))
+        .collect(Collectors.toList());
+  }
+
+  private List<GlossaryTermAssociation> getGlossaryTermAssociations(
+      ProtobufField field, VisitContext context) {
+    Stream<GlossaryTermAssociation> fieldTerms =
+        ProtobufExtensionUtil.extractTermAssociationsFromOptions(
+            getFieldOptions(field.getFieldProto()), context.getGraph().getRegistry());
+
+    Stream<GlossaryTermAssociation> promotedTerms = promotedTerms(field, context);
+
+    return Stream.concat(fieldTerms, promotedTerms)
+        .distinct()
+        .sorted(Comparator.comparing(a -> a.getUrn().getNameEntity()))
+        .collect(Collectors.toList());
+  }
+
   /**
    * Promote tags from nested message to field.
    *
diff --git a/metadata-integration/java/datahub-protobuf/src/test/java/datahub/protobuf/ProtobufUtilsTest.java b/metadata-integration/java/datahub-protobuf/src/test/java/datahub/protobuf/ProtobufUtilsTest.java
index 9bf649041e035f..92ec4629f2eb31 100644
--- a/metadata-integration/java/datahub-protobuf/src/test/java/datahub/protobuf/ProtobufUtilsTest.java
+++ b/metadata-integration/java/datahub-protobuf/src/test/java/datahub/protobuf/ProtobufUtilsTest.java
@@ -8,6 +8,7 @@
 import com.google.protobuf.ExtensionRegistry;
 import datahub.protobuf.model.ProtobufGraph;
 import java.io.IOException;
+import java.util.Arrays;
 import org.testng.annotations.Test;
 
 public class ProtobufUtilsTest {
@@ -44,4 +45,19 @@ public void registryTest() throws IOException, IllegalArgumentException {
             + "[meta.msg.repeat_enum]: EVENT\n",
         graph.root().messageProto().getOptions().toString());
   }
+
+  @Test
+  public void testCollapseLocationCommentsWithUTF8() {
+    DescriptorProtos.SourceCodeInfo.Location location =
+        DescriptorProtos.SourceCodeInfo.Location.newBuilder()
+            .addAllLeadingDetachedComments(Arrays.asList("/* Emoji 😊 */", "/* Accented é */"))
+            .setLeadingComments("/* Chinese 你好 */\n// Russian Привет")
+            .setTrailingComments("// Korean 안녕")
+            .build();
+
+    String actual = ProtobufUtils.collapseLocationComments(location);
+    String expected = "Emoji 😊 */\nAccented é */\nChinese 你好 */\nRussian Привет\nKorean 안녕";
+
+    assertEquals(expected, actual);
+  }
 }
diff --git a/metadata-integration/java/datahub-protobuf/src/test/java/datahub/protobuf/model/ProtobufFieldTest.java b/metadata-integration/java/datahub-protobuf/src/test/java/datahub/protobuf/model/ProtobufFieldTest.java
index 40d54a86510120..4c19e34d710b4d 100644
--- a/metadata-integration/java/datahub-protobuf/src/test/java/datahub/protobuf/model/ProtobufFieldTest.java
+++ b/metadata-integration/java/datahub-protobuf/src/test/java/datahub/protobuf/model/ProtobufFieldTest.java
@@ -355,4 +355,28 @@ public void nestedTypeReservedFieldsTest() throws IOException {
 
     assertEquals("test comment 14", msg3Field14.getDescription());
   }
+
+  @Test
+  public void timestampUnitEnumDescriptionTest() throws IOException {
+    ProtobufDataset test = getTestProtobufDataset("extended_protobuf", "messageE");
+    SchemaMetadata testMetadata = test.getSchemaMetadata();
+
+    SchemaField timestampField =
+        testMetadata.getFields().stream()
+            .filter(
+                v ->
+                    v.getFieldPath()
+                        .equals(
+                            "[version=2.0].[type=extended_protobuf_TimestampUnitMessage].[type=enum].timestamp_unit_type"))
+            .findFirst()
+            .orElseThrow();
+
+    assertEquals(
+        "timestamp unit\n"
+            + "\n"
+            + "0: MILLISECOND - 10^-3 seconds\n"
+            + "1: MICROSECOND - 10^-6 seconds\n"
+            + "2: NANOSECOND - 10^-9 seconds\n",
+        timestampField.getDescription());
+  }
 }
diff --git a/metadata-integration/java/datahub-protobuf/src/test/resources/extended_protobuf/messageE.proto b/metadata-integration/java/datahub-protobuf/src/test/resources/extended_protobuf/messageE.proto
new file mode 100644
index 00000000000000..50425f431c62d0
--- /dev/null
+++ b/metadata-integration/java/datahub-protobuf/src/test/resources/extended_protobuf/messageE.proto
@@ -0,0 +1,19 @@
+syntax = "proto3";
+package extended_protobuf;
+
+/*
+  Timestamp unit enum
+*/
+enum TimestampUnitEnum {
+  MILLISECOND = 0; // 10^-3 seconds
+  MICROSECOND = 1; // 10^-6 seconds
+  NANOSECOND = 2; // 10^-9 seconds
+}
+
+/*
+  Timestamp unit message
+*/
+message TimestampUnitMessage {
+  // timestamp unit
+  TimestampUnitEnum timestamp_unit_type = 1;
+}
\ No newline at end of file
diff --git a/metadata-integration/java/datahub-protobuf/src/test/resources/extended_protobuf/messageE.protoc b/metadata-integration/java/datahub-protobuf/src/test/resources/extended_protobuf/messageE.protoc
new file mode 100644
index 00000000000000..1cefa365ef1785
Binary files /dev/null and b/metadata-integration/java/datahub-protobuf/src/test/resources/extended_protobuf/messageE.protoc differ
diff --git a/metadata-integration/java/openlineage-converter/build.gradle b/metadata-integration/java/openlineage-converter/build.gradle
index 145a88229ad4af..2e04881ab5ccda 100644
--- a/metadata-integration/java/openlineage-converter/build.gradle
+++ b/metadata-integration/java/openlineage-converter/build.gradle
@@ -41,6 +41,15 @@ test {
     useJUnit()
     finalizedBy jacocoTestReport
 }
+shadowJar {
+    zip64 = true
+    archiveClassifier = ''
+    exclude('log4j2.*', 'log4j.*')
+}
+
+jar {
+    archiveClassifier = 'lib'
+}
 
 //task sourcesJar(type: Jar) {
 //    classifier 'sources'
diff --git a/metadata-io/build.gradle b/metadata-io/build.gradle
index ff29cb5fff47d2..9f5fc109eea7f6 100644
--- a/metadata-io/build.gradle
+++ b/metadata-io/build.gradle
@@ -28,7 +28,6 @@ dependencies {
   implementation externalDependency.guava
   implementation externalDependency.reflections
 
-  implementation 'com.github.java-json-tools:json-patch:1.13' // TODO: Replace with jakarta.json
   api(externalDependency.dgraph4j) {
     exclude group: 'com.google.guava', module: 'guava'
     exclude group: 'io.grpc', module: 'grpc-protobuf'
diff --git a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/EntityApiUtils.java b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/EntityApiUtils.java
index 656534e24f551f..fa6d9cae45a6a4 100644
--- a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/EntityApiUtils.java
+++ b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/EntityApiUtils.java
@@ -1,6 +1,6 @@
 package com.linkedin.metadata.entity;
 
-import static com.linkedin.metadata.Constants.DEFAULT_RUN_ID;
+import static com.linkedin.metadata.utils.SystemMetadataUtils.createDefaultSystemMetadata;
 
 import com.datahub.util.RecordUtils;
 import com.linkedin.common.urn.Urn;
@@ -37,10 +37,7 @@ public static RecordTemplate buildKeyAspect(
 
   public static SystemMetadata parseSystemMetadata(String jsonSystemMetadata) {
     if (jsonSystemMetadata == null || jsonSystemMetadata.equals("")) {
-      SystemMetadata response = new SystemMetadata();
-      response.setRunId(DEFAULT_RUN_ID);
-      response.setLastObserved(0);
-      return response;
+      return createDefaultSystemMetadata();
     }
     return RecordUtils.toRecordTemplate(SystemMetadata.class, jsonSystemMetadata);
   }
diff --git a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/AspectsBatchImpl.java b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/AspectsBatchImpl.java
index a23f6ab175046b..1fba8426317209 100644
--- a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/AspectsBatchImpl.java
+++ b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/AspectsBatchImpl.java
@@ -9,6 +9,7 @@
 import com.linkedin.metadata.aspect.batch.BatchItem;
 import com.linkedin.metadata.aspect.batch.ChangeMCP;
 import com.linkedin.metadata.aspect.batch.MCPItem;
+import com.linkedin.metadata.aspect.plugins.hooks.MutationHook;
 import com.linkedin.metadata.aspect.plugins.validation.ValidationExceptionCollection;
 import com.linkedin.mxe.MetadataChangeProposal;
 import com.linkedin.util.Pair;
@@ -47,7 +48,7 @@ public Pair<Map<String, Set<String>>, List<ChangeMCP>> toUpsertBatchItems(
       final Map<String, Map<String, SystemAspect>> latestAspects) {
 
     // Process proposals to change items
-    Stream<ChangeMCP> mutatedProposalsStream =
+    Stream<? extends BatchItem> mutatedProposalsStream =
         proposedItemsToChangeItemStream(
             items.stream()
                 .filter(item -> item instanceof ProposedItem)
@@ -92,21 +93,58 @@ public Pair<Map<String, Set<String>>, List<ChangeMCP>> toUpsertBatchItems(
 
     LinkedList<ChangeMCP> newItems =
         applyMCPSideEffects(upsertBatchItems).collect(Collectors.toCollection(LinkedList::new));
-    Map<String, Set<String>> newUrnAspectNames = getNewUrnAspectsMap(getUrnAspectsMap(), newItems);
     upsertBatchItems.addAll(newItems);
+    Map<String, Set<String>> newUrnAspectNames =
+        getNewUrnAspectsMap(getUrnAspectsMap(), upsertBatchItems);
 
     return Pair.of(newUrnAspectNames, upsertBatchItems);
   }
 
-  private Stream<ChangeMCP> proposedItemsToChangeItemStream(List<MCPItem> proposedItems) {
-    return applyProposalMutationHooks(proposedItems, retrieverContext)
-        .filter(mcpItem -> mcpItem.getMetadataChangeProposal() != null)
-        .map(
-            mcpItem ->
-                ChangeItemImpl.ChangeItemImplBuilder.build(
-                    mcpItem.getMetadataChangeProposal(),
-                    mcpItem.getAuditStamp(),
-                    retrieverContext.getAspectRetriever()));
+  private Stream<? extends BatchItem> proposedItemsToChangeItemStream(List<MCPItem> proposedItems) {
+    List<MutationHook> mutationHooks =
+        retrieverContext.getAspectRetriever().getEntityRegistry().getAllMutationHooks();
+    Stream<? extends BatchItem> unmutatedItems =
+        proposedItems.stream()
+            .filter(
+                proposedItem ->
+                    mutationHooks.stream()
+                        .noneMatch(
+                            mutationHook ->
+                                mutationHook.shouldApply(
+                                    proposedItem.getChangeType(),
+                                    proposedItem.getUrn(),
+                                    proposedItem.getAspectName())))
+            .map(
+                mcpItem -> {
+                  if (ChangeType.PATCH.equals(mcpItem.getChangeType())) {
+                    return PatchItemImpl.PatchItemImplBuilder.build(
+                        mcpItem.getMetadataChangeProposal(),
+                        mcpItem.getAuditStamp(),
+                        retrieverContext.getAspectRetriever().getEntityRegistry());
+                  }
+                  return ChangeItemImpl.ChangeItemImplBuilder.build(
+                      mcpItem.getMetadataChangeProposal(),
+                      mcpItem.getAuditStamp(),
+                      retrieverContext.getAspectRetriever());
+                });
+    List<MCPItem> mutatedItems =
+        applyProposalMutationHooks(proposedItems, retrieverContext).collect(Collectors.toList());
+    Stream<? extends BatchItem> proposedItemsToChangeItems =
+        mutatedItems.stream()
+            .filter(mcpItem -> mcpItem.getMetadataChangeProposal() != null)
+            // Filter on proposed items again to avoid applying builder to Patch Item side effects
+            .filter(mcpItem -> mcpItem instanceof ProposedItem)
+            .map(
+                mcpItem ->
+                    ChangeItemImpl.ChangeItemImplBuilder.build(
+                        mcpItem.getMetadataChangeProposal(),
+                        mcpItem.getAuditStamp(),
+                        retrieverContext.getAspectRetriever()));
+    Stream<? extends BatchItem> sideEffectItems =
+        mutatedItems.stream().filter(mcpItem -> !(mcpItem instanceof ProposedItem));
+    Stream<? extends BatchItem> combinedChangeItems =
+        Stream.concat(proposedItemsToChangeItems, unmutatedItems);
+    return Stream.concat(combinedChangeItems, sideEffectItems);
   }
 
   public static class AspectsBatchImplBuilder {
@@ -123,7 +161,7 @@ public AspectsBatchImplBuilder one(BatchItem data, RetrieverContext retrieverCon
     }
 
     public AspectsBatchImplBuilder mcps(
-        List<MetadataChangeProposal> mcps,
+        Collection<MetadataChangeProposal> mcps,
         AuditStamp auditStamp,
         RetrieverContext retrieverContext) {
 
@@ -132,16 +170,22 @@ public AspectsBatchImplBuilder mcps(
           mcps.stream()
               .map(
                   mcp -> {
-                    if (mcp.getChangeType().equals(ChangeType.PATCH)) {
-                      return PatchItemImpl.PatchItemImplBuilder.build(
-                          mcp,
-                          auditStamp,
-                          retrieverContext.getAspectRetriever().getEntityRegistry());
-                    } else {
-                      return ChangeItemImpl.ChangeItemImplBuilder.build(
-                          mcp, auditStamp, retrieverContext.getAspectRetriever());
+                    try {
+                      if (mcp.getChangeType().equals(ChangeType.PATCH)) {
+                        return PatchItemImpl.PatchItemImplBuilder.build(
+                            mcp,
+                            auditStamp,
+                            retrieverContext.getAspectRetriever().getEntityRegistry());
+                      } else {
+                        return ChangeItemImpl.ChangeItemImplBuilder.build(
+                            mcp, auditStamp, retrieverContext.getAspectRetriever());
+                      }
+                    } catch (IllegalArgumentException e) {
+                      log.error("Invalid proposal, skipping and proceeding with batch: {}", mcp, e);
+                      return null;
                     }
                   })
+              .filter(Objects::nonNull)
               .collect(Collectors.toList()));
       return this;
     }
diff --git a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/MCLItemImpl.java b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/MCLItemImpl.java
index 94d60d2f67c9c8..a5afd4651ed2c4 100644
--- a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/MCLItemImpl.java
+++ b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/MCLItemImpl.java
@@ -6,6 +6,7 @@
 import com.linkedin.events.metadata.ChangeType;
 import com.linkedin.metadata.aspect.AspectRetriever;
 import com.linkedin.metadata.aspect.batch.MCLItem;
+import com.linkedin.metadata.aspect.batch.MCPItem;
 import com.linkedin.metadata.entity.AspectUtils;
 import com.linkedin.metadata.entity.validation.ValidationApiUtils;
 import com.linkedin.metadata.models.AspectSpec;
@@ -13,7 +14,9 @@
 import com.linkedin.metadata.models.registry.EntityRegistry;
 import com.linkedin.metadata.utils.EntityKeyUtils;
 import com.linkedin.metadata.utils.GenericRecordUtils;
+import com.linkedin.metadata.utils.PegasusUtils;
 import com.linkedin.mxe.MetadataChangeLog;
+import com.linkedin.mxe.SystemMetadata;
 import com.linkedin.util.Pair;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -43,6 +46,27 @@ private MCLItemImpl build() {
       return null;
     }
 
+    public MCLItemImpl build(
+        MCPItem mcpItem,
+        @Nullable RecordTemplate oldAspectValue,
+        @Nullable SystemMetadata oldSystemMetadata,
+        AspectRetriever aspectRetriever) {
+      return MCLItemImpl.builder()
+          .build(
+              PegasusUtils.constructMCL(
+                  mcpItem.getMetadataChangeProposal(),
+                  mcpItem.getUrn().getEntityType(),
+                  mcpItem.getUrn(),
+                  mcpItem.getChangeType(),
+                  mcpItem.getAspectName(),
+                  mcpItem.getAuditStamp(),
+                  mcpItem.getRecordTemplate(),
+                  mcpItem.getSystemMetadata(),
+                  oldAspectValue,
+                  oldSystemMetadata),
+              aspectRetriever);
+    }
+
     public MCLItemImpl build(MetadataChangeLog metadataChangeLog, AspectRetriever aspectRetriever) {
       return MCLItemImpl.builder().metadataChangeLog(metadataChangeLog).build(aspectRetriever);
     }
diff --git a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/ProposedItem.java b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/ProposedItem.java
index 452ed39ddf3174..132a731d278af8 100644
--- a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/ProposedItem.java
+++ b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/ProposedItem.java
@@ -7,6 +7,7 @@
 import com.linkedin.metadata.aspect.batch.MCPItem;
 import com.linkedin.metadata.models.AspectSpec;
 import com.linkedin.metadata.models.EntitySpec;
+import com.linkedin.metadata.utils.EntityKeyUtils;
 import com.linkedin.metadata.utils.GenericRecordUtils;
 import com.linkedin.mxe.MetadataChangeProposal;
 import com.linkedin.mxe.SystemMetadata;
@@ -63,7 +64,12 @@ public RecordTemplate getRecordTemplate() {
   @Nonnull
   @Override
   public Urn getUrn() {
-    return metadataChangeProposal.getEntityUrn();
+    Urn urn = metadataChangeProposal.getEntityUrn();
+    if (urn == null) {
+      urn =
+          EntityKeyUtils.getUrnFromProposal(metadataChangeProposal, entitySpec.getKeyAspectSpec());
+    }
+    return urn;
   }
 
   @Nullable
diff --git a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/validation/ValidationApiUtils.java b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/validation/ValidationApiUtils.java
index ed79f23823a845..f7e639ecf36038 100644
--- a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/validation/ValidationApiUtils.java
+++ b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/validation/ValidationApiUtils.java
@@ -3,6 +3,7 @@
 import com.linkedin.common.urn.Urn;
 import com.linkedin.data.schema.validation.ValidationResult;
 import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.metadata.Constants;
 import com.linkedin.metadata.aspect.AspectRetriever;
 import com.linkedin.metadata.entity.EntityApiUtils;
 import com.linkedin.metadata.models.AspectSpec;
@@ -51,7 +52,8 @@ public static void validateUrn(@Nonnull EntityRegistry entityRegistry, @Nonnull
       throw new IllegalArgumentException(
           "Error: cannot provide an URN with leading or trailing whitespace");
     }
-    if (URLEncoder.encode(urn.toString()).length() > URN_NUM_BYTES_LIMIT) {
+    if (!Constants.SCHEMA_FIELD_ENTITY_NAME.equals(urn.getEntityType())
+        && URLEncoder.encode(urn.toString()).length() > URN_NUM_BYTES_LIMIT) {
       throw new IllegalArgumentException(
           "Error: cannot provide an URN longer than "
               + Integer.toString(URN_NUM_BYTES_LIMIT)
diff --git a/metadata-io/metadata-io-api/src/test/java/com/linkedin/metadata/entity/ebean/batch/AspectsBatchImplTest.java b/metadata-io/metadata-io-api/src/test/java/com/linkedin/metadata/entity/ebean/batch/AspectsBatchImplTest.java
index d2e7243d045604..31dd868b4cb4a3 100644
--- a/metadata-io/metadata-io-api/src/test/java/com/linkedin/metadata/entity/ebean/batch/AspectsBatchImplTest.java
+++ b/metadata-io/metadata-io-api/src/test/java/com/linkedin/metadata/entity/ebean/batch/AspectsBatchImplTest.java
@@ -1,22 +1,26 @@
 package com.linkedin.metadata.entity.ebean.batch;
 
-import static com.linkedin.metadata.Constants.DATASET_ENTITY_NAME;
-import static com.linkedin.metadata.Constants.STATUS_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.STRUCTURED_PROPERTIES_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
 
+import com.google.common.collect.ImmutableList;
+import com.linkedin.common.FabricType;
 import com.linkedin.common.Status;
+import com.linkedin.common.urn.DataPlatformUrn;
+import com.linkedin.common.urn.DatasetUrn;
 import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.data.ByteString;
 import com.linkedin.data.schema.annotation.PathSpecBasedSchemaAnnotationVisitor;
+import com.linkedin.dataset.DatasetProperties;
 import com.linkedin.events.metadata.ChangeType;
 import com.linkedin.metadata.aspect.AspectRetriever;
 import com.linkedin.metadata.aspect.GraphRetriever;
 import com.linkedin.metadata.aspect.batch.MCPItem;
 import com.linkedin.metadata.aspect.patch.GenericJsonPatch;
 import com.linkedin.metadata.aspect.patch.PatchOperationType;
+import com.linkedin.metadata.aspect.patch.builder.DatasetPropertiesPatchBuilder;
 import com.linkedin.metadata.aspect.plugins.config.AspectPluginConfig;
 import com.linkedin.metadata.aspect.plugins.hooks.MutationHook;
 import com.linkedin.metadata.entity.SearchRetriever;
@@ -297,6 +301,38 @@ public void toUpsertBatchItemsProposedItemTest() {
         "Mutation to status aspect");
   }
 
+  @Test
+  public void singleInvalidDoesntBreakBatch() {
+    MetadataChangeProposal proposal1 =
+        new DatasetPropertiesPatchBuilder()
+            .urn(new DatasetUrn(new DataPlatformUrn("platform"), "name", FabricType.PROD))
+            .setDescription("something")
+            .setName("name")
+            .addCustomProperty("prop1", "propVal1")
+            .addCustomProperty("prop2", "propVal2")
+            .build();
+    MetadataChangeProposal proposal2 =
+        new MetadataChangeProposal()
+            .setEntityType(DATASET_ENTITY_NAME)
+            .setAspectName(DATASET_PROPERTIES_ASPECT_NAME)
+            .setAspect(GenericRecordUtils.serializeAspect(new DatasetProperties()))
+            .setChangeType(ChangeType.UPSERT);
+
+    AspectsBatchImpl testBatch =
+        AspectsBatchImpl.builder()
+            .mcps(
+                ImmutableList.of(proposal1, proposal2),
+                AuditStampUtils.createDefaultAuditStamp(),
+                retrieverContext)
+            .retrieverContext(retrieverContext)
+            .build();
+
+    assertEquals(
+        testBatch.toUpsertBatchItems(Map.of()).getSecond().size(),
+        1,
+        "Expected 1 valid mcp to be passed through.");
+  }
+
   /** Converts unsupported to status aspect */
   @Getter
   @Setter
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java b/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java
index 337288ab59c603..60a991c19ae8bf 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java
@@ -12,7 +12,6 @@
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.VersionedUrn;
 import com.linkedin.common.urn.Urn;
-import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.data.DataMap;
 import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.data.template.StringArray;
@@ -24,6 +23,7 @@
 import com.linkedin.metadata.aspect.EnvelopedAspectArray;
 import com.linkedin.metadata.aspect.VersionedAspect;
 import com.linkedin.metadata.aspect.batch.AspectsBatch;
+import com.linkedin.metadata.aspect.batch.BatchItem;
 import com.linkedin.metadata.browse.BrowseResult;
 import com.linkedin.metadata.browse.BrowseResultV2;
 import com.linkedin.metadata.entity.DeleteEntityService;
@@ -48,6 +48,7 @@
 import com.linkedin.metadata.search.client.CachingEntitySearchService;
 import com.linkedin.metadata.service.RollbackService;
 import com.linkedin.metadata.timeseries.TimeseriesAspectService;
+import com.linkedin.metadata.utils.AuditStampUtils;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import com.linkedin.mxe.MetadataChangeProposal;
 import com.linkedin.mxe.PlatformEvent;
@@ -60,6 +61,8 @@
 import java.net.URISyntaxException;
 import java.time.Clock;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -68,6 +71,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
@@ -372,7 +376,13 @@ public SearchResult search(
     return ValidationUtils.validateSearchResult(
         opContext,
         entitySearchService.search(
-            opContext, List.of(entity), input, newFilter(requestFilters), null, start, count),
+            opContext,
+            List.of(entity),
+            input,
+            newFilter(requestFilters),
+            Collections.emptyList(),
+            start,
+            count),
         entityService);
   }
 
@@ -403,7 +413,7 @@ public ListResult list(
                 opContext.withSearchFlags(flags -> flags.setFulltext(false)),
                 entity,
                 newFilter(requestFilters),
-                null,
+                Collections.emptyList(),
                 start,
                 count)),
         entityService);
@@ -414,7 +424,7 @@ public ListResult list(
    *
    * @param input search query
    * @param filter search filters
-   * @param sortCriterion sort criterion
+   * @param sortCriteria sort criteria
    * @param start start offset for search results
    * @param count max number of search results requested
    * @return Snapshot key
@@ -426,14 +436,14 @@ public SearchResult search(
       @Nonnull String entity,
       @Nonnull String input,
       @Nullable Filter filter,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int start,
       int count)
       throws RemoteInvocationException {
     return ValidationUtils.validateSearchResult(
         opContext,
         entitySearchService.search(
-            opContext, List.of(entity), input, filter, sortCriterion, start, count),
+            opContext, List.of(entity), input, filter, sortCriteria, start, count),
         entityService);
   }
 
@@ -446,10 +456,10 @@ public SearchResult searchAcrossEntities(
       @Nullable Filter filter,
       int start,
       int count,
-      @Nullable SortCriterion sortCriterion)
+      List<SortCriterion> sortCriteria)
       throws RemoteInvocationException {
     return searchAcrossEntities(
-        opContext, entities, input, filter, start, count, sortCriterion, null);
+        opContext, entities, input, filter, start, count, sortCriteria, null);
   }
 
   /**
@@ -461,7 +471,7 @@ public SearchResult searchAcrossEntities(
    * @param start start offset for search results
    * @param count max number of search results requested
    * @param facets list of facets we want aggregations for
-   * @param sortCriterion sorting criterion
+   * @param sortCriteria sorting criteria
    * @return Snapshot key
    * @throws RemoteInvocationException when unable to execute request
    */
@@ -473,7 +483,7 @@ public SearchResult searchAcrossEntities(
       @Nullable Filter filter,
       int start,
       int count,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable List<String> facets)
       throws RemoteInvocationException {
 
@@ -484,7 +494,7 @@ public SearchResult searchAcrossEntities(
             entities,
             input,
             filter,
-            sortCriterion,
+            sortCriteria,
             start,
             count,
             facets),
@@ -526,7 +536,7 @@ public LineageSearchResult searchAcrossLineage(
       @Nullable String input,
       @Nullable Integer maxHops,
       @Nullable Filter filter,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int start,
       int count)
       throws RemoteInvocationException {
@@ -540,7 +550,7 @@ public LineageSearchResult searchAcrossLineage(
             input,
             maxHops,
             filter,
-            sortCriterion,
+            sortCriteria,
             start,
             count),
         entityService);
@@ -556,7 +566,7 @@ public LineageScrollResult scrollAcrossLineage(
       @Nullable String input,
       @Nullable Integer maxHops,
       @Nullable Filter filter,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nonnull String keepAlive,
       int count)
@@ -574,7 +584,7 @@ public LineageScrollResult scrollAcrossLineage(
             input,
             maxHops,
             filter,
-            sortCriterion,
+            sortCriteria,
             scrollId,
             keepAlive,
             count),
@@ -642,7 +652,7 @@ public SearchResult filter(
       @Nonnull OperationContext opContext,
       @Nonnull String entity,
       @Nonnull Filter filter,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int start,
       int count)
       throws RemoteInvocationException {
@@ -652,7 +662,7 @@ public SearchResult filter(
             opContext.withSearchFlags(flags -> flags.setFulltext(true)),
             entity,
             filter,
-            sortCriterion,
+            sortCriteria,
             start,
             count),
         entityService);
@@ -738,35 +748,54 @@ public List<EnvelopedAspect> getTimeseriesAspectValues(
     return response.getValues();
   }
 
-  // TODO: Factor out ingest logic into a util that can be accessed by the java client and the
-  // resource
   @Override
-  public String ingestProposal(
+  @Nonnull
+  public List<String> batchIngestProposals(
       @Nonnull OperationContext opContext,
-      @Nonnull final MetadataChangeProposal metadataChangeProposal,
-      final boolean async)
-      throws RemoteInvocationException {
+      @Nonnull Collection<MetadataChangeProposal> metadataChangeProposals,
+      boolean async) {
     String actorUrnStr =
         opContext.getSessionAuthentication().getActor() != null
             ? opContext.getSessionAuthentication().getActor().toUrnStr()
             : Constants.UNKNOWN_ACTOR;
-    final AuditStamp auditStamp =
-        new AuditStamp().setTime(_clock.millis()).setActor(UrnUtils.getUrn(actorUrnStr));
+    final AuditStamp auditStamp = AuditStampUtils.createAuditStamp(actorUrnStr);
 
     AspectsBatch batch =
         AspectsBatchImpl.builder()
-            .mcps(
-                List.of(metadataChangeProposal), auditStamp, opContext.getRetrieverContext().get())
+            .mcps(metadataChangeProposals, auditStamp, opContext.getRetrieverContext().get())
             .build();
 
-    Optional<IngestResult> one =
-        entityService.ingestProposal(opContext, batch, async).stream().findFirst();
+    Map<BatchItem, List<IngestResult>> resultMap =
+        entityService.ingestProposal(opContext, batch, async).stream()
+            .collect(Collectors.groupingBy(IngestResult::getRequest));
+
+    // Update runIds
+    batch.getItems().stream()
+        .filter(resultMap::containsKey)
+        .forEach(
+            requestItem -> {
+              List<IngestResult> results = resultMap.get(requestItem);
+              Optional<Urn> resultUrn =
+                  results.stream().map(IngestResult::getUrn).filter(Objects::nonNull).findFirst();
+              resultUrn.ifPresent(
+                  urn -> tryIndexRunId(opContext, urn, requestItem.getSystemMetadata()));
+            });
 
-    Urn urn = one.map(IngestResult::getUrn).orElse(metadataChangeProposal.getEntityUrn());
-    if (one.isPresent()) {
-      tryIndexRunId(opContext, urn, metadataChangeProposal.getSystemMetadata());
-    }
-    return urn.toString();
+    // Preserve ordering
+    return batch.getItems().stream()
+        .map(
+            requestItem -> {
+              if (resultMap.containsKey(requestItem)) {
+                List<IngestResult> results = resultMap.get(requestItem);
+                return results.stream()
+                    .filter(r -> r.getUrn() != null)
+                    .findFirst()
+                    .map(r -> r.getUrn().toString())
+                    .orElse(null);
+              }
+              return null;
+            })
+        .collect(Collectors.toList());
   }
 
   @SneakyThrows
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/AspectDao.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/AspectDao.java
index 646b995f87d009..3f0545b6f94a85 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/AspectDao.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/AspectDao.java
@@ -6,13 +6,11 @@
 import com.linkedin.metadata.entity.ebean.PartitionedStream;
 import com.linkedin.metadata.entity.restoreindices.RestoreIndicesArgs;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
-import io.ebean.Transaction;
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
-import java.util.function.Supplier;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -27,10 +25,10 @@
  * aspect is set to 0 for efficient retrieval. In most cases only the latest state of an aspect will
  * be fetched. See {@link EntityServiceImpl} for more details.
  *
- * <p>TODO: This interface exposes {@link #runInTransactionWithRetry(Supplier, int)} because {@link
- * EntityServiceImpl} concerns itself with batching multiple commands into a single transaction. It
- * exposes storage concerns somewhat and it'd be worth looking into ways to move this responsibility
- * inside {@link AspectDao} implementations.
+ * <p>TODO: This interface exposes {@link #runInTransactionWithRetry(Function, int)}
+ * (TransactionContext)} because {@link EntityServiceImpl} concerns itself with batching multiple
+ * commands into a single transaction. It exposes storage concerns somewhat and it'd be worth
+ * looking into ways to move this responsibility inside {@link AspectDao} implementations.
  */
 public interface AspectDao {
   String ASPECT_WRITE_COUNT_METRIC_NAME = "aspectWriteCount";
@@ -51,19 +49,33 @@ Map<EntityAspectIdentifier, EntityAspect> batchGet(
   List<EntityAspect> getAspectsInRange(
       @Nonnull Urn urn, Set<String> aspectNames, long startTimeMillis, long endTimeMillis);
 
+  /**
+   * @param urn urn to fetch
+   * @param aspectName aspect to fetch
+   * @param forUpdate set to true if the result is used for versioning <a
+   *     href="https://ebean.io/docs/query/option#forUpdate">link</a>
+   * @return
+   */
   @Nullable
   default EntityAspect getLatestAspect(
-      @Nonnull final String urn, @Nonnull final String aspectName) {
-    return getLatestAspects(Map.of(urn, Set.of(aspectName)))
+      @Nonnull final String urn, @Nonnull final String aspectName, boolean forUpdate) {
+    return getLatestAspects(Map.of(urn, Set.of(aspectName)), forUpdate)
         .getOrDefault(urn, Map.of())
         .getOrDefault(aspectName, null);
   }
 
+  /**
+   * @param urnAspects urn/aspects to fetch
+   * @param forUpdate set to true if the result is used for versioning <a
+   *     href="https://ebean.io/docs/query/option#forUpdate">link</a>
+   * @return the data
+   */
   @Nonnull
-  Map<String, Map<String, EntityAspect>> getLatestAspects(Map<String, Set<String>> urnAspects);
+  Map<String, Map<String, EntityAspect>> getLatestAspects(
+      Map<String, Set<String>> urnAspects, boolean forUpdate);
 
   void saveAspect(
-      @Nullable Transaction tx,
+      @Nullable TransactionContext txContext,
       @Nonnull final String urn,
       @Nonnull final String aspectName,
       @Nonnull final String aspectMetadata,
@@ -75,10 +87,12 @@ void saveAspect(
       final boolean insert);
 
   void saveAspect(
-      @Nullable Transaction tx, @Nonnull final EntityAspect aspect, final boolean insert);
+      @Nullable TransactionContext txContext,
+      @Nonnull final EntityAspect aspect,
+      final boolean insert);
 
   long saveLatestAspect(
-      @Nullable Transaction tx,
+      @Nullable TransactionContext txContext,
       @Nonnull final String urn,
       @Nonnull final String aspectName,
       @Nullable final String oldAspectMetadata,
@@ -93,7 +107,7 @@ long saveLatestAspect(
       @Nullable final String newSystemMetadata,
       final Long nextVersion);
 
-  void deleteAspect(@Nullable Transaction tx, @Nonnull final EntityAspect aspect);
+  void deleteAspect(@Nullable TransactionContext txContext, @Nonnull final EntityAspect aspect);
 
   @Nonnull
   ListResult<String> listUrns(
@@ -111,7 +125,7 @@ ListResult<String> listUrns(
   @Nonnull
   Stream<EntityAspect> streamAspects(String entityName, String aspectName);
 
-  int deleteUrn(@Nullable Transaction tx, @Nonnull final String urn);
+  int deleteUrn(@Nullable TransactionContext txContext, @Nonnull final String urn);
 
   @Nonnull
   ListResult<String> listLatestAspectMetadata(
@@ -145,11 +159,11 @@ default Map<String, Long> getNextVersions(
 
   @Nonnull
   <T> T runInTransactionWithRetry(
-      @Nonnull final Function<Transaction, T> block, final int maxTransactionRetry);
+      @Nonnull final Function<TransactionContext, T> block, final int maxTransactionRetry);
 
   @Nonnull
   default <T> List<T> runInTransactionWithRetry(
-      @Nonnull final Function<Transaction, T> block,
+      @Nonnull final Function<TransactionContext, T> block,
       AspectsBatch batch,
       final int maxTransactionRetry) {
     return List.of(runInTransactionWithRetry(block, maxTransactionRetry));
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
index 8c83e7f469fe31..4b83ea40f722db 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
@@ -2,14 +2,15 @@
 
 import static com.linkedin.metadata.Constants.APP_SOURCE;
 import static com.linkedin.metadata.Constants.ASPECT_LATEST_VERSION;
-import static com.linkedin.metadata.Constants.DEFAULT_RUN_ID;
 import static com.linkedin.metadata.Constants.FORCE_INDEXING_KEY;
 import static com.linkedin.metadata.Constants.STATUS_ASPECT_NAME;
 import static com.linkedin.metadata.Constants.SYSTEM_ACTOR;
 import static com.linkedin.metadata.Constants.UI_SOURCE;
+import static com.linkedin.metadata.entity.TransactionContext.DEFAULT_MAX_TRANSACTION_RETRY;
 import static com.linkedin.metadata.utils.PegasusUtils.constructMCL;
 import static com.linkedin.metadata.utils.PegasusUtils.getDataTemplateClassFromSchema;
 import static com.linkedin.metadata.utils.PegasusUtils.urnToEntityName;
+import static com.linkedin.metadata.utils.SystemMetadataUtils.createDefaultSystemMetadata;
 import static com.linkedin.metadata.utils.metrics.ExceptionUtils.collectMetrics;
 
 import com.codahale.metrics.Timer;
@@ -79,7 +80,6 @@
 import com.linkedin.r2.RemoteInvocationException;
 import com.linkedin.util.Pair;
 import io.datahubproject.metadata.context.OperationContext;
-import io.ebean.Transaction;
 import io.opentelemetry.extension.annotations.WithSpan;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
@@ -146,8 +146,6 @@ public class EntityServiceImpl implements EntityService<ChangeItemImpl> {
    * As described above, the latest version of an aspect should <b>always</b> take the value 0, with
    * monotonically increasing version incrementing as usual once the latest version is replaced.
    */
-  private static final int DEFAULT_MAX_TRANSACTION_RETRY = 3;
-
   protected final AspectDao aspectDao;
 
   @VisibleForTesting @Getter private final EventProducer producer;
@@ -777,11 +775,7 @@ public List<UpdateAspectResult> ingestAspects(
     List<UpdateAspectResult> mclResults = emitMCL(opContext, ingestResults, emitMCL);
 
     processPostCommitMCLSideEffects(
-        opContext,
-        mclResults.stream()
-            .filter(result -> !result.isNoOp())
-            .map(UpdateAspectResult::toMCL)
-            .collect(Collectors.toList()));
+        opContext, mclResults.stream().map(UpdateAspectResult::toMCL).collect(Collectors.toList()));
 
     return mclResults;
   }
@@ -841,7 +835,7 @@ private List<UpdateAspectResult> ingestAspectsToLocalDB(
 
     return aspectDao
         .runInTransactionWithRetry(
-            (tx) -> {
+            (txContext) -> {
               // Generate default aspects within the transaction (they are re-calculated on retry)
               AspectsBatch batchWithDefaults =
                   DefaultAspectsUtil.withAdditionalChanges(
@@ -853,10 +847,11 @@ private List<UpdateAspectResult> ingestAspectsToLocalDB(
               final Map<String, Map<String, SystemAspect>> latestAspects =
                   EntityUtils.toSystemAspects(
                       opContext.getRetrieverContext().get(),
-                      aspectDao.getLatestAspects(urnAspects));
+                      aspectDao.getLatestAspects(urnAspects, true));
               // read #2 (potentially)
               final Map<String, Map<String, Long>> nextVersions =
-                  EntityUtils.calculateNextVersions(aspectDao, latestAspects, urnAspects);
+                  EntityUtils.calculateNextVersions(
+                      txContext, aspectDao, latestAspects, urnAspects);
 
               // 1. Convert patches to full upserts
               // 2. Run any entity/aspect level hooks
@@ -870,13 +865,13 @@ private List<UpdateAspectResult> ingestAspectsToLocalDB(
                 Map<String, Map<String, SystemAspect>> newLatestAspects =
                     EntityUtils.toSystemAspects(
                         opContext.getRetrieverContext().get(),
-                        aspectDao.getLatestAspects(updatedItems.getFirst()));
+                        aspectDao.getLatestAspects(updatedItems.getFirst(), true));
                 // merge
                 updatedLatestAspects = AspectsBatch.merge(latestAspects, newLatestAspects);
 
                 Map<String, Map<String, Long>> newNextVersions =
                     EntityUtils.calculateNextVersions(
-                        aspectDao, updatedLatestAspects, updatedItems.getFirst());
+                        txContext, aspectDao, updatedLatestAspects, updatedItems.getFirst());
                 // merge
                 updatedNextVersions = AspectsBatch.merge(nextVersions, newNextVersions);
               } else {
@@ -943,7 +938,7 @@ private List<UpdateAspectResult> ingestAspectsToLocalDB(
                             if (overwrite || latest == null) {
                               result =
                                   ingestAspectToLocalDB(
-                                          tx,
+                                          txContext,
                                           item.getUrn(),
                                           item.getAspectName(),
                                           item.getRecordTemplate(),
@@ -977,8 +972,8 @@ private List<UpdateAspectResult> ingestAspectsToLocalDB(
                       .collect(Collectors.toList());
 
               // commit upserts prior to retention or kafka send, if supported by impl
-              if (tx != null) {
-                tx.commitAndContinue();
+              if (txContext != null) {
+                txContext.commitAndContinue();
               }
               long took = ingestToLocalDBTimer.stop();
               log.info(
@@ -1835,10 +1830,7 @@ public void ingestEntities(
   @Override
   public SystemMetadata ingestEntity(
       @Nonnull OperationContext opContext, Entity entity, AuditStamp auditStamp) {
-    SystemMetadata generatedSystemMetadata = new SystemMetadata();
-    generatedSystemMetadata.setRunId(DEFAULT_RUN_ID);
-    generatedSystemMetadata.setLastObserved(System.currentTimeMillis());
-
+    SystemMetadata generatedSystemMetadata = createDefaultSystemMetadata();
     ingestEntity(opContext, entity, auditStamp, generatedSystemMetadata);
     return generatedSystemMetadata;
   }
@@ -2071,7 +2063,7 @@ public RollbackRunResult deleteUrn(@Nonnull OperationContext opContext, Urn urn)
 
     EntityAspect latestKey = null;
     try {
-      latestKey = aspectDao.getLatestAspect(urn.toString(), keyAspectName);
+      latestKey = aspectDao.getLatestAspect(urn.toString(), keyAspectName, false);
     } catch (EntityNotFoundException e) {
       log.warn("Entity to delete does not exist. {}", urn.toString());
     }
@@ -2216,7 +2208,7 @@ private RollbackResult deleteAspectWithoutMCL(
 
     final RollbackResult result =
         aspectDao.runInTransactionWithRetry(
-            (tx) -> {
+            (txContext) -> {
               Integer additionalRowsDeleted = 0;
 
               // 1. Fetch the latest existing version of the aspect.
@@ -2224,7 +2216,7 @@ private RollbackResult deleteAspectWithoutMCL(
                   (EntityAspect.EntitySystemAspect)
                       EntityUtils.toSystemAspect(
                               opContext.getRetrieverContext().get(),
-                              aspectDao.getLatestAspect(urn, aspectName))
+                              aspectDao.getLatestAspect(urn, aspectName, false))
                           .orElse(null);
 
               // 1.1 If no latest exists, skip this aspect
@@ -2289,7 +2281,7 @@ private RollbackResult deleteAspectWithoutMCL(
               }
 
               // 5. Apply deletes and fix up latest row
-              aspectsToDelete.forEach(aspect -> aspectDao.deleteAspect(tx, aspect));
+              aspectsToDelete.forEach(aspect -> aspectDao.deleteAspect(txContext, aspect));
 
               if (survivingAspect != null) {
                 // if there was a surviving aspect, copy its information into the latest row
@@ -2307,16 +2299,16 @@ private RollbackResult deleteAspectWithoutMCL(
                 latest
                     .getEntityAspect()
                     .setCreatedFor(survivingAspect.getEntityAspect().getCreatedFor());
-                aspectDao.saveAspect(tx, latest.getEntityAspect(), false);
+                aspectDao.saveAspect(txContext, latest.getEntityAspect(), false);
                 // metrics
                 aspectDao.incrementWriteMetrics(
                     aspectName, 1, latest.getMetadataRaw().getBytes(StandardCharsets.UTF_8).length);
-                aspectDao.deleteAspect(tx, survivingAspect.getEntityAspect());
+                aspectDao.deleteAspect(txContext, survivingAspect.getEntityAspect());
               } else {
                 if (isKeyAspect) {
                   if (hardDelete) {
                     // If this is the key aspect, delete the entity entirely.
-                    additionalRowsDeleted = aspectDao.deleteUrn(tx, urn);
+                    additionalRowsDeleted = aspectDao.deleteUrn(txContext, urn);
                   } else if (deleteItem.getEntitySpec().hasAspect(Constants.STATUS_ASPECT_NAME)) {
                     // soft delete by setting status.removed=true (if applicable)
                     final Status statusAspect = new Status();
@@ -2333,7 +2325,7 @@ private RollbackResult deleteAspectWithoutMCL(
                   }
                 } else {
                   // Else, only delete the specific aspect.
-                  aspectDao.deleteAspect(tx, latest.getEntityAspect());
+                  aspectDao.deleteAspect(txContext, latest.getEntityAspect());
                 }
               }
 
@@ -2473,7 +2465,7 @@ private Map<EntityAspectIdentifier, EnvelopedAspect> getEnvelopedAspects(
 
   @Nonnull
   private UpdateAspectResult ingestAspectToLocalDB(
-      @Nullable Transaction tx,
+      @Nullable TransactionContext txContext,
       @Nonnull final Urn urn,
       @Nonnull final String aspectName,
       @Nonnull final RecordTemplate newValue,
@@ -2502,7 +2494,7 @@ private UpdateAspectResult ingestAspectToLocalDB(
       latest.getEntityAspect().setSystemMetadata(RecordUtils.toJsonString(latestSystemMetadata));
 
       log.info("Ingesting aspect with name {}, urn {}", aspectName, urn);
-      aspectDao.saveAspect(tx, latest.getEntityAspect(), false);
+      aspectDao.saveAspect(txContext, latest.getEntityAspect(), false);
 
       // metrics
       aspectDao.incrementWriteMetrics(
@@ -2525,7 +2517,7 @@ private UpdateAspectResult ingestAspectToLocalDB(
     String newValueStr = EntityApiUtils.toJsonAspect(newValue);
     long versionOfOld =
         aspectDao.saveLatestAspect(
-            tx,
+            txContext,
             urn.toString(),
             aspectName,
             latest == null ? null : EntityApiUtils.toJsonAspect(oldValue),
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityUtils.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityUtils.java
index 7842365ce429be..3c4109970e9d0b 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityUtils.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityUtils.java
@@ -285,38 +285,51 @@ public static List<SystemAspect> toSystemAspects(
    * Use the precalculated next version from system metadata if it exists, otherwise lookup the next
    * version the normal way from the database
    *
+   * @param txContext
    * @param aspectDao database access
    * @param latestAspects aspect version 0 with system metadata
    * @param urnAspects urn/aspects which we need next version information for
    * @return map of the urn/aspect to the next aspect version
    */
   public static Map<String, Map<String, Long>> calculateNextVersions(
+      TransactionContext txContext,
       AspectDao aspectDao,
       Map<String, Map<String, SystemAspect>> latestAspects,
       Map<String, Set<String>> urnAspects) {
-    Map<String, Map<String, Long>> precalculatedVersions =
-        latestAspects.entrySet().stream()
-            .map(
-                entry ->
-                    Map.entry(
-                        entry.getKey(), convertSystemAspectToNextVersionMap(entry.getValue())))
-            .filter(entry -> !entry.getValue().isEmpty())
-            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-
-    Map<String, Set<String>> missingAspectVersions =
-        urnAspects.entrySet().stream()
-            .flatMap(
-                entry ->
-                    entry.getValue().stream()
-                        .map(aspectName -> Pair.of(entry.getKey(), aspectName)))
-            .filter(
-                urnAspectName ->
-                    !precalculatedVersions
-                        .getOrDefault(urnAspectName.getKey(), Map.of())
-                        .containsKey(urnAspectName.getValue()))
-            .collect(
-                Collectors.groupingBy(
-                    Pair::getKey, Collectors.mapping(Pair::getValue, Collectors.toSet())));
+
+    final Map<String, Map<String, Long>> precalculatedVersions;
+    final Map<String, Set<String>> missingAspectVersions;
+    if (txContext.getFailedAttempts() > 2 && txContext.lastExceptionIsDuplicateKey()) {
+      log.warn(
+          "Multiple exceptions detected, last exception detected as DuplicateKey, fallback to database max(version)+1");
+      precalculatedVersions = Map.of();
+      missingAspectVersions = urnAspects;
+    } else {
+      precalculatedVersions =
+          latestAspects.entrySet().stream()
+              .map(
+                  entry ->
+                      Map.entry(
+                          entry.getKey(), convertSystemAspectToNextVersionMap(entry.getValue())))
+              .filter(entry -> !entry.getValue().isEmpty())
+              .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+      missingAspectVersions =
+          urnAspects.entrySet().stream()
+              .flatMap(
+                  entry ->
+                      entry.getValue().stream()
+                          .map(aspectName -> Pair.of(entry.getKey(), aspectName)))
+              .filter(
+                  urnAspectName ->
+                      !precalculatedVersions
+                          .getOrDefault(urnAspectName.getKey(), Map.of())
+                          .containsKey(urnAspectName.getValue()))
+              .collect(
+                  Collectors.groupingBy(
+                      Pair::getKey, Collectors.mapping(Pair::getValue, Collectors.toSet())));
+    }
+
     Map<String, Map<String, Long>> databaseVersions =
         missingAspectVersions.isEmpty()
             ? Map.of()
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/TransactionContext.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/TransactionContext.java
new file mode 100644
index 00000000000000..69f2f1c8981c03
--- /dev/null
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/TransactionContext.java
@@ -0,0 +1,69 @@
+package com.linkedin.metadata.entity;
+
+import io.ebean.DuplicateKeyException;
+import io.ebean.Transaction;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NonNull;
+import lombok.experimental.Accessors;
+import org.springframework.lang.Nullable;
+
+/** Wrap the transaction with additional information about the exceptions during retry. */
+@Data
+@AllArgsConstructor
+@Accessors(fluent = true)
+public class TransactionContext {
+  public static final int DEFAULT_MAX_TRANSACTION_RETRY = 3;
+
+  public static TransactionContext empty() {
+    return empty(DEFAULT_MAX_TRANSACTION_RETRY);
+  }
+
+  public static TransactionContext empty(@Nullable Integer maxRetries) {
+    return empty(null, maxRetries == null ? DEFAULT_MAX_TRANSACTION_RETRY : maxRetries);
+  }
+
+  public static TransactionContext empty(Transaction tx, int maxRetries) {
+    return new TransactionContext(tx, maxRetries, new ArrayList<>());
+  }
+
+  @Nullable private Transaction tx;
+  private int maxRetries;
+  @NonNull private List<RuntimeException> exceptions;
+
+  public TransactionContext success() {
+    exceptions.clear();
+    return this;
+  }
+
+  public TransactionContext addException(RuntimeException e) {
+    exceptions.add(e);
+    return this;
+  }
+
+  public int getFailedAttempts() {
+    return exceptions.size();
+  }
+
+  @Nullable
+  public RuntimeException lastException() {
+    return exceptions.isEmpty() ? null : exceptions.get(exceptions.size() - 1);
+  }
+
+  public boolean lastExceptionIsDuplicateKey() {
+    return lastException() instanceof DuplicateKeyException;
+  }
+
+  public boolean shouldAttemptRetry() {
+    return exceptions.size() <= maxRetries;
+  }
+
+  public void commitAndContinue() {
+    if (tx != null) {
+      tx.commitAndContinue();
+    }
+    success();
+  }
+}
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraAspectDao.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraAspectDao.java
index 15c37b6c0085f7..9e7387947a9547 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraAspectDao.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraAspectDao.java
@@ -29,13 +29,13 @@
 import com.linkedin.metadata.entity.EntityAspect;
 import com.linkedin.metadata.entity.EntityAspectIdentifier;
 import com.linkedin.metadata.entity.ListResult;
+import com.linkedin.metadata.entity.TransactionContext;
 import com.linkedin.metadata.entity.ebean.EbeanAspectV2;
 import com.linkedin.metadata.entity.ebean.PartitionedStream;
 import com.linkedin.metadata.entity.restoreindices.RestoreIndicesArgs;
 import com.linkedin.metadata.query.ExtraInfo;
 import com.linkedin.metadata.query.ExtraInfoArray;
 import com.linkedin.metadata.query.ListResultMetadata;
-import io.ebean.Transaction;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.sql.Timestamp;
@@ -81,14 +81,15 @@ private boolean validateConnection() {
   }
 
   @Override
-  public EntityAspect getLatestAspect(@Nonnull String urn, @Nonnull String aspectName) {
+  public EntityAspect getLatestAspect(
+      @Nonnull String urn, @Nonnull String aspectName, boolean forUpdate) {
     validateConnection();
     return getAspect(urn, aspectName, ASPECT_LATEST_VERSION);
   }
 
   @Override
   public Map<String, Map<String, EntityAspect>> getLatestAspects(
-      Map<String, Set<String>> urnAspects) {
+      Map<String, Set<String>> urnAspects, boolean forUpdate) {
     return urnAspects.entrySet().stream()
         .map(
             entry ->
@@ -97,7 +98,8 @@ public Map<String, Map<String, EntityAspect>> getLatestAspects(
                     entry.getValue().stream()
                         .map(
                             aspectName -> {
-                              EntityAspect aspect = getLatestAspect(entry.getKey(), aspectName);
+                              EntityAspect aspect =
+                                  getLatestAspect(entry.getKey(), aspectName, forUpdate);
                               return aspect != null ? Map.entry(aspectName, aspect) : null;
                             })
                         .filter(Objects::nonNull)
@@ -185,7 +187,7 @@ private Map<String, Long> getMaxVersions(
 
   @Override
   public void saveAspect(
-      @Nullable Transaction tx, @Nonnull EntityAspect aspect, final boolean insert) {
+      @Nullable TransactionContext txContext, @Nonnull EntityAspect aspect, final boolean insert) {
     validateConnection();
     SimpleStatement statement = generateSaveStatement(aspect, insert);
     _cqlSession.execute(statement);
@@ -285,23 +287,21 @@ public ListResult<String> listAspectMetadata(
   @Override
   @Nonnull
   public <T> T runInTransactionWithRetry(
-      @Nonnull final Function<Transaction, T> block, final int maxTransactionRetry) {
+      @Nonnull final Function<TransactionContext, T> block, final int maxTransactionRetry) {
     validateConnection();
-    int retryCount = 0;
-    Exception lastException;
-
+    TransactionContext txContext = TransactionContext.empty(maxTransactionRetry);
     do {
       try {
         // TODO: Try to bend this code to make use of Cassandra batches. This method is called from
         // single-urn operations, so perf should not suffer much
-        return block.apply(null);
+        return block.apply(txContext);
       } catch (DriverException exception) {
-        lastException = exception;
+        txContext.addException(exception);
       }
-    } while (++retryCount <= maxTransactionRetry);
+    } while (txContext.shouldAttemptRetry());
 
     throw new RetryLimitReached(
-        "Failed to add after " + maxTransactionRetry + " retries", lastException);
+        "Failed to add after " + maxTransactionRetry + " retries", txContext.lastException());
   }
 
   private <T> ListResult<T> toListResult(
@@ -366,7 +366,8 @@ private static AuditStamp toAuditStamp(@Nonnull final EntityAspect aspect) {
   }
 
   @Override
-  public void deleteAspect(@Nullable Transaction tx, @Nonnull final EntityAspect aspect) {
+  public void deleteAspect(
+      @Nullable TransactionContext txContext, @Nonnull final EntityAspect aspect) {
     validateConnection();
     SimpleStatement ss =
         deleteFrom(CassandraAspect.TABLE_NAME)
@@ -383,7 +384,7 @@ public void deleteAspect(@Nullable Transaction tx, @Nonnull final EntityAspect a
   }
 
   @Override
-  public int deleteUrn(@Nullable Transaction tx, @Nonnull final String urn) {
+  public int deleteUrn(@Nullable TransactionContext txContext, @Nonnull final String urn) {
     validateConnection();
     SimpleStatement ss =
         deleteFrom(CassandraAspect.TABLE_NAME)
@@ -567,7 +568,7 @@ public Map<String, Map<String, Long>> getNextVersions(Map<String, Set<String>> u
 
   @Override
   public long saveLatestAspect(
-      @Nullable Transaction tx,
+      @Nullable TransactionContext txContext,
       @Nonnull final String urn,
       @Nonnull final String aspectName,
       @Nullable final String oldAspectMetadata,
@@ -673,7 +674,7 @@ public void setWritable(boolean canWrite) {
 
   @Override
   public void saveAspect(
-      @Nullable Transaction tx,
+      @Nullable TransactionContext txContext,
       @Nonnull final String urn,
       @Nonnull final String aspectName,
       @Nonnull final String aspectMetadata,
@@ -696,7 +697,7 @@ public void saveAspect(
             actor,
             impersonator);
 
-    saveAspect(tx, aspect, insert);
+    saveAspect(txContext, aspect, insert);
 
     // metrics
     incrementWriteMetrics(aspectName, 1, aspectMetadata.getBytes(StandardCharsets.UTF_8).length);
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanAspectDao.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanAspectDao.java
index 9725abdf7fdc27..4304be1aa2a00a 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanAspectDao.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanAspectDao.java
@@ -19,6 +19,7 @@
 import com.linkedin.metadata.entity.EntityAspect;
 import com.linkedin.metadata.entity.EntityAspectIdentifier;
 import com.linkedin.metadata.entity.ListResult;
+import com.linkedin.metadata.entity.TransactionContext;
 import com.linkedin.metadata.entity.ebean.batch.AspectsBatchImpl;
 import com.linkedin.metadata.entity.restoreindices.RestoreIndicesArgs;
 import com.linkedin.metadata.models.AspectSpec;
@@ -143,7 +144,7 @@ private boolean validateConnection() {
 
   @Override
   public long saveLatestAspect(
-      @Nullable Transaction tx,
+      @Nullable TransactionContext txContext,
       @Nonnull final String urn,
       @Nonnull final String aspectName,
       @Nullable final String oldAspectMetadata,
@@ -167,7 +168,7 @@ public long saveLatestAspect(
     if (oldAspectMetadata != null && oldTime != null) {
       largestVersion = nextVersion;
       saveAspect(
-          tx,
+          txContext,
           urn,
           aspectName,
           oldAspectMetadata,
@@ -181,7 +182,7 @@ public long saveLatestAspect(
 
     // Save newValue as the latest version (v0)
     saveAspect(
-        tx,
+        txContext,
         urn,
         aspectName,
         newAspectMetadata,
@@ -197,7 +198,7 @@ public long saveLatestAspect(
 
   @Override
   public void saveAspect(
-      @Nullable Transaction tx,
+      @Nullable TransactionContext txContext,
       @Nonnull final String urn,
       @Nonnull final String aspectName,
       @Nonnull final String aspectMetadata,
@@ -220,29 +221,33 @@ public void saveAspect(
       aspect.setCreatedFor(impersonator);
     }
 
-    saveEbeanAspect(tx, aspect, insert);
+    saveEbeanAspect(txContext, aspect, insert);
   }
 
   @Override
   public void saveAspect(
-      @Nullable Transaction tx, @Nonnull final EntityAspect aspect, final boolean insert) {
+      @Nullable TransactionContext txContext,
+      @Nonnull final EntityAspect aspect,
+      final boolean insert) {
     EbeanAspectV2 ebeanAspect = EbeanAspectV2.fromEntityAspect(aspect);
-    saveEbeanAspect(tx, ebeanAspect, insert);
+    saveEbeanAspect(txContext, ebeanAspect, insert);
   }
 
   private void saveEbeanAspect(
-      @Nullable Transaction tx, @Nonnull final EbeanAspectV2 ebeanAspect, final boolean insert) {
+      @Nullable TransactionContext txContext,
+      @Nonnull final EbeanAspectV2 ebeanAspect,
+      final boolean insert) {
     validateConnection();
     if (insert) {
-      _server.insert(ebeanAspect, tx);
+      _server.insert(ebeanAspect, txContext.tx());
     } else {
-      _server.update(ebeanAspect, tx);
+      _server.update(ebeanAspect, txContext.tx());
     }
   }
 
   @Override
   public Map<String, Map<String, EntityAspect>> getLatestAspects(
-      @Nonnull Map<String, Set<String>> urnAspects) {
+      @Nonnull Map<String, Set<String>> urnAspects, boolean forUpdate) {
     validateConnection();
 
     List<EbeanAspectV2.PrimaryKey> keys =
@@ -256,7 +261,12 @@ public Map<String, Map<String, EntityAspect>> getLatestAspects(
                                     entry.getKey(), aspect, ASPECT_LATEST_VERSION)))
             .collect(Collectors.toList());
 
-    List<EbeanAspectV2> results = _server.find(EbeanAspectV2.class).where().idIn(keys).findList();
+    final List<EbeanAspectV2> results;
+    if (forUpdate) {
+      results = _server.find(EbeanAspectV2.class).where().idIn(keys).forUpdate().findList();
+    } else {
+      results = _server.find(EbeanAspectV2.class).where().idIn(keys).findList();
+    }
 
     return toUrnAspectMap(results);
   }
@@ -299,20 +309,21 @@ public EntityAspect getAspect(@Nonnull final EntityAspectIdentifier key) {
   }
 
   @Override
-  public void deleteAspect(@Nullable Transaction tx, @Nonnull final EntityAspect aspect) {
+  public void deleteAspect(
+      @Nullable TransactionContext txContext, @Nonnull final EntityAspect aspect) {
     validateConnection();
     EbeanAspectV2 ebeanAspect = EbeanAspectV2.fromEntityAspect(aspect);
-    _server.delete(ebeanAspect, tx);
+    _server.delete(ebeanAspect, txContext.tx());
   }
 
   @Override
-  public int deleteUrn(@Nullable Transaction tx, @Nonnull final String urn) {
+  public int deleteUrn(@Nullable TransactionContext txContext, @Nonnull final String urn) {
     validateConnection();
     return _server
         .createQuery(EbeanAspectV2.class)
         .where()
         .eq(EbeanAspectV2.URN_COLUMN, urn)
-        .delete(tx);
+        .delete(txContext.tx());
   }
 
   @Override
@@ -512,6 +523,9 @@ public PartitionedStream<EbeanAspectV2> streamAspectBatches(final RestoreIndices
     if (args.aspectName != null) {
       exp = exp.eq(EbeanAspectV2.ASPECT_COLUMN, args.aspectName);
     }
+    if (args.aspectNames != null && !args.aspectNames.isEmpty()) {
+      exp = exp.in(EbeanAspectV2.ASPECT_COLUMN, args.aspectNames);
+    }
     if (args.urn != null) {
       exp = exp.eq(EbeanAspectV2.URN_COLUMN, args.urn);
     }
@@ -650,14 +664,14 @@ public ListResult<String> listLatestAspectMetadata(
   @Override
   @Nonnull
   public <T> T runInTransactionWithRetry(
-      @Nonnull final Function<Transaction, T> block, final int maxTransactionRetry) {
+      @Nonnull final Function<TransactionContext, T> block, final int maxTransactionRetry) {
     return runInTransactionWithRetry(block, null, maxTransactionRetry).get(0);
   }
 
   @Override
   @Nonnull
   public <T> List<T> runInTransactionWithRetry(
-      @Nonnull final Function<Transaction, T> block,
+      @Nonnull final Function<TransactionContext, T> block,
       @Nullable AspectsBatch batch,
       final int maxTransactionRetry) {
 
@@ -712,13 +726,12 @@ public <T> List<T> runInTransactionWithRetry(
 
   @Nonnull
   public <T> T runInTransactionWithRetryUnlocked(
-      @Nonnull final Function<Transaction, T> block,
+      @Nonnull final Function<TransactionContext, T> block,
       @Nullable AspectsBatch batch,
       final int maxTransactionRetry) {
 
     validateConnection();
-    int retryCount = 0;
-    Exception lastException = null;
+    TransactionContext transactionContext = TransactionContext.empty(maxTransactionRetry);
 
     T result = null;
     do {
@@ -726,9 +739,8 @@ public <T> T runInTransactionWithRetryUnlocked(
           _server.beginTransaction(
               TxScope.requiresNew().setIsolation(TxIsolation.REPEATABLE_READ))) {
         transaction.setBatchMode(true);
-        result = block.apply(transaction);
+        result = block.apply(transactionContext.tx(transaction));
         transaction.commit();
-        lastException = null;
         break;
       } catch (PersistenceException exception) {
         if (exception instanceof DuplicateKeyException) {
@@ -741,20 +753,21 @@ public <T> T runInTransactionWithRetryUnlocked(
             log.warn(
                 "Skipping DuplicateKeyException retry since aspect is the key aspect. {}",
                 batch.getUrnAspectsMap().keySet());
-            continue;
+            break;
           }
         }
 
         MetricUtils.counter(MetricRegistry.name(this.getClass(), "txFailed")).inc();
         log.warn("Retryable PersistenceException: {}", exception.getMessage());
-        lastException = exception;
+        transactionContext.addException(exception);
       }
-    } while (++retryCount <= maxTransactionRetry);
+    } while (transactionContext.shouldAttemptRetry());
 
-    if (lastException != null) {
+    if (transactionContext.lastException() != null) {
       MetricUtils.counter(MetricRegistry.name(this.getClass(), "txFailedAfterRetries")).inc();
       throw new RetryLimitReached(
-          "Failed to add after " + maxTransactionRetry + " retries", lastException);
+          "Failed to add after " + maxTransactionRetry + " retries",
+          transactionContext.lastException());
     }
 
     return result;
@@ -811,7 +824,8 @@ public Map<String, Map<String, Long>> getNextVersions(
       return result;
     }
 
-    List<EbeanAspectV2.PrimaryKey> dbResults = exp.endOr().findIds();
+    // forUpdate is required to avoid duplicate key violations
+    List<EbeanAspectV2.PrimaryKey> dbResults = exp.endOr().forUpdate().findIds();
 
     for (EbeanAspectV2.PrimaryKey key : dbResults) {
       if (result.get(key.getUrn()).get(key.getAspect()) <= key.getVersion()) {
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/graph/dgraph/DgraphGraphService.java b/metadata-io/src/main/java/com/linkedin/metadata/graph/dgraph/DgraphGraphService.java
index 27b603244d3b35..6703e07bfd915c 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/graph/dgraph/DgraphGraphService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/graph/dgraph/DgraphGraphService.java
@@ -788,7 +788,7 @@ public RelatedEntitiesScrollResult scrollRelatedEntities(
       @Nonnull Filter destinationEntityFilter,
       @Nonnull List<String> relationshipTypes,
       @Nonnull RelationshipFilter relationshipFilter,
-      @Nonnull List<SortCriterion> sortCriterion,
+      @Nonnull List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       int count,
       @Nullable Long startTimeMillis,
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java b/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java
index e21c4e15b4fc9c..50e5aa6ba893d4 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java
@@ -1323,7 +1323,7 @@ public SearchResponse getSearchResponse(
       @Nullable final Filter destinationEntityFilter,
       @Nonnull final List<String> relationshipTypes,
       @Nonnull final RelationshipFilter relationshipFilter,
-      @Nonnull List<SortCriterion> sortCriterion,
+      @Nonnull List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       int count) {
 
@@ -1336,12 +1336,12 @@ public SearchResponse getSearchResponse(
             relationshipTypes,
             relationshipFilter);
 
-    return executeScrollSearchQuery(finalQuery, sortCriterion, scrollId, count);
+    return executeScrollSearchQuery(finalQuery, sortCriteria, scrollId, count);
   }
 
   private SearchResponse executeScrollSearchQuery(
       @Nonnull final QueryBuilder query,
-      @Nonnull List<SortCriterion> sortCriterion,
+      @Nonnull List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       final int count) {
 
@@ -1357,7 +1357,7 @@ private SearchResponse executeScrollSearchQuery(
 
     searchSourceBuilder.size(count);
     searchSourceBuilder.query(query);
-    ESUtils.buildSortOrder(searchSourceBuilder, sortCriterion, List.of(), false);
+    ESUtils.buildSortOrder(searchSourceBuilder, sortCriteria, List.of(), false);
     searchRequest.source(searchSourceBuilder);
     ESUtils.setSearchAfter(searchSourceBuilder, sort, null, null);
 
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ElasticSearchGraphService.java b/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ElasticSearchGraphService.java
index ada5069d0cabe5..e1532ea4e26c06 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ElasticSearchGraphService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ElasticSearchGraphService.java
@@ -4,7 +4,6 @@
 
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.metadata.aspect.models.graph.Edge;
@@ -65,6 +64,7 @@ public class ElasticSearchGraphService implements GraphService, ElasticSearchInd
   private final ESGraphWriteDAO _graphWriteDAO;
   private final ESGraphQueryDAO _graphReadDAO;
   private final ESIndexBuilder _indexBuilder;
+  private final String idHashAlgo;
   public static final String INDEX_NAME = "graph_service_v1";
   private static final Map<String, Object> EMPTY_HASH = new HashMap<>();
 
@@ -126,7 +126,7 @@ public LineageRegistry getLineageRegistry() {
 
   @Override
   public void addEdge(@Nonnull final Edge edge) {
-    String docId = edge.toDocId();
+    String docId = edge.toDocId(idHashAlgo);
     String edgeDocument = toDocument(edge);
     _graphWriteDAO.upsertDocument(docId, edgeDocument);
   }
@@ -138,7 +138,7 @@ public void upsertEdge(@Nonnull final Edge edge) {
 
   @Override
   public void removeEdge(@Nonnull final Edge edge) {
-    String docId = edge.toDocId();
+    String docId = edge.toDocId(idHashAlgo);
     _graphWriteDAO.deleteDocument(docId);
   }
 
@@ -296,7 +296,6 @@ public List<ReindexConfig> buildReindexConfigs(
             Collections.emptyMap()));
   }
 
-  @VisibleForTesting
   @Override
   public void clear() {
     _esBulkProcessor.deleteByQuery(
@@ -317,7 +316,7 @@ public RelatedEntitiesScrollResult scrollRelatedEntities(
       @Nullable Filter destinationEntityFilter,
       @Nonnull List<String> relationshipTypes,
       @Nonnull RelationshipFilter relationshipFilter,
-      @Nonnull List<SortCriterion> sortCriterion,
+      @Nonnull List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       int count,
       @Nullable Long startTimeMillis,
@@ -333,7 +332,7 @@ public RelatedEntitiesScrollResult scrollRelatedEntities(
             destinationEntityFilter,
             relationshipTypes,
             relationshipFilter,
-            sortCriterion,
+            sortCriteria,
             scrollId,
             count);
 
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphService.java b/metadata-io/src/main/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphService.java
index 16c0804538dd78..9fe9c242fe48c7 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphService.java
@@ -921,7 +921,7 @@ public RelatedEntitiesScrollResult scrollRelatedEntities(
       @Nonnull Filter destinationEntityFilter,
       @Nonnull List<String> relationshipTypes,
       @Nonnull RelationshipFilter relationshipFilter,
-      @Nonnull List<SortCriterion> sortCriterion,
+      @Nonnull List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       int count,
       @Nullable Long startTimeMillis,
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/schemafields/sideeffects/SchemaFieldSideEffect.java b/metadata-io/src/main/java/com/linkedin/metadata/schemafields/sideeffects/SchemaFieldSideEffect.java
new file mode 100644
index 00000000000000..2e86a4251a25c3
--- /dev/null
+++ b/metadata-io/src/main/java/com/linkedin/metadata/schemafields/sideeffects/SchemaFieldSideEffect.java
@@ -0,0 +1,627 @@
+package com.linkedin.metadata.schemafields.sideeffects;
+
+import static com.linkedin.metadata.Constants.APP_SOURCE;
+import static com.linkedin.metadata.Constants.DATASET_ENTITY_NAME;
+import static com.linkedin.metadata.Constants.SCHEMA_FIELD_ALIASES_ASPECT;
+import static com.linkedin.metadata.Constants.SCHEMA_FIELD_ENTITY_NAME;
+import static com.linkedin.metadata.Constants.SCHEMA_FIELD_KEY_ASPECT;
+import static com.linkedin.metadata.Constants.SCHEMA_METADATA_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.STATUS_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.SYSTEM_UPDATE_SOURCE;
+
+import com.linkedin.common.AuditStamp;
+import com.linkedin.common.Status;
+import com.linkedin.common.UrnArray;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.entity.Aspect;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.Constants;
+import com.linkedin.metadata.aspect.AspectRetriever;
+import com.linkedin.metadata.aspect.RetrieverContext;
+import com.linkedin.metadata.aspect.batch.BatchItem;
+import com.linkedin.metadata.aspect.batch.ChangeMCP;
+import com.linkedin.metadata.aspect.batch.MCLItem;
+import com.linkedin.metadata.aspect.batch.MCPItem;
+import com.linkedin.metadata.aspect.plugins.config.AspectPluginConfig;
+import com.linkedin.metadata.aspect.plugins.hooks.MCPSideEffect;
+import com.linkedin.metadata.entity.ebean.batch.ChangeItemImpl;
+import com.linkedin.metadata.entity.ebean.batch.DeleteItemImpl;
+import com.linkedin.metadata.key.SchemaFieldKey;
+import com.linkedin.metadata.models.registry.EntityRegistry;
+import com.linkedin.metadata.timeline.data.ChangeCategory;
+import com.linkedin.metadata.timeline.data.ChangeEvent;
+import com.linkedin.metadata.timeline.data.ChangeOperation;
+import com.linkedin.metadata.timeline.eventgenerator.ChangeEventGeneratorUtils;
+import com.linkedin.metadata.timeline.eventgenerator.EntityChangeEventGeneratorRegistry;
+import com.linkedin.metadata.utils.SchemaFieldUtils;
+import com.linkedin.mxe.SystemMetadata;
+import com.linkedin.schema.SchemaMetadata;
+import com.linkedin.schemafield.SchemaFieldAliases;
+import com.linkedin.util.Pair;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Getter
+@Setter
+@Accessors(chain = true)
+public class SchemaFieldSideEffect extends MCPSideEffect {
+  @Nonnull private AspectPluginConfig config;
+  @Nonnull private EntityChangeEventGeneratorRegistry entityChangeEventGeneratorRegistry;
+
+  private static final Set<String> REQUIRED_ASPECTS =
+      Set.of(SCHEMA_METADATA_ASPECT_NAME, STATUS_ASPECT_NAME);
+
+  @Override
+  protected Stream<ChangeMCP> applyMCPSideEffect(
+      Collection<ChangeMCP> changeMCPs, @Nonnull RetrieverContext retrieverContext) {
+    return Stream.of();
+  }
+
+  /**
+   * Handle delete of dataset schema metadata
+   *
+   * @param mclItems MCL items generated from committing the MCP
+   * @param retrieverContext accessors for aspect and graph data
+   * @return
+   */
+  @Override
+  protected Stream<MCPItem> postMCPSideEffect(
+      Collection<MCLItem> mclItems, @Nonnull RetrieverContext retrieverContext) {
+
+    // fetch existing aspects, if not already in the batch just committed
+    Map<Urn, Map<String, Aspect>> aspectData =
+        fetchRequiredAspects(mclItems, REQUIRED_ASPECTS, retrieverContext.getAspectRetriever());
+
+    return Stream.concat(
+        processUpserts(mclItems, aspectData, retrieverContext),
+        processDelete(mclItems, aspectData, retrieverContext));
+  }
+
+  private static Stream<MCPItem> processDelete(
+      Collection<MCLItem> mclItems,
+      Map<Urn, Map<String, Aspect>> aspectData,
+      @Nonnull RetrieverContext retrieverContext) {
+
+    List<MCLItem> schemaMetadataDeletes =
+        mclItems.stream()
+            .filter(
+                item ->
+                    ChangeType.DELETE.equals(item.getChangeType())
+                        && DATASET_ENTITY_NAME.equals(item.getUrn().getEntityType())
+                        && SCHEMA_METADATA_ASPECT_NAME.equals(item.getAspectName()))
+            .collect(Collectors.toList());
+
+    Stream<MCPItem> schemaMetadataSchemaFieldMCPs =
+        schemaMetadataDeletes.stream()
+            .flatMap(
+                item ->
+                    buildSchemaMetadataSchemaFieldDeleteMCPs(
+                        item, retrieverContext.getAspectRetriever()));
+
+    List<MCLItem> statusDeletes =
+        mclItems.stream()
+            .filter(
+                item ->
+                    ChangeType.DELETE.equals(item.getChangeType())
+                        && DATASET_ENTITY_NAME.equals(item.getUrn().getEntityType())
+                        && STATUS_ASPECT_NAME.equals(item.getAspectName()))
+            .collect(Collectors.toList());
+
+    final Stream<MCPItem> statusSchemaFieldMCPs;
+    if (statusDeletes.isEmpty()) {
+      statusSchemaFieldMCPs = Stream.empty();
+    } else {
+      statusSchemaFieldMCPs =
+          statusDeletes.stream()
+              .flatMap(
+                  item ->
+                      buildStatusSchemaFieldDeleteMCPs(
+                          item,
+                          Optional.ofNullable(
+                                  aspectData
+                                      .getOrDefault(item.getUrn(), Map.of())
+                                      .get(SCHEMA_METADATA_ASPECT_NAME))
+                              .map(aspect -> new SchemaMetadata(aspect.data()))
+                              .orElse(null),
+                          retrieverContext.getAspectRetriever()));
+    }
+
+    return Stream.concat(schemaMetadataSchemaFieldMCPs, statusSchemaFieldMCPs);
+  }
+
+  private Stream<ChangeMCP> processUpserts(
+      Collection<MCLItem> mclItems,
+      Map<Urn, Map<String, Aspect>> aspectData,
+      @Nonnull RetrieverContext retrieverContext) {
+
+    Map<Urn, Set<String>> batchMCPAspectNames =
+        mclItems.stream()
+            .filter(item -> item.getChangeType() != ChangeType.DELETE)
+            .collect(
+                Collectors.groupingBy(
+                    MCLItem::getUrn,
+                    Collectors.mapping(MCLItem::getAspectName, Collectors.toSet())));
+
+    Stream<ChangeMCP> schemaFieldSideEffects =
+        mclItems.stream()
+            .filter(
+                changeMCP ->
+                    changeMCP.getChangeType() != ChangeType.DELETE
+                        && DATASET_ENTITY_NAME.equals(changeMCP.getUrn().getEntityType())
+                        && Constants.SCHEMA_METADATA_ASPECT_NAME.equals(changeMCP.getAspectName()))
+            .flatMap(
+                // Build schemaField Keys and Aliases
+                item ->
+                    optimizedKeyAspectMCPsConcat(
+                        buildSchemaFieldKeyMCPs(
+                            item, aspectData, retrieverContext.getAspectRetriever()),
+                        buildSchemaFieldAliasesMCPs(item, retrieverContext.getAspectRetriever())));
+
+    Stream<ChangeMCP> statusSideEffects =
+        mclItems.stream()
+            .filter(
+                changeMCP ->
+                    changeMCP.getChangeType() != ChangeType.DELETE
+                        && DATASET_ENTITY_NAME.equals(changeMCP.getUrn().getEntityType())
+                        && Constants.STATUS_ASPECT_NAME.equals(changeMCP.getAspectName())
+                        // if present, already computed above
+                        && !batchMCPAspectNames
+                            .getOrDefault(changeMCP.getUrn(), Set.of())
+                            .contains(Constants.SCHEMA_METADATA_ASPECT_NAME))
+            .flatMap(
+                item ->
+                    mirrorStatusAspect(item, aspectData, retrieverContext.getAspectRetriever()));
+
+    Stream<ChangeMCP> removedFieldStatusSideEffects =
+        mclItems.stream()
+            .filter(
+                changeMCP ->
+                    changeMCP.getChangeType() != ChangeType.DELETE
+                        && DATASET_ENTITY_NAME.equals(changeMCP.getUrn().getEntityType())
+                        && SCHEMA_METADATA_ASPECT_NAME.equals(changeMCP.getAspectName())
+                        && changeMCP.getPreviousRecordTemplate() != null)
+            .flatMap(
+                item ->
+                    buildRemovedSchemaFieldStatusAspect(
+                        item, retrieverContext.getAspectRetriever()));
+
+    return optimizedKeyAspectMCPsConcat(
+        Stream.concat(schemaFieldSideEffects, statusSideEffects), removedFieldStatusSideEffects);
+  }
+
+  /**
+   * Copy aspect from dataset to schema fields
+   *
+   * @param parentDatasetStatusItem dataset mcp item
+   * @param aspectRetriever aspectRetriever context
+   * @return side effect schema field aspects
+   */
+  private static Stream<ChangeMCP> mirrorStatusAspect(
+      BatchItem parentDatasetStatusItem,
+      Map<Urn, Map<String, Aspect>> aspectData,
+      @Nonnull AspectRetriever aspectRetriever) {
+
+    SchemaMetadata schemaMetadata =
+        Optional.ofNullable(
+                aspectData
+                    .getOrDefault(parentDatasetStatusItem.getUrn(), Map.of())
+                    .getOrDefault(Constants.SCHEMA_METADATA_ASPECT_NAME, null))
+            .map(aspect -> new SchemaMetadata(aspect.data()))
+            .orElse(null);
+
+    if (schemaMetadata != null) {
+      return schemaMetadata.getFields().stream()
+          .map(
+              schemaField -> {
+                Boolean removed =
+                    parentDatasetStatusItem.getRecordTemplate() != null
+                        ? parentDatasetStatusItem.getAspect(Status.class).isRemoved()
+                        : null;
+                return buildSchemaFieldStatusMCPs(
+                    SchemaFieldUtils.generateSchemaFieldUrn(
+                        parentDatasetStatusItem.getUrn(), schemaField),
+                    removed,
+                    parentDatasetStatusItem.getAuditStamp(),
+                    parentDatasetStatusItem.getSystemMetadata(),
+                    aspectRetriever);
+              });
+    }
+
+    return Stream.empty();
+  }
+
+  /**
+   * Build a schema field status MCP based on the input status from the dataset
+   *
+   * @param schemaFieldUrn schema fields's urn
+   * @param removed removed status
+   * @param datasetAuditStamp origin audit stamp
+   * @param datasetSystemMetadata origin system metadata
+   * @param aspectRetriever aspect retriever
+   * @return stream of status aspects for schema fields
+   */
+  public static ChangeMCP buildSchemaFieldStatusMCPs(
+      Urn schemaFieldUrn,
+      @Nullable Boolean removed,
+      AuditStamp datasetAuditStamp,
+      SystemMetadata datasetSystemMetadata,
+      @Nonnull AspectRetriever aspectRetriever) {
+    return ChangeItemImpl.builder()
+        .urn(schemaFieldUrn)
+        .changeType(ChangeType.UPSERT)
+        .aspectName(STATUS_ASPECT_NAME)
+        .recordTemplate(new Status().setRemoved(removed != null ? removed : false))
+        .auditStamp(datasetAuditStamp)
+        .systemMetadata(datasetSystemMetadata)
+        .build(aspectRetriever);
+  }
+
+  private Stream<ChangeMCP> buildRemovedSchemaFieldStatusAspect(
+      MCLItem parentDatasetSchemaMetadataItem, @Nonnull AspectRetriever aspectRetriever) {
+
+    List<ChangeEvent> changeEvents =
+        ChangeEventGeneratorUtils.generateChangeEvents(
+            entityChangeEventGeneratorRegistry,
+            parentDatasetSchemaMetadataItem.getUrn(),
+            parentDatasetSchemaMetadataItem.getEntitySpec().getName(),
+            parentDatasetSchemaMetadataItem.getAspectName(),
+            new com.linkedin.metadata.timeline.eventgenerator.Aspect<>(
+                parentDatasetSchemaMetadataItem.getPreviousAspect(SchemaMetadata.class),
+                parentDatasetSchemaMetadataItem.getPreviousSystemMetadata()),
+            new com.linkedin.metadata.timeline.eventgenerator.Aspect<>(
+                parentDatasetSchemaMetadataItem.getAspect(SchemaMetadata.class),
+                parentDatasetSchemaMetadataItem.getSystemMetadata()),
+            parentDatasetSchemaMetadataItem.getAuditStamp());
+
+    return changeEvents.stream()
+        .flatMap(
+            changeEvent ->
+                createRemovedStatusItem(
+                    changeEvent, parentDatasetSchemaMetadataItem, aspectRetriever)
+                    .stream());
+  }
+
+  private static Optional<ChangeMCP> createRemovedStatusItem(
+      @Nonnull final ChangeEvent changeEvent,
+      @Nonnull final MCLItem parentDatasetSchemaMetadataItem,
+      @Nonnull AspectRetriever aspectRetriever) {
+
+    if (changeEvent.getCategory().equals(ChangeCategory.TECHNICAL_SCHEMA)) {
+      if (log.isDebugEnabled()) {
+        // Protect against expensive toString() call
+        String parameterString = "";
+        if (changeEvent.getParameters() != null) {
+          parameterString =
+              changeEvent.getParameters().entrySet().stream()
+                  .map(entry -> entry.getKey() + ":" + entry.getValue())
+                  .collect(Collectors.joining(","));
+        }
+        log.debug(
+            "Technical Schema Event: Entity: {}\nOperation: {}\nModifier: {}\nAuditStamp: {}\nParameters:{}\nCategory:{} ",
+            changeEvent.getEntityUrn(),
+            changeEvent.getOperation(),
+            changeEvent.getModifier(),
+            changeEvent.getAuditStamp(),
+            parameterString,
+            changeEvent.getCategory());
+      }
+      if (changeEvent.getOperation().equals(ChangeOperation.REMOVE)) {
+        String fieldPath = changeEvent.getModifier().toString();
+        log.debug("Creating status change proposal {} for field: {}", true, fieldPath);
+        return Optional.of(
+            buildSchemaFieldStatusMCPs(
+                UrnUtils.getUrn(fieldPath),
+                true,
+                parentDatasetSchemaMetadataItem.getAuditStamp(),
+                parentDatasetSchemaMetadataItem.getSystemMetadata(),
+                aspectRetriever));
+      }
+    }
+    return Optional.empty();
+  }
+
+  /**
+   * Expand dataset schemaMetadata to schemaFields
+   *
+   * @param parentDatasetMetadataSchemaItem dataset mcp item
+   * @param aspectRetriever aspectRetriever context
+   * @return side effect schema field aspects
+   */
+  private static Stream<ChangeMCP> buildSchemaFieldKeyMCPs(
+      MCLItem parentDatasetMetadataSchemaItem,
+      Map<Urn, Map<String, Aspect>> aspectData,
+      @Nonnull AspectRetriever aspectRetriever) {
+
+    Stream<ChangeMCP> schemaFieldKeys =
+        buildSchemaFieldKeyMCPs(parentDatasetMetadataSchemaItem, aspectRetriever);
+
+    // Handle case where dataset status created before schema metadata
+    final Stream<ChangeMCP> statusSideEffects;
+    if (aspectData
+        .getOrDefault(parentDatasetMetadataSchemaItem.getUrn(), Map.of())
+        .containsKey(STATUS_ASPECT_NAME)) {
+      Status status =
+          new Status(
+              aspectData
+                  .get(parentDatasetMetadataSchemaItem.getUrn())
+                  .get(STATUS_ASPECT_NAME)
+                  .data());
+
+      ChangeItemImpl datasetStatusItem =
+          ChangeItemImpl.builder()
+              .changeType(ChangeType.UPSERT)
+              .urn(parentDatasetMetadataSchemaItem.getUrn())
+              .aspectName(STATUS_ASPECT_NAME)
+              .entitySpec(parentDatasetMetadataSchemaItem.getEntitySpec())
+              .aspectSpec(
+                  parentDatasetMetadataSchemaItem.getEntitySpec().getAspectSpec(STATUS_ASPECT_NAME))
+              .recordTemplate(status)
+              .auditStamp(parentDatasetMetadataSchemaItem.getAuditStamp())
+              .systemMetadata(parentDatasetMetadataSchemaItem.getSystemMetadata())
+              .build(aspectRetriever);
+      statusSideEffects = mirrorStatusAspect(datasetStatusItem, aspectData, aspectRetriever);
+    } else {
+      statusSideEffects = Stream.empty();
+    }
+
+    return optimizedKeyAspectMCPsConcat(schemaFieldKeys, statusSideEffects);
+  }
+
+  /**
+   * Given a dataset's metadata schema item, generate schema field key aspects
+   *
+   * @param parentDatasetMetadataSchemaItem dataset's metadata schema MCP
+   * @param aspectRetriever retriever
+   * @return stream of schema field MCPs for its key aspect
+   */
+  private static Stream<ChangeMCP> buildSchemaFieldKeyMCPs(
+      @Nonnull MCLItem parentDatasetMetadataSchemaItem, @Nonnull AspectRetriever aspectRetriever) {
+
+    SystemMetadata systemMetadata = parentDatasetMetadataSchemaItem.getSystemMetadata();
+    SchemaMetadata schemaMetadata = parentDatasetMetadataSchemaItem.getAspect(SchemaMetadata.class);
+    SchemaMetadata previousSchemaMetadata =
+        parentDatasetMetadataSchemaItem.getPreviousRecordTemplate() != null
+            ? parentDatasetMetadataSchemaItem.getPreviousAspect(SchemaMetadata.class)
+            : null;
+
+    return schemaMetadata.getFields().stream()
+        .filter(
+            schemaField ->
+                ChangeType.RESTATE.equals(parentDatasetMetadataSchemaItem.getChangeType())
+                    || previousSchemaMetadata == null
+                    // avoid processing already existing fields
+                    || !previousSchemaMetadata.getFields().contains(schemaField)
+                    // system update pass through
+                    || isSystemUpdate(systemMetadata))
+        .map(
+            schemaField ->
+                ChangeItemImpl.builder()
+                    .urn(
+                        SchemaFieldUtils.generateSchemaFieldUrn(
+                            parentDatasetMetadataSchemaItem.getUrn(), schemaField))
+                    .changeType(ChangeType.UPSERT)
+                    .aspectName(SCHEMA_FIELD_KEY_ASPECT)
+                    .recordTemplate(
+                        new SchemaFieldKey()
+                            .setFieldPath(schemaField.getFieldPath())
+                            .setParent(parentDatasetMetadataSchemaItem.getUrn()))
+                    .auditStamp(parentDatasetMetadataSchemaItem.getAuditStamp())
+                    .systemMetadata(parentDatasetMetadataSchemaItem.getSystemMetadata())
+                    .build(aspectRetriever));
+  }
+
+  /**
+   * Given a dataset's metadata schema item, generate schema field alias aspects
+   *
+   * @param parentDatasetMetadataSchemaItem dataset's metadata schema MCP
+   * @param aspectRetriever retriever
+   * @return stream of schema field aliases for its key aspect
+   */
+  private static Stream<ChangeMCP> buildSchemaFieldAliasesMCPs(
+      @Nonnull MCLItem parentDatasetMetadataSchemaItem, @Nonnull AspectRetriever aspectRetriever) {
+
+    SystemMetadata systemMetadata = parentDatasetMetadataSchemaItem.getSystemMetadata();
+    SchemaMetadata schemaMetadata = parentDatasetMetadataSchemaItem.getAspect(SchemaMetadata.class);
+    SchemaMetadata previousSchemaMetadata =
+        parentDatasetMetadataSchemaItem.getPreviousRecordTemplate() != null
+            ? parentDatasetMetadataSchemaItem.getPreviousAspect(SchemaMetadata.class)
+            : null;
+
+    return schemaMetadata.getFields().stream()
+        .filter(
+            schemaField ->
+                ChangeType.RESTATE.equals(parentDatasetMetadataSchemaItem.getChangeType())
+                    || previousSchemaMetadata == null
+                    || !previousSchemaMetadata.getFields().equals(schemaMetadata.getFields())
+                    // system update pass through
+                    || isSystemUpdate(systemMetadata))
+        .map(
+            schemaField -> {
+              Set<Urn> currentAliases =
+                  SchemaFieldUtils.getSchemaFieldAliases(
+                      parentDatasetMetadataSchemaItem.getUrn(), schemaMetadata, schemaField);
+              Set<Urn> previousAliases =
+                  previousSchemaMetadata == null
+                      ? Set.of()
+                      : SchemaFieldUtils.getSchemaFieldAliases(
+                          parentDatasetMetadataSchemaItem.getUrn(),
+                          previousSchemaMetadata,
+                          schemaField);
+
+              boolean forceUpdate =
+                  isSystemUpdate(systemMetadata)
+                      || ChangeType.RESTATE.equals(parentDatasetMetadataSchemaItem.getChangeType());
+              if (!previousAliases.equals(currentAliases) || forceUpdate) {
+                return ChangeItemImpl.builder()
+                    .urn(
+                        SchemaFieldUtils.generateSchemaFieldUrn(
+                            parentDatasetMetadataSchemaItem.getUrn(), schemaField))
+                    .changeType(ChangeType.UPSERT)
+                    .aspectName(SCHEMA_FIELD_ALIASES_ASPECT)
+                    .recordTemplate(
+                        new SchemaFieldAliases().setAliases(new UrnArray(currentAliases)))
+                    .auditStamp(parentDatasetMetadataSchemaItem.getAuditStamp())
+                    .systemMetadata(parentDatasetMetadataSchemaItem.getSystemMetadata())
+                    .build(aspectRetriever);
+              }
+
+              return (ChangeMCP) null;
+            })
+        .filter(Objects::nonNull);
+  }
+
+  /**
+   * Given a delete MCL for a dataset's schema metadata, generate delete MCPs for the schemaField
+   * aspects
+   *
+   * @param parentDatasetSchemaMetadataDelete the dataset's MCL from a metadata schema delete
+   * @param aspectRetriever retriever context
+   * @return follow-up deletes for the schema field
+   */
+  public static Stream<MCPItem> buildSchemaMetadataSchemaFieldDeleteMCPs(
+      @Nonnull MCLItem parentDatasetSchemaMetadataDelete,
+      @Nonnull AspectRetriever aspectRetriever) {
+
+    EntityRegistry entityRegistry = aspectRetriever.getEntityRegistry();
+    Urn datasetUrn = parentDatasetSchemaMetadataDelete.getUrn();
+    SchemaMetadata parentDatasetSchemaMetadata =
+        parentDatasetSchemaMetadataDelete.getPreviousAspect(SchemaMetadata.class);
+
+    return parentDatasetSchemaMetadata.getFields().stream()
+        .flatMap(
+            schemaField ->
+                entityRegistry.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME).getAspectSpecs().stream()
+                    .map(
+                        aspectSpec ->
+                            DeleteItemImpl.builder()
+                                .urn(
+                                    SchemaFieldUtils.generateSchemaFieldUrn(
+                                        datasetUrn, schemaField))
+                                .aspectName(aspectSpec.getName())
+                                .auditStamp(parentDatasetSchemaMetadataDelete.getAuditStamp())
+                                .entitySpec(entityRegistry.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME))
+                                .aspectSpec(aspectSpec)
+                                .build(aspectRetriever)));
+  }
+
+  public static Stream<MCPItem> buildStatusSchemaFieldDeleteMCPs(
+      @Nonnull MCLItem parentDatasetStatusDelete,
+      @Nullable SchemaMetadata parentDatasetSchemaMetadata,
+      @Nonnull AspectRetriever aspectRetriever) {
+
+    if (parentDatasetSchemaMetadata == null) {
+      return Stream.empty();
+    } else {
+      EntityRegistry entityRegistry = aspectRetriever.getEntityRegistry();
+      return parentDatasetSchemaMetadata.getFields().stream()
+          .map(
+              schemaField ->
+                  DeleteItemImpl.builder()
+                      .urn(
+                          SchemaFieldUtils.generateSchemaFieldUrn(
+                              parentDatasetStatusDelete.getUrn(), schemaField))
+                      .aspectName(STATUS_ASPECT_NAME)
+                      .auditStamp(parentDatasetStatusDelete.getAuditStamp())
+                      .entitySpec(entityRegistry.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME))
+                      .aspectSpec(parentDatasetStatusDelete.getAspectSpec())
+                      .build(aspectRetriever));
+    }
+  }
+
+  /**
+   * Fetch missing aspects if not already in the batch
+   *
+   * @param mclItems batch mcps
+   * @param aspectRetriever aspect retriever
+   * @return required aspects for the side effect processing
+   */
+  private static Map<Urn, Map<String, Aspect>> fetchRequiredAspects(
+      Collection<MCLItem> mclItems,
+      Set<String> requiredAspectNames,
+      AspectRetriever aspectRetriever) {
+    Map<Urn, Map<String, Aspect>> aspectData = new HashMap<>();
+
+    // Aspects included data in batch
+    mclItems.stream()
+        .filter(item -> item.getRecordTemplate() != null)
+        .forEach(
+            item ->
+                aspectData
+                    .computeIfAbsent(item.getUrn(), k -> new HashMap<>())
+                    .put(item.getAspectName(), new Aspect(item.getRecordTemplate().data())));
+
+    // Aspect to fetch
+    Map<Urn, Set<String>> missingAspectData =
+        mclItems.stream()
+            .flatMap(
+                item ->
+                    requiredAspectNames.stream()
+                        .filter(
+                            aspectName ->
+                                !aspectData
+                                    .getOrDefault(item.getUrn(), Map.of())
+                                    .containsKey(aspectName))
+                        .map(aspectName -> Pair.of(item.getUrn(), aspectName)))
+            .collect(
+                Collectors.groupingBy(
+                    Pair::getKey, Collectors.mapping(Pair::getValue, Collectors.toSet())));
+
+    // Fetch missing
+    missingAspectData.forEach(
+        (urn, aspectNames) -> {
+          Map<String, Aspect> fetchedData =
+              aspectRetriever.getLatestAspectObjects(Set.of(urn), aspectNames).get(urn);
+          if (fetchedData != null) {
+            fetchedData.forEach(
+                (aspectName, aspectValue) ->
+                    aspectData
+                        .computeIfAbsent(urn, k -> new HashMap<>())
+                        .put(aspectName, aspectValue));
+          }
+        });
+
+    return aspectData;
+  }
+
+  /**
+   * We can reduce the number of MCPs sent via kafka by 1/2 to 1/3 because key aspects are
+   * automatically created if they don't exist. The only case where there needs to be an explicit
+   * key aspect is when there are no other aspects being generated.
+   *
+   * @param keyMCPs stream of MCPs which *may* contain key aspects
+   * @param otherMCPs stream of MCPs which are not expected to contain key aspects
+   * @return reduced stream of MCPs
+   */
+  private static <T extends MCPItem> Stream<T> optimizedKeyAspectMCPsConcat(
+      Stream<T> keyMCPs, Stream<T> otherMCPs) {
+    List<T> other = otherMCPs.collect(Collectors.toList());
+    Set<Urn> otherUrns = other.stream().map(T::getUrn).collect(Collectors.toSet());
+    return Stream.concat(
+        keyMCPs.filter(
+            item ->
+                !item.getAspectName().equals(item.getEntitySpec().getKeyAspectName())
+                    || !otherUrns.contains(item.getUrn())),
+        other.stream());
+  }
+
+  private static boolean isSystemUpdate(@Nullable SystemMetadata systemMetadata) {
+    return systemMetadata != null
+        && systemMetadata.getProperties() != null
+        && SYSTEM_UPDATE_SOURCE.equals(systemMetadata.getProperties().get(APP_SOURCE));
+  }
+}
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/LineageSearchService.java b/metadata-io/src/main/java/com/linkedin/metadata/search/LineageSearchService.java
index 95c8eb13beb937..84fcc2c0a0f911 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/LineageSearchService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/LineageSearchService.java
@@ -2,6 +2,7 @@
 
 import static com.datahub.authorization.AuthUtil.canViewEntity;
 import static com.linkedin.metadata.Constants.*;
+import static com.linkedin.metadata.search.utils.QueryUtils.buildFilterWithUrns;
 import static com.linkedin.metadata.search.utils.SearchUtils.applyDefaultSearchFlags;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -12,9 +13,8 @@
 import com.linkedin.common.urn.Urn;
 import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.data.template.LongMap;
-import com.linkedin.data.template.StringArray;
 import com.linkedin.metadata.Constants;
-import com.linkedin.metadata.config.cache.SearchLineageCacheConfiguration;
+import com.linkedin.metadata.config.DataHubAppConfiguration;
 import com.linkedin.metadata.graph.EntityLineageResult;
 import com.linkedin.metadata.graph.GraphService;
 import com.linkedin.metadata.graph.LineageDirection;
@@ -32,7 +32,6 @@
 import com.linkedin.metadata.query.filter.SortCriterion;
 import com.linkedin.metadata.search.cache.CachedEntityLineageResult;
 import com.linkedin.metadata.search.utils.FilterUtils;
-import com.linkedin.metadata.search.utils.QueryUtils;
 import com.linkedin.metadata.search.utils.SearchUtils;
 import io.datahubproject.metadata.context.OperationContext;
 import io.opentelemetry.extension.annotations.WithSpan;
@@ -81,7 +80,7 @@ public class LineageSearchService {
   private final GraphService _graphService;
   @Nullable private final Cache cache;
   private final boolean cacheEnabled;
-  private final SearchLineageCacheConfiguration cacheConfiguration;
+  private final DataHubAppConfiguration appConfig;
   private final ExecutorService cacheRefillExecutor = Executors.newFixedThreadPool(1);
 
   private static final String DEGREE_FILTER = "degree";
@@ -118,7 +117,7 @@ public class LineageSearchService {
    * @param maxHops the maximum number of hops away to search for. If null, defaults to 1000
    * @param inputFilters the request map with fields and values as filters to be applied to search
    *     hits
-   * @param sortCriterion {@link SortCriterion} to be applied to search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to search results
    * @param from index to start the search from
    * @param size the number of search hits to return
    * @return a {@link LineageSearchResult} that contains a list of matched documents and related
@@ -134,7 +133,7 @@ public LineageSearchResult searchAcrossLineage(
       @Nullable String input,
       @Nullable Integer maxHops,
       @Nullable Filter inputFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size) {
 
@@ -198,7 +197,7 @@ public LineageSearchResult searchAcrossLineage(
       freshnessStats.setSystemFreshness(systemFreshness);
       // set up cache refill if needed
       if (System.currentTimeMillis() - cachedLineageResult.getTimestamp()
-          > cacheConfiguration.getTTLMillis()) {
+          > appConfig.getCache().getSearch().getLineage().getTTLMillis()) {
         log.info("Cached lineage entry for: {} is older than one day. Will refill.", sourceUrn);
         Integer finalMaxHops = maxHops;
         this.cacheRefillExecutor.submit(
@@ -208,7 +207,7 @@ public LineageSearchResult searchAcrossLineage(
                   cache.get(cacheKey, CachedEntityLineageResult.class);
               if (reFetchLineageResult == null
                   || System.currentTimeMillis() - reFetchLineageResult.getTimestamp()
-                      > cacheConfiguration.getTTLMillis()) {
+                      > appConfig.getCache().getSearch().getLineage().getTTLMillis()) {
                 // we have to refetch
                 EntityLineageResult result =
                     _graphService.getLineage(
@@ -255,7 +254,7 @@ public LineageSearchResult searchAcrossLineage(
           SearchUtils.removeCriteria(
               inputFilters, criterion -> criterion.getField().equals(DEGREE_FILTER_INPUT));
 
-      if (canDoLightning(lineageRelationships, finalInput, reducedFilters, sortCriterion)) {
+      if (canDoLightning(lineageRelationships, finalInput, reducedFilters, sortCriteria)) {
         codePath = "lightning";
         // use lightning approach to return lineage search results
         LineageSearchResult lineageSearchResult =
@@ -276,7 +275,7 @@ public LineageSearchResult searchAcrossLineage(
                 lineageRelationships,
                 finalInput,
                 reducedFilters,
-                sortCriterion,
+                sortCriteria,
                 from,
                 size);
         if (!lineageSearchResult.getEntities().isEmpty()) {
@@ -303,7 +302,7 @@ boolean canDoLightning(
       List<LineageRelationship> lineageRelationships,
       String input,
       Filter inputFilters,
-      SortCriterion sortCriterion) {
+      List<SortCriterion> sortCriteria) {
     boolean simpleFilters =
         inputFilters == null
             || inputFilters.getOr() == null
@@ -315,10 +314,11 @@ boolean canDoLightning(
                                 criterion1 ->
                                     "platform".equals(criterion1.getField())
                                         || "origin".equals(criterion1.getField())));
-    return (lineageRelationships.size() > cacheConfiguration.getLightningThreshold())
+    return (lineageRelationships.size()
+            > appConfig.getCache().getSearch().getLineage().getLightningThreshold())
         && input.equals("*")
         && simpleFilters
-        && sortCriterion == null;
+        && CollectionUtils.isEmpty(sortCriteria);
   }
 
   @VisibleForTesting
@@ -533,7 +533,7 @@ private LineageSearchResult getSearchResultInBatches(
       List<LineageRelationship> lineageRelationships,
       @Nonnull String input,
       @Nullable Filter inputFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size) {
 
@@ -555,7 +555,7 @@ private LineageSearchResult getSearchResultInBatches(
               .distinct()
               .collect(Collectors.toList());
       Map<Urn, LineageRelationship> urnToRelationship = generateUrnToRelationshipMap(batch);
-      Filter finalFilter = buildFilter(urnToRelationship.keySet(), inputFilters);
+      Filter finalFilter = buildFilterWithUrns(appConfig, urnToRelationship.keySet(), inputFilters);
 
       LineageSearchResult resultForBatch =
           buildLineageSearchResult(
@@ -566,7 +566,7 @@ private LineageSearchResult getSearchResultInBatches(
                   entitiesToQuery,
                   input,
                   finalFilter,
-                  sortCriterion,
+                  sortCriteria,
                   queryFrom,
                   querySize),
               urnToRelationship);
@@ -671,27 +671,6 @@ private List<LineageRelationship> filterRelationships(
     return relationshipsFilteredByEntities.collect(Collectors.toList());
   }
 
-  private Filter buildFilter(@Nonnull Set<Urn> urns, @Nullable Filter inputFilters) {
-    Criterion urnMatchCriterion =
-        new Criterion()
-            .setField("urn")
-            .setValue("")
-            .setValues(
-                new StringArray(urns.stream().map(Object::toString).collect(Collectors.toList())));
-    if (inputFilters == null) {
-      return QueryUtils.newFilter(urnMatchCriterion);
-    }
-
-    // Add urn match criterion to each or clause
-    if (!CollectionUtils.isEmpty(inputFilters.getOr())) {
-      for (ConjunctiveCriterion conjunctiveCriterion : inputFilters.getOr()) {
-        conjunctiveCriterion.getAnd().add(urnMatchCriterion);
-      }
-      return inputFilters;
-    }
-    return QueryUtils.newFilter(urnMatchCriterion);
-  }
-
   private LineageSearchResult buildLineageSearchResult(
       @Nonnull OperationContext opContext,
       @Nonnull SearchResult searchResult,
@@ -761,7 +740,7 @@ private LineageSearchEntity buildLineageSearchEntity(
    * @param maxHops the maximum number of hops away to search for. If null, defaults to 1000
    * @param inputFilters the request map with fields and values as filters to be applied to search
    *     hits
-   * @param sortCriterion {@link SortCriterion} to be applied to search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to search results
    * @param scrollId opaque scroll identifier to pass to search service
    * @param size the number of search hits to return
    * @return a {@link LineageSearchResult} that contains a list of matched documents and related
@@ -777,7 +756,7 @@ public LineageScrollResult scrollAcrossLineage(
       @Nullable String input,
       @Nullable Integer maxHops,
       @Nullable Filter inputFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nonnull String keepAlive,
       int size) {
@@ -809,7 +788,7 @@ public LineageScrollResult scrollAcrossLineage(
     } else {
       lineageResult = cachedLineageResult.getEntityLineageResult();
       if (System.currentTimeMillis() - cachedLineageResult.getTimestamp()
-          > cacheConfiguration.getTTLMillis()) {
+          > appConfig.getCache().getSearch().getLineage().getTTLMillis()) {
         log.warn("Cached lineage entry for: {} is older than one day.", sourceUrn);
       }
     }
@@ -831,7 +810,7 @@ public LineageScrollResult scrollAcrossLineage(
         lineageRelationships,
         input != null ? input : "*",
         reducedFilters,
-        sortCriterion,
+        sortCriteria,
         scrollId,
         keepAlive,
         size);
@@ -843,7 +822,7 @@ private LineageScrollResult getScrollResultInBatches(
       List<LineageRelationship> lineageRelationships,
       @Nonnull String input,
       @Nullable Filter inputFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nonnull String keepAlive,
       int size) {
@@ -868,7 +847,7 @@ private LineageScrollResult getScrollResultInBatches(
               .distinct()
               .collect(Collectors.toList());
       Map<Urn, LineageRelationship> urnToRelationship = generateUrnToRelationshipMap(batch);
-      Filter finalFilter = buildFilter(urnToRelationship.keySet(), inputFilters);
+      Filter finalFilter = buildFilterWithUrns(appConfig, urnToRelationship.keySet(), inputFilters);
 
       LineageScrollResult resultForBatch =
           buildLineageScrollResult(
@@ -878,7 +857,7 @@ private LineageScrollResult getScrollResultInBatches(
                   entitiesToQuery,
                   input,
                   finalFilter,
-                  sortCriterion,
+                  sortCriteria,
                   scrollId,
                   keepAlive,
                   querySize),
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/SearchService.java b/metadata-io/src/main/java/com/linkedin/metadata/search/SearchService.java
index c8525f829d2066..1cd738656d972f 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/SearchService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/SearchService.java
@@ -65,7 +65,7 @@ public Map<String, Long> docCountPerEntity(
    * @param input the search input text
    * @param postFilters the request map with fields and values as filters to be applied to search
    *     hits
-   * @param sortCriterion {@link SortCriterion} to be applied to search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to search results
    * @param from index to start the search from
    * @param size the number of search hits to return
    * @return a {@link SearchResult} that contains a list of matched documents and related search
@@ -77,7 +77,7 @@ public SearchResult search(
       @Nonnull List<String> entityNames,
       @Nonnull String input,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size) {
     List<String> entitiesToSearch = getEntitiesToSearch(opContext, entityNames, size);
@@ -87,7 +87,7 @@ public SearchResult search(
     }
     SearchResult result =
         _cachingEntitySearchService.search(
-            opContext, entitiesToSearch, input, postFilters, sortCriterion, from, size, null);
+            opContext, entitiesToSearch, input, postFilters, sortCriteria, from, size, null);
 
     try {
       return result
@@ -105,11 +105,11 @@ public SearchResult searchAcrossEntities(
       @Nonnull List<String> entities,
       @Nonnull String input,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size) {
     return searchAcrossEntities(
-        opContext, entities, input, postFilters, sortCriterion, from, size, null);
+        opContext, entities, input, postFilters, sortCriteria, from, size, null);
   }
 
   /**
@@ -120,7 +120,7 @@ public SearchResult searchAcrossEntities(
    * @param input the search input text
    * @param postFilters the request map with fields and values as filters to be applied to search
    *     hits
-   * @param sortCriterion {@link SortCriterion} to be applied to search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to search results
    * @param from index to start the search from
    * @param size the number of search hits to return
    * @param facets list of facets we want aggregations for
@@ -133,14 +133,14 @@ public SearchResult searchAcrossEntities(
       @Nonnull List<String> entities,
       @Nonnull String input,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size,
       @Nullable List<String> facets) {
     log.debug(
         String.format(
             "Searching Search documents entities: %s, input: %s, postFilters: %s, sortCriterion: %s, from: %s, size: %s",
-            entities, input, postFilters, sortCriterion, from, size));
+            entities, input, postFilters, sortCriteria, from, size));
     // DEPRECATED
     // This is the legacy version of `_entityType`-- it operates as a special case and does not
     // support ORs, Unions, etc.
@@ -160,7 +160,7 @@ public SearchResult searchAcrossEntities(
     }
     SearchResult result =
         _cachingEntitySearchService.search(
-            opContext, nonEmptyEntities, input, postFilters, sortCriterion, from, size, facets);
+            opContext, nonEmptyEntities, input, postFilters, sortCriteria, from, size, facets);
     if (facets == null || facets.contains("entity") || facets.contains("_entityType")) {
       Optional<AggregationMetadata> entityTypeAgg =
           result.getMetadata().getAggregations().stream()
@@ -238,7 +238,7 @@ public List<String> getEntitiesToSearch(
    * @param input the search input text
    * @param postFilters the request map with fields and values as filters to be applied to search
    *     hits
-   * @param sortCriterion {@link SortCriterion} to be applied to search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to search results
    * @param scrollId opaque scroll identifier for passing to search backend
    * @param size the number of search hits to return
    * @return a {@link ScrollResult} that contains a list of matched documents and related search
@@ -250,21 +250,21 @@ public ScrollResult scrollAcrossEntities(
       @Nonnull List<String> entities,
       @Nonnull String input,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nullable String keepAlive,
       int size) {
     log.debug(
         String.format(
-            "Searching Search documents entities: %s, input: %s, postFilters: %s, sortCriterion: %s, from: %s, size: %s",
-            entities, input, postFilters, sortCriterion, scrollId, size));
+            "Searching Search documents entities: %s, input: %s, postFilters: %s, sortCriteria: %s, from: %s, size: %s",
+            entities, input, postFilters, sortCriteria, scrollId, size));
     List<String> entitiesToSearch = getEntitiesToSearch(opContext, entities, size);
     if (entitiesToSearch.isEmpty()) {
       // No indices with non-zero entries: skip querying and return empty result
       return getEmptyScrollResult(size);
     }
     return _cachingEntitySearchService.scroll(
-        opContext, entitiesToSearch, input, postFilters, sortCriterion, scrollId, keepAlive, size);
+        opContext, entitiesToSearch, input, postFilters, sortCriteria, scrollId, keepAlive, size);
   }
 
   private static SearchResult getEmptySearchResult(int from, int size) {
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/SearchServiceSearchRetriever.java b/metadata-io/src/main/java/com/linkedin/metadata/search/SearchServiceSearchRetriever.java
index a5ef1c8fa58b12..8d7548e0ba90a1 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/SearchServiceSearchRetriever.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/SearchServiceSearchRetriever.java
@@ -43,7 +43,7 @@ public ScrollResult scroll(
         entities,
         "*",
         filters,
-        urnSort,
+        List.of(urnSort),
         scrollId,
         null,
         count);
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/cache/CachedSearchResult.java b/metadata-io/src/main/java/com/linkedin/metadata/search/cache/CachedSearchResult.java
new file mode 100644
index 00000000000000..7fa93be62fd97f
--- /dev/null
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/cache/CachedSearchResult.java
@@ -0,0 +1,23 @@
+package com.linkedin.metadata.search.cache;
+
+import static com.datahub.util.RecordUtils.*;
+import static com.linkedin.metadata.search.utils.GZIPUtil.*;
+
+import com.linkedin.metadata.search.SearchResult;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class CachedSearchResult implements Serializable {
+  private final byte[] searchResult;
+  private final long timestamp;
+
+  public CachedSearchResult(SearchResult lineageResult, long timestamp) {
+    this.searchResult = gzipCompress(toJsonString(lineageResult));
+    this.timestamp = timestamp;
+  }
+
+  public SearchResult getSearchResult() {
+    return toRecordTemplate(SearchResult.class, gzipDecompress(searchResult));
+  }
+}
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/client/CachingEntitySearchService.java b/metadata-io/src/main/java/com/linkedin/metadata/search/client/CachingEntitySearchService.java
index 5db427fa901488..cb062e0e3f4483 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/client/CachingEntitySearchService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/client/CachingEntitySearchService.java
@@ -20,6 +20,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
 import org.javatuples.Septet;
 import org.javatuples.Sextet;
 import org.springframework.cache.Cache;
@@ -47,7 +48,7 @@ public class CachingEntitySearchService {
    * @param entityNames the names of the entity to search
    * @param query the search query
    * @param filters the filters to include
-   * @param sortCriterion the sort criterion
+   * @param sortCriteria the sort criteria
    * @param from the start offset
    * @param size the count
    * @param facets list of facets we want aggregations for
@@ -58,12 +59,12 @@ public SearchResult search(
       @Nonnull List<String> entityNames,
       @Nonnull String query,
       @Nullable Filter filters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size,
       @Nullable List<String> facets) {
     return getCachedSearchResults(
-        opContext, entityNames, query, filters, sortCriterion, from, size, facets);
+        opContext, entityNames, query, filters, sortCriteria, from, size, facets);
   }
 
   /**
@@ -115,7 +116,7 @@ public BrowseResult browse(
    * @param entities the names of the entities to search
    * @param query the search query
    * @param filters the filters to include
-   * @param sortCriterion the sort criterion
+   * @param sortCriteria the sort criteria
    * @param scrollId opaque scroll identifier for a scroll request
    * @param keepAlive the string representation of how long to keep point in time alive
    * @param size the count
@@ -126,12 +127,12 @@ public ScrollResult scroll(
       @Nonnull List<String> entities,
       @Nonnull String query,
       @Nullable Filter filters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nullable String keepAlive,
       int size) {
     return getCachedScrollResults(
-        opContext, entities, query, filters, sortCriterion, scrollId, keepAlive, size);
+        opContext, entities, query, filters, sortCriteria, scrollId, keepAlive, size);
   }
 
   /**
@@ -145,7 +146,7 @@ public SearchResult getCachedSearchResults(
       @Nonnull List<String> entityNames,
       @Nonnull String query,
       @Nullable Filter filters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size,
       @Nullable List<String> facets) {
@@ -158,7 +159,7 @@ public SearchResult getCachedSearchResults(
                     entityNames,
                     query,
                     filters,
-                    sortCriterion,
+                    sortCriteria,
                     querySize.getFrom(),
                     querySize.getSize(),
                     facets),
@@ -168,7 +169,7 @@ public SearchResult getCachedSearchResults(
                     entityNames,
                     query,
                     filters != null ? toJsonString(filters) : null,
-                    sortCriterion != null ? toJsonString(sortCriterion) : null,
+                    CollectionUtils.isNotEmpty(sortCriteria) ? toJsonString(sortCriteria) : null,
                     facets,
                     querySize),
             enableCache)
@@ -269,7 +270,7 @@ public ScrollResult getCachedScrollResults(
       @Nonnull List<String> entities,
       @Nonnull String query,
       @Nullable Filter filters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nullable String keepAlive,
       int size) {
@@ -291,7 +292,7 @@ public ScrollResult getCachedScrollResults(
                 entities,
                 query,
                 filters != null ? toJsonString(filters) : null,
-                sortCriterion != null ? toJsonString(sortCriterion) : null,
+                CollectionUtils.isNotEmpty(sortCriteria) ? toJsonString(sortCriteria) : null,
                 scrollId,
                 size);
         String json = cache.get(cacheKey, String.class);
@@ -305,7 +306,7 @@ public ScrollResult getCachedScrollResults(
                   entities,
                   query,
                   filters,
-                  sortCriterion,
+                  sortCriteria,
                   scrollId,
                   keepAlive,
                   size,
@@ -321,7 +322,7 @@ public ScrollResult getCachedScrollResults(
                 entities,
                 query,
                 filters,
-                sortCriterion,
+                sortCriteria,
                 scrollId,
                 keepAlive,
                 size,
@@ -337,12 +338,12 @@ private SearchResult getRawSearchResults(
       final List<String> entityNames,
       final String input,
       final Filter filters,
-      final SortCriterion sortCriterion,
+      final List<SortCriterion> sortCriteria,
       final int start,
       final int count,
       @Nullable final List<String> facets) {
     return entitySearchService.search(
-        opContext, entityNames, input, filters, sortCriterion, start, count, facets);
+        opContext, entityNames, input, filters, sortCriteria, start, count, facets);
   }
 
   /** Executes the expensive autocomplete query using the {@link EntitySearchService} */
@@ -373,17 +374,17 @@ private ScrollResult getRawScrollResults(
       final List<String> entities,
       final String input,
       final Filter filters,
-      final SortCriterion sortCriterion,
+      final List<SortCriterion> sortCriteria,
       @Nullable final String scrollId,
       @Nullable final String keepAlive,
       final int count,
       final boolean fulltext) {
     if (fulltext) {
       return entitySearchService.fullTextScroll(
-          opContext, entities, input, filters, sortCriterion, scrollId, keepAlive, count);
+          opContext, entities, input, filters, sortCriteria, scrollId, keepAlive, count);
     } else {
       return entitySearchService.structuredScroll(
-          opContext, entities, input, filters, sortCriterion, scrollId, keepAlive, count);
+          opContext, entities, input, filters, sortCriteria, scrollId, keepAlive, count);
     }
   }
 
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/ElasticSearchService.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/ElasticSearchService.java
index 578c34611a75aa..9905d5e7790ade 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/ElasticSearchService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/ElasticSearchService.java
@@ -18,8 +18,8 @@
 import com.linkedin.metadata.search.elasticsearch.query.ESSearchDAO;
 import com.linkedin.metadata.search.elasticsearch.update.ESWriteDAO;
 import com.linkedin.metadata.search.utils.ESUtils;
-import com.linkedin.metadata.search.utils.SearchUtils;
 import com.linkedin.metadata.shared.ElasticSearchIndexed;
+import com.linkedin.metadata.utils.elasticsearch.IndexConvention;
 import com.linkedin.structured.StructuredPropertyDefinition;
 import com.linkedin.util.Pair;
 import io.datahubproject.metadata.context.OperationContext;
@@ -108,13 +108,8 @@ public void appendRunId(
       @Nonnull String entityName,
       @Nonnull Urn urn,
       @Nullable String runId) {
-    final Optional<String> maybeDocId = SearchUtils.getDocId(urn);
-    if (!maybeDocId.isPresent()) {
-      log.warn(
-          String.format("Failed to append run id, could not generate a doc id for urn %s", urn));
-      return;
-    }
-    final String docId = maybeDocId.get();
+    final String docId = indexBuilders.getIndexConvention().getEntityDocumentId(urn);
+
     log.info(
         "Appending run id for entity name: {}, doc id: {}, run id: {}", entityName, docId, runId);
     esWriteDAO.applyScriptUpdate(
@@ -142,10 +137,10 @@ public SearchResult search(
       @Nonnull List<String> entityNames,
       @Nonnull String input,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size) {
-    return search(opContext, entityNames, input, postFilters, sortCriterion, from, size, null);
+    return search(opContext, entityNames, input, postFilters, sortCriteria, from, size, null);
   }
 
   @Nonnull
@@ -154,14 +149,14 @@ public SearchResult search(
       @Nonnull List<String> entityNames,
       @Nonnull String input,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size,
       @Nullable List<String> facets) {
     log.debug(
         String.format(
-            "Searching FullText Search documents entityName: %s, input: %s, postFilters: %s, sortCriterion: %s, from: %s, size: %s",
-            entityNames, input, postFilters, sortCriterion, from, size));
+            "Searching FullText Search documents entityName: %s, input: %s, postFilters: %s, sortCriteria: %s, from: %s, size: %s",
+            entityNames, input, postFilters, sortCriteria, from, size));
 
     return esSearchDAO.search(
         opContext.withSearchFlags(
@@ -169,7 +164,7 @@ public SearchResult search(
         entityNames,
         input,
         postFilters,
-        sortCriterion,
+        sortCriteria,
         from,
         size,
         facets);
@@ -181,20 +176,20 @@ public SearchResult filter(
       @Nonnull OperationContext opContext,
       @Nonnull String entityName,
       @Nullable Filter filters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size) {
     log.debug(
         String.format(
-            "Filtering Search documents entityName: %s, filters: %s, sortCriterion: %s, from: %s, size: %s",
-            entityName, filters, sortCriterion, from, size));
+            "Filtering Search documents entityName: %s, filters: %s, sortCriteria: %s, from: %s, size: %s",
+            entityName, filters, sortCriteria, from, size));
 
     return esSearchDAO.filter(
         opContext.withSearchFlags(
             flags -> applyDefaultSearchFlags(flags, null, DEFAULT_SERVICE_SEARCH_FLAGS)),
         entityName,
         filters,
-        sortCriterion,
+        sortCriteria,
         from,
         size);
   }
@@ -330,14 +325,14 @@ public ScrollResult fullTextScroll(
       @Nonnull List<String> entities,
       @Nonnull String input,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nullable String keepAlive,
       int size) {
     log.debug(
         String.format(
-            "Scrolling Structured Search documents entities: %s, input: %s, postFilters: %s, sortCriterion: %s, scrollId: %s, size: %s",
-            entities, input, postFilters, sortCriterion, scrollId, size));
+            "Scrolling Structured Search documents entities: %s, input: %s, postFilters: %s, sortCriteria: %s, scrollId: %s, size: %s",
+            entities, input, postFilters, sortCriteria, scrollId, size));
 
     return esSearchDAO.scroll(
         opContext.withSearchFlags(
@@ -347,7 +342,7 @@ public ScrollResult fullTextScroll(
         entities,
         input,
         postFilters,
-        sortCriterion,
+        sortCriteria,
         scrollId,
         keepAlive,
         size);
@@ -360,14 +355,14 @@ public ScrollResult structuredScroll(
       @Nonnull List<String> entities,
       @Nonnull String input,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nullable String keepAlive,
       int size) {
     log.debug(
         String.format(
-            "Scrolling FullText Search documents entities: %s, input: %s, postFilters: %s, sortCriterion: %s, scrollId: %s, size: %s",
-            entities, input, postFilters, sortCriterion, scrollId, size));
+            "Scrolling FullText Search documents entities: %s, input: %s, postFilters: %s, sortCriteria: %s, scrollId: %s, size: %s",
+            entities, input, postFilters, sortCriteria, scrollId, size));
 
     return esSearchDAO.scroll(
         opContext.withSearchFlags(
@@ -377,7 +372,7 @@ public ScrollResult structuredScroll(
         entities,
         input,
         postFilters,
-        sortCriterion,
+        sortCriteria,
         scrollId,
         keepAlive,
         size);
@@ -400,7 +395,7 @@ public ExplainResponse explain(
       @Nonnull String documentId,
       @Nonnull String entityName,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nullable String keepAlive,
       int size,
@@ -413,10 +408,15 @@ public ExplainResponse explain(
         documentId,
         entityName,
         postFilters,
-        sortCriterion,
+        sortCriteria,
         scrollId,
         keepAlive,
         size,
         facets);
   }
+
+  @Override
+  public IndexConvention getIndexConvention() {
+    return indexBuilders.getIndexConvention();
+  }
 }
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/indexbuilder/EntityIndexBuilders.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/indexbuilder/EntityIndexBuilders.java
index eba4593c9042c5..6f1d7f74f15427 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/indexbuilder/EntityIndexBuilders.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/indexbuilder/EntityIndexBuilders.java
@@ -12,6 +12,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -20,7 +21,7 @@
 public class EntityIndexBuilders implements ElasticSearchIndexed {
   private final ESIndexBuilder indexBuilder;
   private final EntityRegistry entityRegistry;
-  private final IndexConvention indexConvention;
+  @Getter private final IndexConvention indexConvention;
   private final SettingsBuilder settingsBuilder;
 
   public ESIndexBuilder getIndexBuilder() {
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESSearchDAO.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESSearchDAO.java
index b537a396340277..cb342794aff585 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESSearchDAO.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESSearchDAO.java
@@ -228,7 +228,7 @@ private ScrollResult executeAndExtract(
    * @param input the search input text
    * @param postFilters the request map with fields and values as filters to be applied to search
    *     hits
-   * @param sortCriterion {@link SortCriterion} to be applied to search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to search results
    * @param from index to start the search from
    * @param size the number of search hits to return
    * @param facets list of facets we want aggregations for
@@ -241,7 +241,7 @@ public SearchResult search(
       @Nonnull List<String> entityNames,
       @Nonnull String input,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size,
       @Nullable List<String> facets) {
@@ -257,7 +257,7 @@ public SearchResult search(
     final SearchRequest searchRequest =
         SearchRequestHandler.getBuilder(entitySpecs, searchConfiguration, customSearchConfiguration)
             .getSearchRequest(
-                opContext, finalInput, transformedFilters, sortCriterion, from, size, facets);
+                opContext, finalInput, transformedFilters, sortCriteria, from, size, facets);
     searchRequest.indices(
         entityNames.stream().map(indexConvention::getEntityIndexName).toArray(String[]::new));
     searchRequestTimer.stop();
@@ -270,7 +270,7 @@ public SearchResult search(
    *
    * @param filters the request map with fields and values to be applied as filters to the search
    *     query
-   * @param sortCriterion {@link SortCriterion} to be applied to search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to search results
    * @param from index to start the search from
    * @param size number of search hits to return
    * @return a {@link SearchResult} that contains a list of filtered documents and related search
@@ -281,7 +281,7 @@ public SearchResult filter(
       @Nonnull OperationContext opContext,
       @Nonnull String entityName,
       @Nullable Filter filters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size) {
     IndexConvention indexConvention = opContext.getSearchContext().getIndexConvention();
@@ -289,7 +289,7 @@ public SearchResult filter(
     Filter transformedFilters = transformFilterForEntities(filters, indexConvention);
     final SearchRequest searchRequest =
         SearchRequestHandler.getBuilder(entitySpec, searchConfiguration, customSearchConfiguration)
-            .getFilterRequest(opContext, transformedFilters, sortCriterion, from, size);
+            .getFilterRequest(opContext, transformedFilters, sortCriteria, from, size);
 
     searchRequest.indices(indexConvention.getIndexName(entitySpec));
     return executeAndExtract(
@@ -401,7 +401,7 @@ public Map<String, Long> aggregateByValue(
    * @param input the search input text
    * @param postFilters the request map with fields and values as filters to be applied to search
    *     hits
-   * @param sortCriterion {@link SortCriterion} to be applied to search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to search results
    * @param scrollId opaque scroll Id to convert to a PIT ID and Sort array to pass to ElasticSearch
    * @param keepAlive string representation of the time to keep a point in time alive
    * @param size the number of search hits to return
@@ -414,7 +414,7 @@ public ScrollResult scroll(
       @Nonnull List<String> entities,
       @Nonnull String input,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nullable String keepAlive,
       int size) {
@@ -439,7 +439,7 @@ public ScrollResult scroll(
             transformedFilters,
             entitySpecs,
             finalInput,
-            sortCriterion,
+            sortCriteria,
             null);
 
     // PIT specifies indices in creation so it doesn't support specifying indices on the request, so
@@ -462,7 +462,7 @@ private SearchRequest getScrollRequest(
       @Nullable Filter postFilters,
       List<EntitySpec> entitySpecs,
       String finalInput,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable List<String> facets) {
     String pitId = null;
     Object[] sort = null;
@@ -483,15 +483,7 @@ private SearchRequest getScrollRequest(
     return SearchRequestHandler.getBuilder(
             entitySpecs, searchConfiguration, customSearchConfiguration)
         .getSearchRequest(
-            opContext,
-            finalInput,
-            postFilters,
-            sortCriterion,
-            sort,
-            pitId,
-            keepAlive,
-            size,
-            facets);
+            opContext, finalInput, postFilters, sortCriteria, sort, pitId, keepAlive, size, facets);
   }
 
   public Optional<SearchResponse> raw(
@@ -544,7 +536,7 @@ public ExplainResponse explain(
       @Nonnull String documentId,
       @Nonnull String entityName,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nullable String keepAlive,
       int size,
@@ -564,7 +556,7 @@ public ExplainResponse explain(
             transformedFilters,
             Collections.singletonList(entitySpec),
             finalQuery,
-            sortCriterion,
+            sortCriteria,
             facets);
     ;
 
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchQueryBuilder.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchQueryBuilder.java
index 6a1f24a92e4a3a..9ac460ed7e1e1d 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchQueryBuilder.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchQueryBuilder.java
@@ -52,7 +52,7 @@
 
 @Slf4j
 public class SearchQueryBuilder {
-  public static final String STRUCTURED_QUERY_PREFIX = "\\\\/q ";
+  public static final String STRUCTURED_QUERY_PREFIX = "\\/q ";
   private final ExactMatchConfiguration exactMatchConfiguration;
   private final PartialConfiguration partialConfiguration;
   private final WordGramConfiguration wordGramConfiguration;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java
index 66ad1e3be363f3..6e4210de6ef80a 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java
@@ -187,7 +187,7 @@ public SearchRequest getSearchRequest(
       @Nonnull OperationContext opContext,
       @Nonnull String input,
       @Nullable Filter filter,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size,
       @Nullable List<String> facets) {
@@ -213,7 +213,7 @@ public SearchRequest getSearchRequest(
     if (Boolean.FALSE.equals(searchFlags.isSkipHighlighting())) {
       searchSourceBuilder.highlighter(highlights);
     }
-    ESUtils.buildSortOrder(searchSourceBuilder, sortCriterion, entitySpecs);
+    ESUtils.buildSortOrder(searchSourceBuilder, sortCriteria, entitySpecs);
 
     if (Boolean.TRUE.equals(searchFlags.isGetSuggestions())) {
       ESUtils.buildNameSuggestions(searchSourceBuilder, input);
@@ -243,7 +243,7 @@ public SearchRequest getSearchRequest(
       @Nonnull OperationContext opContext,
       @Nonnull String input,
       @Nullable Filter filter,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable Object[] sort,
       @Nullable String pitId,
       @Nullable String keepAlive,
@@ -272,7 +272,7 @@ public SearchRequest getSearchRequest(
     if (Boolean.FALSE.equals(searchFlags.isSkipHighlighting())) {
       searchSourceBuilder.highlighter(highlights);
     }
-    ESUtils.buildSortOrder(searchSourceBuilder, sortCriterion, entitySpecs);
+    ESUtils.buildSortOrder(searchSourceBuilder, sortCriteria, entitySpecs);
     searchRequest.source(searchSourceBuilder);
     log.debug("Search request is: " + searchRequest);
     searchRequest.indicesOptions(null);
@@ -285,7 +285,7 @@ public SearchRequest getSearchRequest(
    * to be applied to search results.
    *
    * @param filters {@link Filter} list of conditions with fields and values
-   * @param sortCriterion {@link SortCriterion} to be applied to the search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to the search results
    * @param from index to start the search from
    * @param size the number of search hits to return
    * @return {@link SearchRequest} that contains the filtered query
@@ -294,7 +294,7 @@ public SearchRequest getSearchRequest(
   public SearchRequest getFilterRequest(
       @Nonnull OperationContext opContext,
       @Nullable Filter filters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size) {
     SearchRequest searchRequest = new SearchRequest();
@@ -303,7 +303,7 @@ public SearchRequest getFilterRequest(
     final SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
     searchSourceBuilder.query(filterQuery);
     searchSourceBuilder.from(from).size(size);
-    ESUtils.buildSortOrder(searchSourceBuilder, sortCriterion, entitySpecs);
+    ESUtils.buildSortOrder(searchSourceBuilder, sortCriteria, entitySpecs);
     searchRequest.source(searchSourceBuilder);
 
     return searchRequest;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
index e299dde62b1841..6c9b339af42c7b 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
@@ -299,17 +299,14 @@ public static String getElasticTypeForFieldType(SearchableAnnotation.FieldType f
    *
    * @param searchSourceBuilder {@link SearchSourceBuilder} that needs to be populated with sort
    *     order
-   * @param sortCriterion {@link SortCriterion} to be applied to the search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to the search results
    */
   public static void buildSortOrder(
       @Nonnull SearchSourceBuilder searchSourceBuilder,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       List<EntitySpec> entitySpecs) {
     buildSortOrder(
-        searchSourceBuilder,
-        sortCriterion == null ? List.of() : List.of(sortCriterion),
-        entitySpecs,
-        true);
+        searchSourceBuilder, sortCriteria == null ? List.of() : sortCriteria, entitySpecs, true);
   }
 
   /**
@@ -321,20 +318,20 @@ public static void buildSortOrder(
    */
   public static void buildSortOrder(
       @Nonnull SearchSourceBuilder searchSourceBuilder,
-      @Nonnull List<SortCriterion> sortCriterion,
+      @Nonnull List<SortCriterion> sortCriteria,
       List<EntitySpec> entitySpecs,
       boolean enableDefaultSort) {
-    if (sortCriterion.isEmpty() && enableDefaultSort) {
+    if (sortCriteria.isEmpty() && enableDefaultSort) {
       searchSourceBuilder.sort(new ScoreSortBuilder().order(SortOrder.DESC));
     } else {
-      for (SortCriterion sortCriteria : sortCriterion) {
+      for (SortCriterion sortCriterion : sortCriteria) {
         Optional<SearchableAnnotation.FieldType> fieldTypeForDefault = Optional.empty();
         for (EntitySpec entitySpec : entitySpecs) {
           List<SearchableFieldSpec> fieldSpecs = entitySpec.getSearchableFieldSpecs();
           for (SearchableFieldSpec fieldSpec : fieldSpecs) {
             SearchableAnnotation annotation = fieldSpec.getSearchableAnnotation();
-            if (annotation.getFieldName().equals(sortCriteria.getField())
-                || annotation.getFieldNameAliases().contains(sortCriteria.getField())) {
+            if (annotation.getFieldName().equals(sortCriterion.getField())
+                || annotation.getFieldNameAliases().contains(sortCriterion.getField())) {
               fieldTypeForDefault = Optional.of(fieldSpec.getSearchableAnnotation().getFieldType());
               break;
             }
@@ -346,15 +343,15 @@ public static void buildSortOrder(
         if (fieldTypeForDefault.isEmpty() && !entitySpecs.isEmpty()) {
           log.warn(
               "Sort criterion field "
-                  + sortCriteria.getField()
+                  + sortCriterion.getField()
                   + " was not found in any entity spec to be searched");
         }
         final SortOrder esSortOrder =
-            (sortCriteria.getOrder() == com.linkedin.metadata.query.filter.SortOrder.ASCENDING)
+            (sortCriterion.getOrder() == com.linkedin.metadata.query.filter.SortOrder.ASCENDING)
                 ? SortOrder.ASC
                 : SortOrder.DESC;
         FieldSortBuilder sortBuilder =
-            new FieldSortBuilder(sortCriteria.getField()).order(esSortOrder);
+            new FieldSortBuilder(sortCriterion.getField()).order(esSortOrder);
         if (fieldTypeForDefault.isPresent()) {
           String esFieldtype = getElasticTypeForFieldType(fieldTypeForDefault.get());
           if (esFieldtype != null) {
@@ -365,8 +362,8 @@ public static void buildSortOrder(
       }
     }
     if (enableDefaultSort
-        && (sortCriterion.isEmpty()
-            || sortCriterion.stream()
+        && (sortCriteria.isEmpty()
+            || sortCriteria.stream()
                 .noneMatch(c -> c.getField().equals(DEFAULT_SEARCH_RESULTS_SORT_BY_FIELD)))) {
       searchSourceBuilder.sort(
           new FieldSortBuilder(DEFAULT_SEARCH_RESULTS_SORT_BY_FIELD).order(SortOrder.ASC));
@@ -558,25 +555,97 @@ private static QueryBuilder getQueryBuilderFromCriterionForSingleField(
                 aspectRetriever)
             .queryName(queryName != null ? queryName : fieldName);
       } else if (condition == Condition.CONTAIN) {
-        return QueryBuilders.wildcardQuery(
-                toKeywordField(criterion.getField(), isTimeseries, aspectRetriever),
-                "*" + ESUtils.escapeReservedCharacters(criterion.getValue().trim()) + "*")
-            .queryName(queryName != null ? queryName : fieldName);
+        return buildContainsConditionFromCriterion(
+            fieldName, criterion, queryName, isTimeseries, aspectRetriever);
       } else if (condition == Condition.START_WITH) {
-        return QueryBuilders.wildcardQuery(
-                toKeywordField(criterion.getField(), isTimeseries, aspectRetriever),
-                ESUtils.escapeReservedCharacters(criterion.getValue().trim()) + "*")
-            .queryName(queryName != null ? queryName : fieldName);
+        return buildStartsWithConditionFromCriterion(
+            fieldName, criterion, queryName, isTimeseries, aspectRetriever);
       } else if (condition == Condition.END_WITH) {
-        return QueryBuilders.wildcardQuery(
-                toKeywordField(criterion.getField(), isTimeseries, aspectRetriever),
-                "*" + ESUtils.escapeReservedCharacters(criterion.getValue().trim()))
-            .queryName(queryName != null ? queryName : fieldName);
+        return buildEndsWithConditionFromCriterion(
+            fieldName, criterion, queryName, isTimeseries, aspectRetriever);
       }
     }
     throw new UnsupportedOperationException("Unsupported condition: " + condition);
   }
 
+  private static QueryBuilder buildWildcardQueryWithMultipleValues(
+      @Nonnull final String fieldName,
+      @Nonnull final Criterion criterion,
+      final boolean isTimeseries,
+      @Nullable String queryName,
+      @Nonnull AspectRetriever aspectRetriever,
+      String wildcardPattern) {
+    BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+
+    for (String value : criterion.getValues()) {
+      boolQuery.should(
+          QueryBuilders.wildcardQuery(
+                  toKeywordField(criterion.getField(), isTimeseries, aspectRetriever),
+                  String.format(wildcardPattern, ESUtils.escapeReservedCharacters(value.trim())))
+              .queryName(queryName != null ? queryName : fieldName));
+    }
+    return boolQuery;
+  }
+
+  private static QueryBuilder buildWildcardQueryWithSingleValue(
+      @Nonnull final String fieldName,
+      @Nonnull final Criterion criterion,
+      final boolean isTimeseries,
+      @Nullable String queryName,
+      @Nonnull AspectRetriever aspectRetriever,
+      String wildcardPattern) {
+    return QueryBuilders.wildcardQuery(
+            toKeywordField(criterion.getField(), isTimeseries, aspectRetriever),
+            String.format(
+                wildcardPattern, ESUtils.escapeReservedCharacters(criterion.getValue().trim())))
+        .queryName(queryName != null ? queryName : fieldName);
+  }
+
+  private static QueryBuilder buildContainsConditionFromCriterion(
+      @Nonnull final String fieldName,
+      @Nonnull final Criterion criterion,
+      @Nullable String queryName,
+      final boolean isTimeseries,
+      @Nonnull AspectRetriever aspectRetriever) {
+
+    if (!criterion.getValues().isEmpty()) {
+      return buildWildcardQueryWithMultipleValues(
+          fieldName, criterion, isTimeseries, queryName, aspectRetriever, "*%s*");
+    }
+    return buildWildcardQueryWithSingleValue(
+        fieldName, criterion, isTimeseries, queryName, aspectRetriever, "*%s*");
+  }
+
+  private static QueryBuilder buildStartsWithConditionFromCriterion(
+      @Nonnull final String fieldName,
+      @Nonnull final Criterion criterion,
+      @Nullable String queryName,
+      final boolean isTimeseries,
+      @Nonnull AspectRetriever aspectRetriever) {
+
+    if (!criterion.getValues().isEmpty()) {
+      return buildWildcardQueryWithMultipleValues(
+          fieldName, criterion, isTimeseries, queryName, aspectRetriever, "%s*");
+    }
+    return buildWildcardQueryWithSingleValue(
+        fieldName, criterion, isTimeseries, queryName, aspectRetriever, "%s*");
+  }
+
+  private static QueryBuilder buildEndsWithConditionFromCriterion(
+      @Nonnull final String fieldName,
+      @Nonnull final Criterion criterion,
+      @Nullable String queryName,
+      final boolean isTimeseries,
+      @Nonnull AspectRetriever aspectRetriever) {
+
+    if (!criterion.getValues().isEmpty()) {
+      return buildWildcardQueryWithMultipleValues(
+          fieldName, criterion, isTimeseries, queryName, aspectRetriever, "*%s");
+    }
+    return buildWildcardQueryWithSingleValue(
+        fieldName, criterion, isTimeseries, queryName, aspectRetriever, "*%s");
+  }
+
   private static QueryBuilder buildEqualsConditionFromCriterion(
       @Nonnull final String fieldName,
       @Nonnull final Criterion criterion,
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/SearchUtils.java b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/SearchUtils.java
index 3ddc004dd9fa9f..add2b1526ab675 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/SearchUtils.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/SearchUtils.java
@@ -3,7 +3,6 @@
 import static com.linkedin.metadata.Constants.*;
 
 import com.linkedin.common.UrnArray;
-import com.linkedin.common.urn.Urn;
 import com.linkedin.data.template.LongMap;
 import com.linkedin.metadata.query.ListResult;
 import com.linkedin.metadata.query.SearchFlags;
@@ -19,11 +18,8 @@
 import com.linkedin.metadata.utils.SearchUtil;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.util.Collections;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -39,15 +35,6 @@ public class SearchUtils {
 
   private SearchUtils() {}
 
-  public static Optional<String> getDocId(@Nonnull Urn urn) {
-    try {
-      return Optional.of(URLEncoder.encode(urn.toString(), "UTF-8"));
-    } catch (UnsupportedEncodingException e) {
-      log.error("Failed to encode the urn with error: {}", e.toString());
-      return Optional.empty();
-    }
-  }
-
   /**
    * Validates the request params and create a request map out of it.
    *
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/service/UpdateIndicesService.java b/metadata-io/src/main/java/com/linkedin/metadata/service/UpdateIndicesService.java
index dff0a99a142b73..2274b0a7c1cd82 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/service/UpdateIndicesService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/service/UpdateIndicesService.java
@@ -14,7 +14,6 @@
 import com.linkedin.common.Status;
 import com.linkedin.common.UrnArray;
 import com.linkedin.common.urn.Urn;
-import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.datajob.DataJobInputOutput;
 import com.linkedin.dataset.FineGrainedLineage;
@@ -30,7 +29,6 @@
 import com.linkedin.metadata.graph.GraphIndexUtils;
 import com.linkedin.metadata.graph.GraphService;
 import com.linkedin.metadata.graph.dgraph.DgraphGraphService;
-import com.linkedin.metadata.key.SchemaFieldKey;
 import com.linkedin.metadata.models.AspectSpec;
 import com.linkedin.metadata.models.EntitySpec;
 import com.linkedin.metadata.models.RelationshipFieldSpec;
@@ -41,11 +39,10 @@
 import com.linkedin.metadata.search.EntitySearchService;
 import com.linkedin.metadata.search.elasticsearch.indexbuilder.EntityIndexBuilders;
 import com.linkedin.metadata.search.transformer.SearchDocumentTransformer;
-import com.linkedin.metadata.search.utils.SearchUtils;
 import com.linkedin.metadata.systemmetadata.SystemMetadataService;
 import com.linkedin.metadata.timeseries.TimeseriesAspectService;
 import com.linkedin.metadata.timeseries.transformer.TimeseriesAspectTransformer;
-import com.linkedin.metadata.utils.EntityKeyUtils;
+import com.linkedin.metadata.utils.SchemaFieldUtils;
 import com.linkedin.mxe.MetadataChangeLog;
 import com.linkedin.mxe.SystemMetadata;
 import com.linkedin.structured.StructuredPropertyDefinition;
@@ -80,6 +77,7 @@ public class UpdateIndicesService implements SearchIndicesService {
   private final SystemMetadataService _systemMetadataService;
   private final SearchDocumentTransformer _searchDocumentTransformer;
   private final EntityIndexBuilders _entityIndexBuilders;
+  @Nonnull private final String idHashAlgo;
 
   @Value("${featureFlags.graphServiceDiffModeEnabled:true}")
   private boolean _graphDiffMode;
@@ -117,13 +115,15 @@ public UpdateIndicesService(
       TimeseriesAspectService timeseriesAspectService,
       SystemMetadataService systemMetadataService,
       SearchDocumentTransformer searchDocumentTransformer,
-      EntityIndexBuilders entityIndexBuilders) {
+      EntityIndexBuilders entityIndexBuilders,
+      @Nonnull String idHashAlgo) {
     _graphService = graphService;
     _entitySearchService = entitySearchService;
     _timeseriesAspectService = timeseriesAspectService;
     _systemMetadataService = systemMetadataService;
     _searchDocumentTransformer = searchDocumentTransformer;
     _entityIndexBuilders = entityIndexBuilders;
+    this.idHashAlgo = idHashAlgo;
   }
 
   @Override
@@ -324,17 +324,6 @@ private void updateFineGrainedEdgesAndRelationships(
     }
   }
 
-  private Urn generateSchemaFieldUrn(
-      @Nonnull final String resourceUrn, @Nonnull final String fieldPath) {
-    // we rely on schemaField fieldPaths to be encoded since we do that with fineGrainedLineage on
-    // the ingestion side
-    final String encodedFieldPath =
-        fieldPath.replaceAll("\\(", "%28").replaceAll("\\)", "%29").replaceAll(",", "%2C");
-    final SchemaFieldKey key =
-        new SchemaFieldKey().setParent(UrnUtils.getUrn(resourceUrn)).setFieldPath(encodedFieldPath);
-    return EntityKeyUtils.convertEntityKeyToUrn(key, Constants.SCHEMA_FIELD_ENTITY_NAME);
-  }
-
   // TODO: remove this method once we implement sourceOverride and update inputFields aspect
   private void updateInputFieldEdgesAndRelationships(
       @Nonnull final Urn urn,
@@ -347,7 +336,7 @@ private void updateInputFieldEdgesAndRelationships(
             && field.hasSchemaField()
             && field.getSchemaField().hasFieldPath()) {
           final Urn sourceFieldUrn =
-              generateSchemaFieldUrn(urn.toString(), field.getSchemaField().getFieldPath());
+              SchemaFieldUtils.generateSchemaFieldUrn(urn, field.getSchemaField().getFieldPath());
           // TODO: add edges uniformly across aspects
           edgesToAdd.add(
               new Edge(
@@ -551,11 +540,7 @@ private void updateSearchService(@Nonnull OperationContext opContext, MCLItem ev
       return;
     }
 
-    Optional<String> docId = SearchUtils.getDocId(urn);
-
-    if (!docId.isPresent()) {
-      return;
-    }
+    final String docId = _entityIndexBuilders.getIndexConvention().getEntityDocumentId(urn);
 
     if (_searchDiffMode
         && (systemMetadata == null
@@ -587,7 +572,7 @@ private void updateSearchService(@Nonnull OperationContext opContext, MCLItem ev
                 searchDocument.get(), previousSearchDocument.orElse(null))
             .toString();
 
-    _entitySearchService.upsertDocument(opContext, entityName, finalDocument, docId.get());
+    _entitySearchService.upsertDocument(opContext, entityName, finalDocument, docId);
   }
 
   /** Process snapshot and update time-series index */
@@ -601,7 +586,9 @@ private void updateTimeseriesFields(
       SystemMetadata systemMetadata) {
     Map<String, JsonNode> documents;
     try {
-      documents = TimeseriesAspectTransformer.transform(urn, aspect, aspectSpec, systemMetadata);
+      documents =
+          TimeseriesAspectTransformer.transform(
+              urn, aspect, aspectSpec, systemMetadata, idHashAlgo);
     } catch (JsonProcessingException e) {
       log.error("Failed to generate timeseries document from aspect: {}", e.toString());
       return;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ESSystemMetadataDAO.java b/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ESSystemMetadataDAO.java
index cf1674ac004809..a5c2fb04b5ce39 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ESSystemMetadataDAO.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ESSystemMetadataDAO.java
@@ -54,10 +54,7 @@ public Optional<GetTaskResponse> getTaskStatus(@Nonnull String nodeId, long task
     try {
       return client.tasks().get(taskRequest, RequestOptions.DEFAULT);
     } catch (IOException e) {
-      log.error(
-          String.format(
-              "ERROR: Failed to get task status for %s:%d. See stacktrace for a more detailed error:",
-              nodeId, taskId));
+      log.error("ERROR: Failed to get task status: ", e);
       e.printStackTrace();
     }
     return Optional.empty();
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ElasticSearchSystemMetadataService.java b/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ElasticSearchSystemMetadataService.java
index 13fde9e392927f..fe79ba75cb1d14 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ElasticSearchSystemMetadataService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ElasticSearchSystemMetadataService.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.metadata.run.AspectRowSummary;
@@ -53,6 +52,7 @@ public class ElasticSearchSystemMetadataService
   private final IndexConvention _indexConvention;
   private final ESSystemMetadataDAO _esDAO;
   private final ESIndexBuilder _indexBuilder;
+  @Nonnull private final String elasticIdHashAlgo;
 
   private static final String DOC_DELIMETER = "--";
   public static final String INDEX_NAME = "system_metadata_service_v1";
@@ -87,10 +87,9 @@ private String toDocument(SystemMetadata systemMetadata, String urn, String aspe
 
   private String toDocId(@Nonnull final String urn, @Nonnull final String aspect) {
     String rawDocId = urn + DOC_DELIMETER + aspect;
-
     try {
       byte[] bytesOfRawDocID = rawDocId.getBytes(StandardCharsets.UTF_8);
-      MessageDigest md = MessageDigest.getInstance("MD5");
+      MessageDigest md = MessageDigest.getInstance(elasticIdHashAlgo);
       byte[] thedigest = md.digest(bytesOfRawDocID);
       return Base64.getEncoder().encodeToString(thedigest);
     } catch (NoSuchAlgorithmException e) {
@@ -250,7 +249,6 @@ public List<ReindexConfig> buildReindexConfigs(
             Collections.emptyMap()));
   }
 
-  @VisibleForTesting
   @Override
   public void clear() {
     _esBulkProcessor.deleteByQuery(
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeline/TimelineServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/timeline/TimelineServiceImpl.java
index a93d4880a7979e..3895bf4fe2ef86 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeline/TimelineServiceImpl.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeline/TimelineServiceImpl.java
@@ -3,12 +3,8 @@
 import static com.linkedin.common.urn.VersionedUrnUtils.*;
 import static com.linkedin.metadata.Constants.*;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.StreamReadConstraints;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.fge.jsonpatch.JsonPatch;
-import com.github.fge.jsonpatch.diff.JsonDiff;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.metadata.entity.AspectDao;
 import com.linkedin.metadata.entity.EntityAspect;
@@ -30,6 +26,10 @@
 import com.linkedin.metadata.timeline.eventgenerator.InstitutionalMemoryChangeEventGenerator;
 import com.linkedin.metadata.timeline.eventgenerator.OwnershipChangeEventGenerator;
 import com.linkedin.metadata.timeline.eventgenerator.SchemaMetadataChangeEventGenerator;
+import jakarta.json.Json;
+import jakarta.json.JsonPatch;
+import jakarta.json.JsonValue;
+import java.io.StringReader;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -478,16 +478,13 @@ private List<ChangeTransaction> computeDiff(
   }
 
   private JsonPatch getRawDiff(EntityAspect previousValue, EntityAspect currentValue) {
-    JsonNode prevNode = OBJECT_MAPPER.nullNode();
-    try {
-      if (previousValue.getVersion() != -1) {
-        prevNode = OBJECT_MAPPER.readTree(previousValue.getMetadata());
-      }
-      JsonNode currNode = OBJECT_MAPPER.readTree(currentValue.getMetadata());
-      return JsonDiff.asJsonPatch(prevNode, currNode);
-    } catch (JsonProcessingException e) {
-      throw new IllegalStateException(e);
+    JsonValue prevNode = Json.createReader(new StringReader("{}")).readValue();
+    if (previousValue.getVersion() != -1) {
+      prevNode = Json.createReader(new StringReader(previousValue.getMetadata())).readValue();
     }
+    JsonValue currNode =
+        Json.createReader(new StringReader(currentValue.getMetadata())).readValue();
+    return Json.createDiff(prevNode.asJsonObject(), currNode.asJsonObject());
   }
 
   private void combineComputedDiffsPerTransactionId(
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeline/data/entity/OwnerChangeEvent.java b/metadata-io/src/main/java/com/linkedin/metadata/timeline/data/entity/OwnerChangeEvent.java
index fc4f0327b77042..a14b73d8f94b0b 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeline/data/entity/OwnerChangeEvent.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeline/data/entity/OwnerChangeEvent.java
@@ -27,17 +27,29 @@ public OwnerChangeEvent(
       SemanticChangeType semVerChange,
       String description,
       Urn ownerUrn,
-      OwnershipType ownerType) {
+      OwnershipType ownerType,
+      Urn ownerTypeUrn) {
     super(
         entityUrn,
         category,
         operation,
         modifier,
-        ImmutableMap.of(
-            "ownerUrn", ownerUrn.toString(),
-            "ownerType", ownerType.toString()),
+        buildParameters(ownerUrn, ownerType, ownerTypeUrn),
         auditStamp,
         semVerChange,
         description);
   }
+
+  private static ImmutableMap<String, Object> buildParameters(
+      Urn ownerUrn, OwnershipType ownerType, Urn ownerTypeUrn) {
+    ImmutableMap.Builder<String, Object> builder =
+        new ImmutableMap.Builder<String, Object>()
+            .put("ownerUrn", ownerUrn.toString())
+            .put("ownerType", ownerType.toString());
+    if (ownerTypeUrn != null) {
+      builder.put("ownerTypeUrn", ownerTypeUrn.toString());
+    }
+
+    return builder.build();
+  }
 }
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/ChangeEventGeneratorUtils.java b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/ChangeEventGeneratorUtils.java
index f6192294e57010..7c74788f62342a 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/ChangeEventGeneratorUtils.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/ChangeEventGeneratorUtils.java
@@ -1,13 +1,16 @@
 package com.linkedin.metadata.timeline.eventgenerator;
 
+import com.linkedin.common.AuditStamp;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.metadata.timeline.data.ChangeEvent;
 import com.linkedin.metadata.timeline.data.dataset.schema.SchemaFieldGlossaryTermChangeEvent;
 import com.linkedin.metadata.timeline.data.dataset.schema.SchemaFieldTagChangeEvent;
 import com.linkedin.metadata.timeline.data.entity.GlossaryTermChangeEvent;
 import com.linkedin.metadata.timeline.data.entity.TagChangeEvent;
 import com.linkedin.schema.SchemaField;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -95,5 +98,27 @@ public static List<ChangeEvent> convertEntityGlossaryTermChangeEvents(
         .collect(Collectors.toList());
   }
 
+  public static <T extends RecordTemplate> List<ChangeEvent> generateChangeEvents(
+      @Nonnull EntityChangeEventGeneratorRegistry entityChangeEventGeneratorRegistry,
+      @Nonnull final Urn urn,
+      @Nonnull final String entityName,
+      @Nonnull final String aspectName,
+      @Nonnull final Aspect<T> from,
+      @Nonnull final Aspect<T> to,
+      @Nonnull AuditStamp auditStamp) {
+    final List<EntityChangeEventGenerator<T>> entityChangeEventGenerators =
+        entityChangeEventGeneratorRegistry.getEntityChangeEventGenerators(aspectName).stream()
+            // Note: Assumes that correct types have been registered for the aspect.
+            .map(changeEventGenerator -> (EntityChangeEventGenerator<T>) changeEventGenerator)
+            .collect(Collectors.toList());
+    final List<ChangeEvent> allChangeEvents = new ArrayList<>();
+    for (EntityChangeEventGenerator<T> entityChangeEventGenerator : entityChangeEventGenerators) {
+      allChangeEvents.addAll(
+          entityChangeEventGenerator.getChangeEvents(
+              urn, entityName, aspectName, from, to, auditStamp));
+    }
+    return allChangeEvents;
+  }
+
   private ChangeEventGeneratorUtils() {}
 }
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/DatasetPropertiesChangeEventGenerator.java b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/DatasetPropertiesChangeEventGenerator.java
index f9e1d5c835c60c..4f6ebd36829fad 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/DatasetPropertiesChangeEventGenerator.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/DatasetPropertiesChangeEventGenerator.java
@@ -4,7 +4,6 @@
 import static com.linkedin.metadata.timeline.eventgenerator.EditableDatasetPropertiesChangeEventGenerator.*;
 
 import com.datahub.util.RecordUtils;
-import com.github.fge.jsonpatch.JsonPatch;
 import com.google.common.collect.ImmutableMap;
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.urn.Urn;
@@ -15,6 +14,7 @@
 import com.linkedin.metadata.timeline.data.ChangeOperation;
 import com.linkedin.metadata.timeline.data.ChangeTransaction;
 import com.linkedin.metadata.timeline.data.SemanticChangeType;
+import jakarta.json.JsonPatch;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/EditableDatasetPropertiesChangeEventGenerator.java b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/EditableDatasetPropertiesChangeEventGenerator.java
index 4b112b15792fea..3dee36628b731b 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/EditableDatasetPropertiesChangeEventGenerator.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/EditableDatasetPropertiesChangeEventGenerator.java
@@ -3,7 +3,6 @@
 import static com.linkedin.metadata.Constants.*;
 
 import com.datahub.util.RecordUtils;
-import com.github.fge.jsonpatch.JsonPatch;
 import com.google.common.collect.ImmutableMap;
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.urn.Urn;
@@ -14,6 +13,7 @@
 import com.linkedin.metadata.timeline.data.ChangeOperation;
 import com.linkedin.metadata.timeline.data.ChangeTransaction;
 import com.linkedin.metadata.timeline.data.SemanticChangeType;
+import jakarta.json.JsonPatch;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/EditableSchemaMetadataChangeEventGenerator.java b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/EditableSchemaMetadataChangeEventGenerator.java
index 4850fde426f002..f244053e8a1f10 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/EditableSchemaMetadataChangeEventGenerator.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/EditableSchemaMetadataChangeEventGenerator.java
@@ -4,7 +4,6 @@
 import static com.linkedin.metadata.timeline.eventgenerator.ChangeEventGeneratorUtils.*;
 
 import com.datahub.util.RecordUtils;
-import com.github.fge.jsonpatch.JsonPatch;
 import com.google.common.collect.ImmutableMap;
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.GlobalTags;
@@ -20,6 +19,7 @@
 import com.linkedin.schema.EditableSchemaFieldInfo;
 import com.linkedin.schema.EditableSchemaFieldInfoArray;
 import com.linkedin.schema.EditableSchemaMetadata;
+import jakarta.json.JsonPatch;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/EntityChangeEventGenerator.java b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/EntityChangeEventGenerator.java
index ff6361981f5100..0afb06a5095f05 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/EntityChangeEventGenerator.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/EntityChangeEventGenerator.java
@@ -1,6 +1,5 @@
 package com.linkedin.metadata.timeline.eventgenerator;
 
-import com.github.fge.jsonpatch.JsonPatch;
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.data.template.RecordTemplate;
@@ -8,6 +7,7 @@
 import com.linkedin.metadata.timeline.data.ChangeCategory;
 import com.linkedin.metadata.timeline.data.ChangeEvent;
 import com.linkedin.metadata.timeline.data.ChangeTransaction;
+import jakarta.json.JsonPatch;
 import java.util.List;
 import javax.annotation.Nonnull;
 
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/GlobalTagsChangeEventGenerator.java b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/GlobalTagsChangeEventGenerator.java
index ef40c5dc81a3c7..a98593750548d3 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/GlobalTagsChangeEventGenerator.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/GlobalTagsChangeEventGenerator.java
@@ -3,7 +3,6 @@
 import static com.linkedin.metadata.Constants.*;
 
 import com.datahub.util.RecordUtils;
-import com.github.fge.jsonpatch.JsonPatch;
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.GlobalTags;
 import com.linkedin.common.TagAssociation;
@@ -16,6 +15,7 @@
 import com.linkedin.metadata.timeline.data.ChangeTransaction;
 import com.linkedin.metadata.timeline.data.SemanticChangeType;
 import com.linkedin.metadata.timeline.data.entity.TagChangeEvent;
+import jakarta.json.JsonPatch;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/GlossaryTermInfoChangeEventGenerator.java b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/GlossaryTermInfoChangeEventGenerator.java
index eb002a9a83ceab..8b6ae1f4e7ef00 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/GlossaryTermInfoChangeEventGenerator.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/GlossaryTermInfoChangeEventGenerator.java
@@ -4,7 +4,6 @@
 import static com.linkedin.metadata.timeline.eventgenerator.EditableDatasetPropertiesChangeEventGenerator.*;
 
 import com.datahub.util.RecordUtils;
-import com.github.fge.jsonpatch.JsonPatch;
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.glossary.GlossaryTermInfo;
@@ -14,6 +13,7 @@
 import com.linkedin.metadata.timeline.data.ChangeOperation;
 import com.linkedin.metadata.timeline.data.ChangeTransaction;
 import com.linkedin.metadata.timeline.data.SemanticChangeType;
+import jakarta.json.JsonPatch;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/GlossaryTermsChangeEventGenerator.java b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/GlossaryTermsChangeEventGenerator.java
index 6e56a7e7bbeb17..4e2110a6e35c14 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/GlossaryTermsChangeEventGenerator.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/GlossaryTermsChangeEventGenerator.java
@@ -3,7 +3,6 @@
 import static com.linkedin.metadata.Constants.*;
 
 import com.datahub.util.RecordUtils;
-import com.github.fge.jsonpatch.JsonPatch;
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.GlossaryTermAssociation;
 import com.linkedin.common.GlossaryTermAssociationArray;
@@ -16,6 +15,7 @@
 import com.linkedin.metadata.timeline.data.ChangeTransaction;
 import com.linkedin.metadata.timeline.data.SemanticChangeType;
 import com.linkedin.metadata.timeline.data.entity.GlossaryTermChangeEvent;
+import jakarta.json.JsonPatch;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/InstitutionalMemoryChangeEventGenerator.java b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/InstitutionalMemoryChangeEventGenerator.java
index bf3ff3293d2a21..6d5ff2abadf014 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/InstitutionalMemoryChangeEventGenerator.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/InstitutionalMemoryChangeEventGenerator.java
@@ -3,7 +3,6 @@
 import static com.linkedin.metadata.Constants.*;
 
 import com.datahub.util.RecordUtils;
-import com.github.fge.jsonpatch.JsonPatch;
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.InstitutionalMemory;
 import com.linkedin.common.InstitutionalMemoryMetadata;
@@ -16,6 +15,7 @@
 import com.linkedin.metadata.timeline.data.ChangeOperation;
 import com.linkedin.metadata.timeline.data.ChangeTransaction;
 import com.linkedin.metadata.timeline.data.SemanticChangeType;
+import jakarta.json.JsonPatch;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/OwnershipChangeEventGenerator.java b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/OwnershipChangeEventGenerator.java
index b32958508cf240..3a66d5d8f016da 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/OwnershipChangeEventGenerator.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/OwnershipChangeEventGenerator.java
@@ -3,7 +3,6 @@
 import static com.linkedin.metadata.Constants.*;
 
 import com.datahub.util.RecordUtils;
-import com.github.fge.jsonpatch.JsonPatch;
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.Owner;
 import com.linkedin.common.OwnerArray;
@@ -16,6 +15,7 @@
 import com.linkedin.metadata.timeline.data.ChangeTransaction;
 import com.linkedin.metadata.timeline.data.SemanticChangeType;
 import com.linkedin.metadata.timeline.data.entity.OwnerChangeEvent;
+import jakarta.json.JsonPatch;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -62,6 +62,7 @@ private static List<ChangeEvent> computeDiffs(
                           entityUrn))
                   .ownerUrn(targetOwner.getOwner())
                   .ownerType(targetOwner.getType())
+                  .ownerTypeUrn(targetOwner.getTypeUrn())
                   .auditStamp(auditStamp)
                   .build());
         }
@@ -84,6 +85,7 @@ private static List<ChangeEvent> computeDiffs(
                         entityUrn))
                 .ownerUrn(baseOwner.getOwner())
                 .ownerType(baseOwner.getType())
+                .ownerTypeUrn(baseOwner.getTypeUrn())
                 .auditStamp(auditStamp)
                 .build());
         ++baseOwnerIdx;
@@ -104,6 +106,7 @@ private static List<ChangeEvent> computeDiffs(
                         entityUrn))
                 .ownerUrn(targetOwner.getOwner())
                 .ownerType(targetOwner.getType())
+                .ownerTypeUrn(targetOwner.getTypeUrn())
                 .auditStamp(auditStamp)
                 .build());
         ++targetOwnerIdx;
@@ -128,6 +131,7 @@ private static List<ChangeEvent> computeDiffs(
                       entityUrn))
               .ownerUrn(baseOwner.getOwner())
               .ownerType(baseOwner.getType())
+              .ownerTypeUrn(baseOwner.getTypeUrn())
               .auditStamp(auditStamp)
               .build());
       ++baseOwnerIdx;
@@ -150,6 +154,7 @@ private static List<ChangeEvent> computeDiffs(
                       entityUrn))
               .ownerUrn(targetOwner.getOwner())
               .ownerType(targetOwner.getType())
+              .ownerTypeUrn(targetOwner.getTypeUrn())
               .auditStamp(auditStamp)
               .build());
       ++targetOwnerIdx;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/SchemaMetadataChangeEventGenerator.java b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/SchemaMetadataChangeEventGenerator.java
index 483ab806c84622..0ab55893d48d2a 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/SchemaMetadataChangeEventGenerator.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/SchemaMetadataChangeEventGenerator.java
@@ -3,7 +3,6 @@
 import static com.linkedin.metadata.timeline.eventgenerator.ChangeEventGeneratorUtils.*;
 
 import com.datahub.util.RecordUtils;
-import com.github.fge.jsonpatch.JsonPatch;
 import com.google.common.collect.ImmutableMap;
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.urn.DatasetUrn;
@@ -19,13 +18,9 @@
 import com.linkedin.schema.SchemaField;
 import com.linkedin.schema.SchemaFieldArray;
 import com.linkedin.schema.SchemaMetadata;
+import jakarta.json.JsonPatch;
 import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -208,160 +203,168 @@ private static List<ChangeEvent> getFieldPropertyChangeEvents(
     return propChangeEvents;
   }
 
-  // TODO: This could use some cleanup, lots of repeated logic and tenuous conditionals
+  private static Map<String, SchemaField> getSchemaFieldMap(SchemaFieldArray fieldArray) {
+    Map<String, SchemaField> fieldMap = new HashMap<>();
+    fieldArray.forEach(schemaField -> fieldMap.put(schemaField.getFieldPath(), schemaField));
+    return fieldMap;
+  }
+
+  private static void processFieldPathDataTypeChange(
+      String baseFieldPath,
+      Urn datasetUrn,
+      ChangeCategory changeCategory,
+      AuditStamp auditStamp,
+      Map<String, SchemaField> baseFieldMap,
+      Map<String, SchemaField> targetFieldMap,
+      Set<String> processedBaseFields,
+      Set<String> processedTargetFields,
+      List<ChangeEvent> changeEvents) {
+    SchemaField curBaseField = baseFieldMap.get(baseFieldPath);
+    if (!targetFieldMap.containsKey(baseFieldPath)) {
+      return;
+    }
+    processedBaseFields.add(baseFieldPath);
+    processedTargetFields.add(baseFieldPath);
+    SchemaField curTargetField = targetFieldMap.get(baseFieldPath);
+    if (!curBaseField.getNativeDataType().equals(curTargetField.getNativeDataType())) {
+      // Non-backward compatible change + Major version bump
+      if (ChangeCategory.TECHNICAL_SCHEMA.equals(changeCategory)) {
+        changeEvents.add(
+            DatasetSchemaFieldChangeEvent.schemaFieldChangeEventBuilder()
+                .category(ChangeCategory.TECHNICAL_SCHEMA)
+                .modifier(getSchemaFieldUrn(datasetUrn, curBaseField).toString())
+                .entityUrn(datasetUrn.toString())
+                .operation(ChangeOperation.MODIFY)
+                .semVerChange(SemanticChangeType.MAJOR)
+                .description(
+                    String.format(
+                        "%s native datatype of the field '%s' changed from '%s' to '%s'.",
+                        BACKWARDS_INCOMPATIBLE_DESC,
+                        getFieldPathV1(curTargetField),
+                        curBaseField.getNativeDataType(),
+                        curTargetField.getNativeDataType()))
+                .fieldPath(curBaseField.getFieldPath())
+                .fieldUrn(getSchemaFieldUrn(datasetUrn, curBaseField))
+                .nullable(curBaseField.isNullable())
+                .auditStamp(auditStamp)
+                .build());
+      }
+      List<ChangeEvent> propChangeEvents =
+          getFieldPropertyChangeEvents(
+              curBaseField, curTargetField, datasetUrn, changeCategory, auditStamp);
+      changeEvents.addAll(propChangeEvents);
+    }
+    List<ChangeEvent> propChangeEvents =
+        getFieldPropertyChangeEvents(
+            curBaseField, curTargetField, datasetUrn, changeCategory, auditStamp);
+    changeEvents.addAll(propChangeEvents);
+  }
+
+  private static void processFieldPathRename(
+      String baseFieldPath,
+      Urn datasetUrn,
+      ChangeCategory changeCategory,
+      AuditStamp auditStamp,
+      Map<String, SchemaField> baseFieldMap,
+      Map<String, SchemaField> targetFieldMap,
+      Set<String> processedBaseFields,
+      Set<String> processedTargetFields,
+      List<ChangeEvent> changeEvents,
+      Set<SchemaField> renamedFields) {
+
+    List<SchemaField> nonProcessedTargetSchemaFields = new ArrayList<>();
+    targetFieldMap.forEach(
+        (s, schemaField) -> {
+          if (!processedTargetFields.contains(s)) {
+            nonProcessedTargetSchemaFields.add(schemaField);
+          }
+        });
+
+    SchemaField curBaseField = baseFieldMap.get(baseFieldPath);
+    SchemaField renamedField =
+        findRenamedField(curBaseField, nonProcessedTargetSchemaFields, renamedFields);
+    processedBaseFields.add(baseFieldPath);
+    if (renamedField == null) {
+      processRemoval(changeCategory, changeEvents, datasetUrn, curBaseField, auditStamp);
+    } else {
+      if (!ChangeCategory.TECHNICAL_SCHEMA.equals(changeCategory)) {
+        return;
+      }
+      processedTargetFields.add(renamedField.getFieldPath());
+      changeEvents.add(generateRenameEvent(datasetUrn, curBaseField, renamedField, auditStamp));
+      List<ChangeEvent> propChangeEvents =
+          getFieldPropertyChangeEvents(
+              curBaseField, renamedField, datasetUrn, changeCategory, auditStamp);
+      changeEvents.addAll(propChangeEvents);
+    }
+  }
+
+  private static Set<String> getNonProcessedFields(
+      Map<String, SchemaField> fieldMap, Set<String> processedFields) {
+    Set<String> nonProcessedFields = new HashSet<>(fieldMap.keySet());
+    nonProcessedFields.removeAll(processedFields);
+    return nonProcessedFields;
+  }
+
   private static List<ChangeEvent> computeDiffs(
       SchemaMetadata baseSchema,
       SchemaMetadata targetSchema,
       Urn datasetUrn,
       ChangeCategory changeCategory,
       AuditStamp auditStamp) {
-    // Sort the fields by their field path.
-    if (baseSchema != null) {
-      sortFieldsByPath(baseSchema);
-    }
-    if (targetSchema != null) {
-      sortFieldsByPath(targetSchema);
-    }
-
-    // Performs ordinal based diff, primarily based on fixed field ordinals and their types.
     SchemaFieldArray baseFields =
         (baseSchema != null ? baseSchema.getFields() : new SchemaFieldArray());
     SchemaFieldArray targetFields =
         targetSchema != null ? targetSchema.getFields() : new SchemaFieldArray();
-    int baseFieldIdx = 0;
-    int targetFieldIdx = 0;
+
+    Map<String, SchemaField> baseFieldMap = getSchemaFieldMap(baseFields);
+    Map<String, SchemaField> targetFieldMap = getSchemaFieldMap(targetFields);
+
+    Set<String> processedBaseFields = new HashSet<>();
+    Set<String> processedTargetFields = new HashSet<>();
+
     List<ChangeEvent> changeEvents = new ArrayList<>();
     Set<SchemaField> renamedFields = new HashSet<>();
-    while (baseFieldIdx < baseFields.size() && targetFieldIdx < targetFields.size()) {
-      SchemaField curBaseField = baseFields.get(baseFieldIdx);
-      SchemaField curTargetField = targetFields.get(targetFieldIdx);
-      // TODO: Re-evaluate ordinal processing?
-      int comparison = curBaseField.getFieldPath().compareTo(curTargetField.getFieldPath());
-      if (renamedFields.contains(curBaseField)) {
-        baseFieldIdx++;
-      } else if (renamedFields.contains(curTargetField)) {
-        targetFieldIdx++;
-      } else if (comparison == 0) {
-        // This is the same field. Check for change events from property changes.
-        if (!curBaseField.getNativeDataType().equals(curTargetField.getNativeDataType())) {
-          // Non-backward compatible change + Major version bump
-          if (ChangeCategory.TECHNICAL_SCHEMA.equals(changeCategory)) {
-            changeEvents.add(
-                DatasetSchemaFieldChangeEvent.schemaFieldChangeEventBuilder()
-                    .category(ChangeCategory.TECHNICAL_SCHEMA)
-                    .modifier(getSchemaFieldUrn(datasetUrn, curBaseField).toString())
-                    .entityUrn(datasetUrn.toString())
-                    .operation(ChangeOperation.MODIFY)
-                    .semVerChange(SemanticChangeType.MAJOR)
-                    .description(
-                        String.format(
-                            "%s native datatype of the field '%s' changed from '%s' to '%s'.",
-                            BACKWARDS_INCOMPATIBLE_DESC,
-                            getFieldPathV1(curTargetField),
-                            curBaseField.getNativeDataType(),
-                            curTargetField.getNativeDataType()))
-                    .fieldPath(curBaseField.getFieldPath())
-                    .fieldUrn(getSchemaFieldUrn(datasetUrn, curBaseField))
-                    .nullable(curBaseField.isNullable())
-                    .auditStamp(auditStamp)
-                    .build());
-          }
-          List<ChangeEvent> propChangeEvents =
-              getFieldPropertyChangeEvents(
-                  curBaseField, curTargetField, datasetUrn, changeCategory, auditStamp);
-          changeEvents.addAll(propChangeEvents);
-          ++baseFieldIdx;
-          ++targetFieldIdx;
-        }
-        List<ChangeEvent> propChangeEvents =
-            getFieldPropertyChangeEvents(
-                curBaseField, curTargetField, datasetUrn, changeCategory, auditStamp);
-        changeEvents.addAll(propChangeEvents);
-        ++baseFieldIdx;
-        ++targetFieldIdx;
-      } else if (comparison < 0) {
-        // Base Field was removed or was renamed. Non-backward compatible change + Major version
-        // bump
-        // Check for rename, if rename coincides with other modifications we assume drop/add.
-        // Assumes that two different fields on the same schema would not have the same description,
-        // terms,
-        // or tags and share the same type
-        SchemaField renamedField =
-            findRenamedField(
-                curBaseField,
-                targetFields.subList(targetFieldIdx, targetFields.size()),
-                renamedFields);
-        if (renamedField == null) {
-          processRemoval(changeCategory, changeEvents, datasetUrn, curBaseField, auditStamp);
-          ++baseFieldIdx;
-        } else {
-          changeEvents.add(generateRenameEvent(datasetUrn, curBaseField, renamedField, auditStamp));
-          List<ChangeEvent> propChangeEvents =
-              getFieldPropertyChangeEvents(
-                  curBaseField, curTargetField, datasetUrn, changeCategory, auditStamp);
-          changeEvents.addAll(propChangeEvents);
-          ++baseFieldIdx;
-          renamedFields.add(renamedField);
-        }
-      } else {
-        // The targetField got added or a renaming occurred. Forward & backwards compatible change +
-        // minor version bump.
-        SchemaField renamedField =
-            findRenamedField(
-                curTargetField, baseFields.subList(baseFieldIdx, baseFields.size()), renamedFields);
-        if (renamedField == null) {
-          processAdd(changeCategory, changeEvents, datasetUrn, curTargetField, auditStamp);
-          ++targetFieldIdx;
-        } else {
-          changeEvents.add(
-              generateRenameEvent(datasetUrn, renamedField, curTargetField, auditStamp));
-          List<ChangeEvent> propChangeEvents =
-              getFieldPropertyChangeEvents(
-                  curBaseField, curTargetField, datasetUrn, changeCategory, auditStamp);
-          changeEvents.addAll(propChangeEvents);
-          ++targetFieldIdx;
-          renamedFields.add(renamedField);
-        }
-      }
-    }
-    while (baseFieldIdx < baseFields.size()) {
-      // Handle removed fields. Non-backward compatible change + major version bump
-      SchemaField baseField = baseFields.get(baseFieldIdx);
-      if (!renamedFields.contains(baseField)) {
-        processRemoval(changeCategory, changeEvents, datasetUrn, baseField, auditStamp);
-      }
-      ++baseFieldIdx;
+
+    for (String baseFieldPath : baseFieldMap.keySet()) {
+      processFieldPathDataTypeChange(
+          baseFieldPath,
+          datasetUrn,
+          changeCategory,
+          auditStamp,
+          baseFieldMap,
+          targetFieldMap,
+          processedBaseFields,
+          processedTargetFields,
+          changeEvents);
     }
-    while (targetFieldIdx < targetFields.size()) {
-      // Newly added fields. Forwards & backwards compatible change + minor version bump.
-      SchemaField targetField = targetFields.get(targetFieldIdx);
-      if (!renamedFields.contains(targetField)) {
-        processAdd(changeCategory, changeEvents, datasetUrn, targetField, auditStamp);
-      }
-      targetFieldIdx++;
+    Set<String> nonProcessedBaseFields = getNonProcessedFields(baseFieldMap, processedBaseFields);
+    for (String baseFieldPath : nonProcessedBaseFields) {
+      processFieldPathRename(
+          baseFieldPath,
+          datasetUrn,
+          changeCategory,
+          auditStamp,
+          baseFieldMap,
+          targetFieldMap,
+          processedBaseFields,
+          processedTargetFields,
+          changeEvents,
+          renamedFields);
     }
 
-    // Handle primary key constraint change events.
-    List<ChangeEvent> primaryKeyChangeEvents =
-        getPrimaryKeyChangeEvents(baseSchema, targetSchema, datasetUrn, auditStamp);
-    changeEvents.addAll(primaryKeyChangeEvents);
+    Set<String> nonProcessedTargetFields =
+        getNonProcessedFields(targetFieldMap, processedTargetFields);
 
-    // Handle foreign key constraint change events.
-    List<ChangeEvent> foreignKeyChangeEvents = getForeignKeyChangeEvents();
-    changeEvents.addAll(foreignKeyChangeEvents);
+    nonProcessedTargetFields.forEach(
+        fieldPath -> {
+          SchemaField curTargetField = targetFieldMap.get(fieldPath);
+          processAdd(changeCategory, changeEvents, datasetUrn, curTargetField, auditStamp);
+        });
 
     return changeEvents;
   }
 
-  private static void sortFieldsByPath(SchemaMetadata schemaMetadata) {
-    if (schemaMetadata == null) {
-      throw new IllegalArgumentException("SchemaMetadata should not be null");
-    }
-    List<SchemaField> schemaFields = new ArrayList<>(schemaMetadata.getFields());
-    schemaFields.sort(Comparator.comparing(SchemaField::getFieldPath));
-    schemaMetadata.setFields(new SchemaFieldArray(schemaFields));
-  }
-
   private static SchemaField findRenamedField(
       SchemaField curField, List<SchemaField> targetFields, Set<SchemaField> renamedFields) {
     return targetFields.stream()
@@ -391,7 +394,14 @@ private static boolean parentFieldsMatch(SchemaField curField, SchemaField schem
   }
 
   private static boolean descriptionsMatch(SchemaField curField, SchemaField schemaField) {
-    return StringUtils.isNotBlank(curField.getDescription())
+    if (StringUtils.isBlank(curField.getDescription())
+        && StringUtils.isBlank(schemaField.getDescription())) {
+      return true;
+    }
+    return !(StringUtils.isBlank(curField.getDescription())
+            && StringUtils.isNotBlank(schemaField.getDescription()))
+        && !(StringUtils.isNotBlank(curField.getDescription())
+            && StringUtils.isBlank(schemaField.getDescription()))
         && curField.getDescription().equals(schemaField.getDescription());
   }
 
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeseries/elastic/ElasticSearchTimeseriesAspectService.java b/metadata-io/src/main/java/com/linkedin/metadata/timeseries/elastic/ElasticSearchTimeseriesAspectService.java
index ce4ff53eba91b9..9b4d373d25d8fb 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeseries/elastic/ElasticSearchTimeseriesAspectService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeseries/elastic/ElasticSearchTimeseriesAspectService.java
@@ -551,7 +551,7 @@ public TimeseriesScrollResult scrollAspects(
       @Nonnull String entityName,
       @Nonnull String aspectName,
       @Nullable Filter filter,
-      @Nonnull List<SortCriterion> sortCriterion,
+      @Nonnull List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       int count,
       @Nullable Long startTimeMillis,
@@ -592,7 +592,7 @@ public TimeseriesScrollResult scrollAspects(
             entityName,
             aspectName,
             filterQueryBuilder,
-            sortCriterion,
+            sortCriteria,
             scrollId,
             count);
     int totalCount = (int) response.getHits().getTotalHits().value;
@@ -615,7 +615,7 @@ private SearchResponse executeScrollSearchQuery(
       @Nonnull final String entityName,
       @Nonnull final String aspectName,
       @Nonnull final QueryBuilder query,
-      @Nonnull List<SortCriterion> sortCriterion,
+      @Nonnull List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       final int count) {
 
@@ -631,7 +631,7 @@ private SearchResponse executeScrollSearchQuery(
 
     searchSourceBuilder.size(count);
     searchSourceBuilder.query(query);
-    ESUtils.buildSortOrder(searchSourceBuilder, sortCriterion, List.of(), false);
+    ESUtils.buildSortOrder(searchSourceBuilder, sortCriteria, List.of(), false);
     searchRequest.source(searchSourceBuilder);
     ESUtils.setSearchAfter(searchSourceBuilder, sort, null, null);
 
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeseries/transformer/TimeseriesAspectTransformer.java b/metadata-io/src/main/java/com/linkedin/metadata/timeseries/transformer/TimeseriesAspectTransformer.java
index c0f66acaaca5af..c353e601a31b70 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeseries/transformer/TimeseriesAspectTransformer.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeseries/transformer/TimeseriesAspectTransformer.java
@@ -54,7 +54,8 @@ public static Map<String, JsonNode> transform(
       @Nonnull final Urn urn,
       @Nonnull final RecordTemplate timeseriesAspect,
       @Nonnull final AspectSpec aspectSpec,
-      @Nullable final SystemMetadata systemMetadata)
+      @Nullable final SystemMetadata systemMetadata,
+      @Nonnull final String idHashAlgo)
       throws JsonProcessingException {
     ObjectNode commonDocument = getCommonDocument(urn, timeseriesAspect, systemMetadata);
     Map<String, JsonNode> finalDocuments = new HashMap<>();
@@ -74,7 +75,7 @@ public static Map<String, JsonNode> transform(
     final Map<TimeseriesFieldSpec, List<Object>> timeseriesFieldValueMap =
         FieldExtractor.extractFields(timeseriesAspect, aspectSpec.getTimeseriesFieldSpecs());
     timeseriesFieldValueMap.forEach((k, v) -> setTimeseriesField(document, k, v));
-    finalDocuments.put(getDocId(document, null), document);
+    finalDocuments.put(getDocId(document, null, idHashAlgo), document);
 
     // Create new rows for the member collection fields.
     final Map<TimeseriesFieldCollectionSpec, List<Object>> timeseriesFieldCollectionValueMap =
@@ -83,7 +84,7 @@ public static Map<String, JsonNode> transform(
     timeseriesFieldCollectionValueMap.forEach(
         (key, values) ->
             finalDocuments.putAll(
-                getTimeseriesFieldCollectionDocuments(key, values, commonDocument)));
+                getTimeseriesFieldCollectionDocuments(key, values, commonDocument, idHashAlgo)));
     return finalDocuments;
   }
 
@@ -216,12 +217,13 @@ private static void setTimeseriesField(
   private static Map<String, JsonNode> getTimeseriesFieldCollectionDocuments(
       final TimeseriesFieldCollectionSpec fieldSpec,
       final List<Object> values,
-      final ObjectNode commonDocument) {
+      final ObjectNode commonDocument,
+      @Nonnull final String idHashAlgo) {
     return values.stream()
         .map(value -> getTimeseriesFieldCollectionDocument(fieldSpec, value, commonDocument))
         .collect(
             Collectors.toMap(
-                keyDocPair -> getDocId(keyDocPair.getSecond(), keyDocPair.getFirst()),
+                keyDocPair -> getDocId(keyDocPair.getSecond(), keyDocPair.getFirst(), idHashAlgo),
                 Pair::getSecond));
   }
 
@@ -257,7 +259,9 @@ private static Pair<String, ObjectNode> getTimeseriesFieldCollectionDocument(
         finalDocument);
   }
 
-  private static String getDocId(@Nonnull JsonNode document, String collectionId) {
+  private static String getDocId(
+      @Nonnull JsonNode document, String collectionId, @Nonnull String idHashAlgo)
+      throws IllegalArgumentException {
     String docId = document.get(MappingsBuilder.TIMESTAMP_MILLIS_FIELD).toString();
     JsonNode eventGranularity = document.get(MappingsBuilder.EVENT_GRANULARITY);
     if (eventGranularity != null) {
@@ -276,6 +280,11 @@ private static String getDocId(@Nonnull JsonNode document, String collectionId)
       docId += partitionSpec.toString();
     }
 
-    return DigestUtils.md5Hex(docId);
+    if (idHashAlgo.equalsIgnoreCase("SHA-256")) {
+      return DigestUtils.sha256Hex(docId);
+    } else if (idHashAlgo.equalsIgnoreCase("MD5")) {
+      return DigestUtils.md5Hex(docId);
+    }
+    throw new IllegalArgumentException("Hash function not handled !");
   }
 }
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/AspectGenerationUtils.java b/metadata-io/src/test/java/com/linkedin/metadata/AspectGenerationUtils.java
index b9a1817f476fba..346a1eef845923 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/AspectGenerationUtils.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/AspectGenerationUtils.java
@@ -1,5 +1,7 @@
 package com.linkedin.metadata;
 
+import static com.linkedin.metadata.utils.SystemMetadataUtils.createDefaultSystemMetadata;
+
 import com.linkedin.chart.ChartInfo;
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.ChangeAuditStamps;
@@ -48,11 +50,10 @@ public static SystemMetadata createSystemMetadata(
       @Nonnull String runId,
       @Nonnull String lastRunId,
       @Nullable String version) {
-    SystemMetadata metadata = new SystemMetadata();
-    metadata.setLastObserved(lastObserved);
-    metadata.setRunId(runId);
+    SystemMetadata metadata = createDefaultSystemMetadata(runId);
     metadata.setLastRunId(lastRunId);
     metadata.setVersion(version, SetMode.IGNORE_NULL);
+    metadata.setLastObserved(lastObserved);
     return metadata;
   }
 
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/EbeanEntityServiceTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/EbeanEntityServiceTest.java
index b9f5984e576678..e8d3c654f6f639 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/entity/EbeanEntityServiceTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/EbeanEntityServiceTest.java
@@ -1,14 +1,19 @@
 package com.linkedin.metadata.entity;
 
+import static com.linkedin.metadata.Constants.CORP_USER_ENTITY_NAME;
+import static com.linkedin.metadata.Constants.STATUS_ASPECT_NAME;
 import static org.mockito.Mockito.mock;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
 import com.linkedin.common.AuditStamp;
+import com.linkedin.common.Status;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.data.template.DataTemplateUtil;
 import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.entity.EnvelopedAspect;
 import com.linkedin.identity.CorpUserInfo;
 import com.linkedin.metadata.AspectGenerationUtils;
 import com.linkedin.metadata.Constants;
@@ -36,6 +41,8 @@
 import io.ebean.TxScope;
 import io.ebean.annotation.TxIsolation;
 import java.net.URISyntaxException;
+import java.sql.Timestamp;
+import java.time.Instant;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -292,6 +299,139 @@ public void testNestedTransactions() throws AssertionError {
     System.out.println("done");
   }
 
+  @Test
+  public void testSystemMetadataDuplicateKey() throws Exception {
+    Urn entityUrn = UrnUtils.getUrn("urn:li:corpuser:duplicateKeyTest");
+    SystemMetadata systemMetadata = AspectGenerationUtils.createSystemMetadata();
+    ChangeItemImpl item =
+        ChangeItemImpl.builder()
+            .urn(entityUrn)
+            .aspectName(STATUS_ASPECT_NAME)
+            .recordTemplate(new Status().setRemoved(true))
+            .systemMetadata(systemMetadata)
+            .auditStamp(TEST_AUDIT_STAMP)
+            .build(TestOperationContexts.emptyAspectRetriever(null));
+    _entityServiceImpl.ingestAspects(
+        opContext,
+        AspectsBatchImpl.builder()
+            .retrieverContext(opContext.getRetrieverContext().get())
+            .items(List.of(item))
+            .build(),
+        false,
+        true);
+
+    // List aspects urns
+    EnvelopedAspect envelopedAspect =
+        _entityServiceImpl.getLatestEnvelopedAspect(
+            opContext, CORP_USER_ENTITY_NAME, entityUrn, STATUS_ASPECT_NAME);
+
+    assertNotNull(envelopedAspect);
+    assertEquals(envelopedAspect.getVersion(), 0L, "Expected version 0");
+    assertEquals(
+        envelopedAspect.getSystemMetadata().getVersion(),
+        "1",
+        "Expected version 0 with systemMeta version 1");
+
+    // Corrupt the version 0 systemMeta
+    try (Transaction transaction =
+        ((EbeanAspectDao) _entityServiceImpl.aspectDao)
+            .getServer()
+            .beginTransaction(TxScope.requiresNew().setIsolation(TxIsolation.REPEATABLE_READ))) {
+      TransactionContext transactionContext = TransactionContext.empty(transaction, 3);
+      _entityServiceImpl.aspectDao.saveAspect(
+          transactionContext,
+          entityUrn.toString(),
+          STATUS_ASPECT_NAME,
+          new Status().setRemoved(false).toString(),
+          entityUrn.toString(),
+          null,
+          Timestamp.from(Instant.now()),
+          systemMetadata.toString(),
+          1,
+          true);
+      transaction.commit();
+    }
+
+    // Run another update
+    _entityServiceImpl.ingestAspects(
+        opContext,
+        AspectsBatchImpl.builder()
+            .retrieverContext(opContext.getRetrieverContext().get())
+            .items(
+                List.of(
+                    ChangeItemImpl.builder()
+                        .urn(entityUrn)
+                        .aspectName(STATUS_ASPECT_NAME)
+                        .recordTemplate(new Status().setRemoved(false))
+                        .systemMetadata(systemMetadata)
+                        .auditStamp(TEST_AUDIT_STAMP)
+                        .build(TestOperationContexts.emptyAspectRetriever(null))))
+            .build(),
+        false,
+        true);
+    EnvelopedAspect envelopedAspect2 =
+        _entityServiceImpl.getLatestEnvelopedAspect(
+            opContext, CORP_USER_ENTITY_NAME, entityUrn, STATUS_ASPECT_NAME);
+
+    assertNotNull(envelopedAspect2);
+    assertEquals(envelopedAspect2.getVersion(), 0L, "Expected version 0");
+    assertEquals(
+        envelopedAspect2.getSystemMetadata().getVersion(),
+        "3",
+        "Expected version 0 with systemMeta version 3 accounting for the the collision");
+  }
+
+  @Test
+  public void testBatchDuplicate() throws Exception {
+    Urn entityUrn = UrnUtils.getUrn("urn:li:corpuser:batchDuplicateTest");
+    SystemMetadata systemMetadata = AspectGenerationUtils.createSystemMetadata();
+    ChangeItemImpl item1 =
+        ChangeItemImpl.builder()
+            .urn(entityUrn)
+            .aspectName(STATUS_ASPECT_NAME)
+            .recordTemplate(new Status().setRemoved(true))
+            .systemMetadata(systemMetadata.copy())
+            .auditStamp(TEST_AUDIT_STAMP)
+            .build(TestOperationContexts.emptyAspectRetriever(null));
+    ChangeItemImpl item2 =
+        ChangeItemImpl.builder()
+            .urn(entityUrn)
+            .aspectName(STATUS_ASPECT_NAME)
+            .recordTemplate(new Status().setRemoved(false))
+            .systemMetadata(systemMetadata.copy())
+            .auditStamp(TEST_AUDIT_STAMP)
+            .build(TestOperationContexts.emptyAspectRetriever(null));
+    _entityServiceImpl.ingestAspects(
+        opContext,
+        AspectsBatchImpl.builder()
+            .retrieverContext(opContext.getRetrieverContext().get())
+            .items(List.of(item1, item2))
+            .build(),
+        false,
+        true);
+
+    // List aspects urns
+    ListUrnsResult batch = _entityServiceImpl.listUrns(opContext, entityUrn.getEntityType(), 0, 2);
+
+    assertEquals(batch.getStart().intValue(), 0);
+    assertEquals(batch.getCount().intValue(), 1);
+    assertEquals(batch.getTotal().intValue(), 1);
+    assertEquals(batch.getEntities().size(), 1);
+    assertEquals(entityUrn.toString(), batch.getEntities().get(0).toString());
+
+    EnvelopedAspect envelopedAspect =
+        _entityServiceImpl.getLatestEnvelopedAspect(
+            opContext, CORP_USER_ENTITY_NAME, entityUrn, STATUS_ASPECT_NAME);
+    assertEquals(
+        envelopedAspect.getSystemMetadata().getVersion(),
+        "2",
+        "Expected version 2 accounting for duplicates");
+    assertEquals(
+        envelopedAspect.getValue().toString(),
+        "{removed=false}",
+        "Expected 2nd item to be the latest");
+  }
+
   @Test
   public void dataGeneratorThreadingTest() {
     DataGenerator dataGenerator = new DataGenerator(opContext, _entityServiceImpl);
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java
index 33598be8fc72b2..53f5ebfe59728e 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java
@@ -602,8 +602,9 @@ public void testReingestLineageAspect() throws Exception {
 
     GenericAspect aspect = GenericRecordUtils.serializeAspect(pairToIngest.get(0).getSecond());
 
+    SystemMetadata initialSystemMetadata = AspectGenerationUtils.createSystemMetadata(1);
     initialChangeLog.setAspect(aspect);
-    initialChangeLog.setSystemMetadata(AspectGenerationUtils.createSystemMetadata(1));
+    initialChangeLog.setSystemMetadata(initialSystemMetadata);
     initialChangeLog.setEntityKeyAspect(
         GenericRecordUtils.serializeAspect(
             EntityKeyUtils.convertUrnToEntityKey(
@@ -620,7 +621,7 @@ public void testReingestLineageAspect() throws Exception {
     restateChangeLog.setSystemMetadata(AspectGenerationUtils.createSystemMetadata(1));
     restateChangeLog.setPreviousAspectValue(aspect);
     restateChangeLog.setPreviousSystemMetadata(
-        simulatePullFromDB(AspectGenerationUtils.createSystemMetadata(1), SystemMetadata.class));
+        simulatePullFromDB(initialSystemMetadata, SystemMetadata.class));
     restateChangeLog.setEntityKeyAspect(
         GenericRecordUtils.serializeAspect(
             EntityKeyUtils.convertUrnToEntityKey(
@@ -2147,6 +2148,43 @@ public void testCreateChangeTypeProposal() {
                 opContext, secondCreateProposal, TEST_AUDIT_STAMP, false));
   }
 
+  @Test
+  public void testExists() throws Exception {
+    Urn existentUrn = UrnUtils.getUrn("urn:li:corpuser:exists");
+    Urn softDeletedUrn = UrnUtils.getUrn("urn:li:corpuser:softDeleted");
+    Urn nonExistentUrn = UrnUtils.getUrn("urn:li:corpuser:nonExistent");
+    Urn noStatusUrn = UrnUtils.getUrn("urn:li:corpuser:noStatus");
+
+    List<Pair<String, RecordTemplate>> pairToIngest = new ArrayList<>();
+    SystemMetadata metadata = AspectGenerationUtils.createSystemMetadata();
+
+    // to ensure existence
+    CorpUserInfo userInfoAspect = AspectGenerationUtils.createCorpUserInfo("email@test.com");
+    pairToIngest.add(getAspectRecordPair(userInfoAspect, CorpUserInfo.class));
+
+    _entityServiceImpl.ingestAspects(
+        opContext, noStatusUrn, pairToIngest, TEST_AUDIT_STAMP, metadata);
+
+    Status statusExistsAspect = new Status().setRemoved(false);
+    pairToIngest.add(getAspectRecordPair(statusExistsAspect, Status.class));
+
+    _entityServiceImpl.ingestAspects(
+        opContext, existentUrn, pairToIngest, TEST_AUDIT_STAMP, metadata);
+
+    Status statusRemovedAspect = new Status().setRemoved(true);
+    pairToIngest.set(1, getAspectRecordPair(statusRemovedAspect, Status.class));
+
+    _entityServiceImpl.ingestAspects(
+        opContext, softDeletedUrn, pairToIngest, TEST_AUDIT_STAMP, metadata);
+
+    Set<Urn> inputUrns = Set.of(existentUrn, softDeletedUrn, nonExistentUrn, noStatusUrn);
+    assertEquals(
+        _entityServiceImpl.exists(opContext, inputUrns, false), Set.of(existentUrn, noStatusUrn));
+    assertEquals(
+        _entityServiceImpl.exists(opContext, inputUrns, true),
+        Set.of(existentUrn, noStatusUrn, softDeletedUrn));
+  }
+
   @Nonnull
   protected com.linkedin.entity.Entity createCorpUserEntity(Urn entityUrn, String email)
       throws Exception {
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/graph/GraphServiceTestBase.java b/metadata-io/src/test/java/com/linkedin/metadata/graph/GraphServiceTestBase.java
index 1aebc48153bbe5..5d9a5079f2a3b3 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/graph/GraphServiceTestBase.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/graph/GraphServiceTestBase.java
@@ -3,6 +3,7 @@
 import static com.linkedin.metadata.search.utils.QueryUtils.EMPTY_FILTER;
 import static com.linkedin.metadata.search.utils.QueryUtils.newFilter;
 import static com.linkedin.metadata.search.utils.QueryUtils.newRelationshipFilter;
+import static io.datahubproject.test.search.SearchTestUtils.getGraphQueryConfiguration;
 import static org.testng.Assert.*;
 
 import com.google.common.collect.ImmutableList;
@@ -272,6 +273,8 @@ public int compare(RelatedEntity left, RelatedEntity right) {
   /** Any source and destination type value. */
   protected static @Nullable List<String> anyType = null;
 
+  protected final GraphQueryConfiguration _graphQueryConfiguration = getGraphQueryConfiguration();
+
   /** Timeout used to test concurrent ops in doTestConcurrentOp. */
   protected Duration getTestConcurrentOpTimeout() {
     return Duration.ofMinutes(1);
@@ -378,8 +381,7 @@ protected GraphService getPopulatedGraphService() throws Exception {
   }
 
   protected GraphService getLineagePopulatedGraphService() throws Exception {
-    return getLineagePopulatedGraphService(
-        GraphQueryConfiguration.testDefaults.isEnableMultiPathSearch());
+    return getLineagePopulatedGraphService(_graphQueryConfiguration.isEnableMultiPathSearch());
   }
 
   protected GraphService getLineagePopulatedGraphService(boolean multiPathSearch) throws Exception {
@@ -1896,15 +1898,24 @@ public void testConcurrentAddEdge() throws Exception {
             allRelationships,
             outgoingRelationships,
             0,
-            nodes * relationshipTypes * 2);
+            edges.size());
 
-    Set<RelatedEntity> expectedRelatedEntities =
-        edges.stream()
-            .map(
-                edge ->
-                    new RelatedEntity(edge.getRelationshipType(), edge.getDestination().toString()))
-            .collect(Collectors.toSet());
-    assertEquals(new HashSet<>(relatedEntities.entities), expectedRelatedEntities);
+    Set<RelatedEntity> expectedRelatedEntities = convertEdgesToRelatedEntities(edges);
+    assertEquals(
+        deduplicateRelatedEntitiesByRelationshipTypeAndDestination(relatedEntities),
+        expectedRelatedEntities);
+  }
+
+  protected Set<RelatedEntity> convertEdgesToRelatedEntities(List<Edge> edges) {
+    return edges.stream()
+        .map(
+            edge -> new RelatedEntity(edge.getRelationshipType(), edge.getDestination().toString()))
+        .collect(Collectors.toSet());
+  }
+
+  protected Set<RelatedEntity> deduplicateRelatedEntitiesByRelationshipTypeAndDestination(
+      RelatedEntitiesResult relatedEntitiesResult) {
+    return Set.copyOf(relatedEntitiesResult.getEntities());
   }
 
   @Test
@@ -1933,8 +1944,10 @@ public void testConcurrentRemoveEdgesFromNode() throws Exception {
             allRelationships,
             outgoingRelationships,
             0,
-            nodes * relationshipTypes * 2);
-    assertEquals(relatedEntities.entities.size(), nodes * relationshipTypes);
+            edges.size());
+    assertEquals(
+        deduplicateRelatedEntitiesByRelationshipTypeAndDestination(relatedEntities).size(),
+        nodes * relationshipTypes);
 
     // delete all edges concurrently
     Stream<Runnable> operations =
@@ -1992,8 +2005,10 @@ public void testConcurrentRemoveNodes() throws Exception {
             allRelationships,
             outgoingRelationships,
             0,
-            nodes * relationshipTypes * 2);
-    assertEquals(relatedEntities.entities.size(), nodes * relationshipTypes);
+            edges.size());
+    assertEquals(
+        deduplicateRelatedEntitiesByRelationshipTypeAndDestination(relatedEntities).size(),
+        nodes * relationshipTypes);
 
     // remove all nodes concurrently
     // nodes will be removed multiple times
@@ -2138,30 +2153,20 @@ public void testHighlyConnectedGraphWalk() throws Exception {
     doTestConcurrentOp(operations);
     syncAfterWrite();
 
-    Set<RelatedEntity> expectedRelatedEntities =
-        edges.stream()
-            .map(
-                edge ->
-                    new RelatedEntity(edge.getRelationshipType(), edge.getDestination().toString()))
-            .collect(Collectors.toSet());
-    RelatedEntitiesResult relatedEntities = null;
-    for (int i = 0; i < 3; i++) {
-      relatedEntities =
-          service.findRelatedEntities(
-              null,
-              EMPTY_FILTER,
-              null,
-              EMPTY_FILTER,
-              allRelationships,
-              outgoingRelationships,
-              0,
-              400);
-      if (!new HashSet<>(relatedEntities.getEntities()).equals(expectedRelatedEntities)) {
-        // Sleep up to 6 seconds in case Elastic needs to catch up
-        Thread.sleep(2000);
-      }
-    }
-    assertEquals(new HashSet<>(relatedEntities.getEntities()), expectedRelatedEntities);
+    Set<RelatedEntity> expectedRelatedEntities = convertEdgesToRelatedEntities(edges);
+    RelatedEntitiesResult relatedEntities =
+        service.findRelatedEntities(
+            null,
+            EMPTY_FILTER,
+            null,
+            EMPTY_FILTER,
+            allRelationships,
+            outgoingRelationships,
+            0,
+            edges.size());
+    assertEquals(
+        deduplicateRelatedEntitiesByRelationshipTypeAndDestination(relatedEntities),
+        expectedRelatedEntities);
 
     Urn root = dataset1Urn;
     EntityLineageResult lineageResult =
@@ -2191,7 +2196,7 @@ public void testHighlyConnectedGraphWalk() throws Exception {
         relationships.stream()
             .flatMap(relationship -> relationship.getDegrees().stream())
             .reduce(0, Math::max);
-    assertTrue(maxDegree > 1);
+    assertTrue(maxDegree >= 1);
 
     EntityLineageResult lineageResultMulti =
         getGraphService(true)
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphServiceTest.java b/metadata-io/src/test/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphServiceTest.java
index 08c19bf8f52887..7513feb30d496b 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphServiceTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphServiceTest.java
@@ -169,20 +169,6 @@ public void testConcurrentAddEdge() {
         "Neo4jGraphService does not manage to add all edges added concurrently");
   }
 
-  @Test
-  @Override
-  public void testConcurrentRemoveEdgesFromNode() {
-    // https://github.com/datahub-project/datahub/issues/3118
-    throw new SkipException("Neo4jGraphService produces duplicates");
-  }
-
-  @Test
-  @Override
-  public void testConcurrentRemoveNodes() {
-    // https://github.com/datahub-project/datahub/issues/3118
-    throw new SkipException("Neo4jGraphService produces duplicates");
-  }
-
   @Test
   public void testRemoveEdge() throws Exception {
     DatasetUrn datasetUrn =
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/graph/search/SearchGraphServiceTestBase.java b/metadata-io/src/test/java/com/linkedin/metadata/graph/search/SearchGraphServiceTestBase.java
index b4ad5ce61d8f4e..d1a51b1d69b2c3 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/graph/search/SearchGraphServiceTestBase.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/graph/search/SearchGraphServiceTestBase.java
@@ -12,7 +12,6 @@
 import com.linkedin.data.template.SetMode;
 import com.linkedin.metadata.aspect.models.graph.Edge;
 import com.linkedin.metadata.aspect.models.graph.RelatedEntity;
-import com.linkedin.metadata.config.search.GraphQueryConfiguration;
 import com.linkedin.metadata.graph.EntityLineageResult;
 import com.linkedin.metadata.graph.GraphService;
 import com.linkedin.metadata.graph.GraphServiceTestBase;
@@ -41,6 +40,8 @@
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.junit.Assert;
@@ -61,22 +62,21 @@ public abstract class SearchGraphServiceTestBase extends GraphServiceTestBase {
   @Nonnull
   protected abstract ESIndexBuilder getIndexBuilder();
 
-  private final IndexConvention _indexConvention = IndexConventionImpl.NO_PREFIX;
+  private final IndexConvention _indexConvention = IndexConventionImpl.noPrefix("MD5");
   private final String _indexName = _indexConvention.getIndexName(INDEX_NAME);
   private ElasticSearchGraphService _client;
-  private boolean _enableMultiPathSearch =
-      GraphQueryConfiguration.testDefaults.isEnableMultiPathSearch();
 
   private static final String TAG_RELATIONSHIP = "SchemaFieldTaggedWith";
 
   @BeforeClass
   public void setup() {
-    _client = buildService(_enableMultiPathSearch);
+    _client = buildService(_graphQueryConfiguration.isEnableMultiPathSearch());
     _client.reindexAll(Collections.emptySet());
   }
 
   @BeforeMethod
   public void wipe() throws Exception {
+    syncAfterWrite();
     _client.clear();
     syncAfterWrite();
   }
@@ -97,14 +97,10 @@ private ElasticSearchGraphService buildService(boolean enableMultiPathSearch) {
     } catch (EntityRegistryException e) {
       throw new RuntimeException(e);
     }
-    GraphQueryConfiguration configuration = GraphQueryConfiguration.testDefaults;
-    configuration.setEnableMultiPathSearch(enableMultiPathSearch);
+    _graphQueryConfiguration.setEnableMultiPathSearch(enableMultiPathSearch);
     ESGraphQueryDAO readDAO =
         new ESGraphQueryDAO(
-            getSearchClient(),
-            lineageRegistry,
-            _indexConvention,
-            GraphQueryConfiguration.testDefaults);
+            getSearchClient(), lineageRegistry, _indexConvention, _graphQueryConfiguration);
     ESGraphWriteDAO writeDAO = new ESGraphWriteDAO(_indexConvention, getBulkProcessor(), 1);
     return new ElasticSearchGraphService(
         lineageRegistry,
@@ -112,14 +108,14 @@ private ElasticSearchGraphService buildService(boolean enableMultiPathSearch) {
         _indexConvention,
         writeDAO,
         readDAO,
-        getIndexBuilder());
+        getIndexBuilder(),
+        "MD5");
   }
 
   @Override
   @Nonnull
   protected GraphService getGraphService(boolean enableMultiPathSearch) {
-    if (enableMultiPathSearch != _enableMultiPathSearch) {
-      _enableMultiPathSearch = enableMultiPathSearch;
+    if (enableMultiPathSearch != _graphQueryConfiguration.isEnableMultiPathSearch()) {
       _client = buildService(enableMultiPathSearch);
       _client.reindexAll(Collections.emptySet());
     }
@@ -129,7 +125,7 @@ protected GraphService getGraphService(boolean enableMultiPathSearch) {
   @Override
   @Nonnull
   protected GraphService getGraphService() {
-    return getGraphService(GraphQueryConfiguration.testDefaults.isEnableMultiPathSearch());
+    return getGraphService(_graphQueryConfiguration.isEnableMultiPathSearch());
   }
 
   @Override
@@ -305,26 +301,15 @@ public void testRemoveEdge() throws Exception {
     assertEquals(result.getTotal(), 0);
   }
 
-  @Test
-  @Override
-  public void testConcurrentAddEdge() {
-    // https://github.com/datahub-project/datahub/issues/3124
-    throw new SkipException(
-        "This test is flaky for ElasticSearchGraphService, ~5% of the runs fail on a race condition");
-  }
-
-  @Test
-  @Override
-  public void testConcurrentRemoveEdgesFromNode() {
-    // https://github.com/datahub-project/datahub/issues/3118
-    throw new SkipException("ElasticSearchGraphService produces duplicates");
-  }
-
-  @Test
-  @Override
-  public void testConcurrentRemoveNodes() {
-    // https://github.com/datahub-project/datahub/issues/3118
-    throw new SkipException("ElasticSearchGraphService produces duplicates");
+  // ElasticSearchGraphService produces duplicates
+  // https://github.com/datahub-project/datahub/issues/3118
+  protected Set<RelatedEntity> deduplicateRelatedEntitiesByRelationshipTypeAndDestination(
+      RelatedEntitiesResult relatedEntitiesResult) {
+    return relatedEntitiesResult.getEntities().stream()
+        .map(
+            relatedEntity ->
+                new RelatedEntity(relatedEntity.getRelationshipType(), relatedEntity.getUrn()))
+        .collect(Collectors.toSet());
   }
 
   @Test
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/schemafields/sideeffects/SchemaFieldSideEffectTest.java b/metadata-io/src/test/java/com/linkedin/metadata/schemafields/sideeffects/SchemaFieldSideEffectTest.java
new file mode 100644
index 00000000000000..6139776702c715
--- /dev/null
+++ b/metadata-io/src/test/java/com/linkedin/metadata/schemafields/sideeffects/SchemaFieldSideEffectTest.java
@@ -0,0 +1,713 @@
+package com.linkedin.metadata.schemafields.sideeffects;
+
+import static com.linkedin.metadata.Constants.DATASET_ENTITY_NAME;
+import static com.linkedin.metadata.Constants.DATASET_KEY_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.SCHEMA_FIELD_ALIASES_ASPECT;
+import static com.linkedin.metadata.Constants.SCHEMA_FIELD_ENTITY_NAME;
+import static com.linkedin.metadata.Constants.SCHEMA_FIELD_KEY_ASPECT;
+import static com.linkedin.metadata.Constants.SCHEMA_METADATA_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.STATUS_ASPECT_NAME;
+import static org.mockito.ArgumentMatchers.anySet;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+
+import com.linkedin.common.Status;
+import com.linkedin.common.UrnArray;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.data.ByteString;
+import com.linkedin.entity.Aspect;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.aspect.AspectRetriever;
+import com.linkedin.metadata.aspect.batch.MCLItem;
+import com.linkedin.metadata.aspect.batch.MCPItem;
+import com.linkedin.metadata.aspect.plugins.config.AspectPluginConfig;
+import com.linkedin.metadata.entity.SearchRetriever;
+import com.linkedin.metadata.entity.ebean.batch.ChangeItemImpl;
+import com.linkedin.metadata.entity.ebean.batch.DeleteItemImpl;
+import com.linkedin.metadata.entity.ebean.batch.MCLItemImpl;
+import com.linkedin.metadata.models.AspectSpec;
+import com.linkedin.metadata.models.registry.EntityRegistry;
+import com.linkedin.metadata.timeline.eventgenerator.EntityChangeEventGeneratorRegistry;
+import com.linkedin.metadata.timeline.eventgenerator.EntityKeyChangeEventGenerator;
+import com.linkedin.metadata.timeline.eventgenerator.SchemaMetadataChangeEventGenerator;
+import com.linkedin.metadata.timeline.eventgenerator.StatusChangeEventGenerator;
+import com.linkedin.metadata.utils.AuditStampUtils;
+import com.linkedin.metadata.utils.GenericRecordUtils;
+import com.linkedin.metadata.utils.SystemMetadataUtils;
+import com.linkedin.mxe.MetadataChangeLog;
+import com.linkedin.mxe.MetadataChangeProposal;
+import com.linkedin.mxe.SystemMetadata;
+import com.linkedin.schema.SchemaMetadata;
+import com.linkedin.schemafield.SchemaFieldAliases;
+import com.linkedin.test.metadata.aspect.TestEntityRegistry;
+import com.linkedin.test.metadata.aspect.batch.TestMCP;
+import io.datahubproject.metadata.context.RetrieverContext;
+import io.datahubproject.test.metadata.context.TestOperationContexts;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class SchemaFieldSideEffectTest {
+  private static final EntityRegistry TEST_REGISTRY = new TestEntityRegistry();
+  private static final List<ChangeType> SUPPORTED_CHANGE_TYPES =
+      List.of(
+          ChangeType.CREATE,
+          ChangeType.CREATE_ENTITY,
+          ChangeType.UPSERT,
+          ChangeType.DELETE,
+          ChangeType.RESTATE);
+  private static final Urn TEST_URN =
+      UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD)");
+  private static final AspectPluginConfig TEST_PLUGIN_CONFIG =
+      AspectPluginConfig.builder()
+          .className(SchemaFieldSideEffect.class.getName())
+          .enabled(true)
+          .supportedOperations(
+              SUPPORTED_CHANGE_TYPES.stream()
+                  .map(ChangeType::toString)
+                  .collect(Collectors.toList()))
+          .supportedEntityAspectNames(
+              List.of(
+                  AspectPluginConfig.EntityAspectName.builder()
+                      .entityName(DATASET_ENTITY_NAME)
+                      .aspectName(SCHEMA_METADATA_ASPECT_NAME)
+                      .build(),
+                  AspectPluginConfig.EntityAspectName.builder()
+                      .entityName(DATASET_ENTITY_NAME)
+                      .aspectName(STATUS_ASPECT_NAME)
+                      .build()))
+          .build();
+
+  private AspectRetriever mockAspectRetriever;
+  private RetrieverContext retrieverContext;
+
+  @BeforeMethod
+  public void setup() {
+    mockAspectRetriever = mock(AspectRetriever.class);
+    when(mockAspectRetriever.getEntityRegistry()).thenReturn(TEST_REGISTRY);
+    retrieverContext =
+        RetrieverContext.builder()
+            .searchRetriever(mock(SearchRetriever.class))
+            .aspectRetriever(mockAspectRetriever)
+            .graphRetriever(TestOperationContexts.emptyGraphRetriever)
+            .build();
+  }
+
+  @Test
+  public void schemaMetadataToSchemaFieldKeyTest() {
+    SchemaFieldSideEffect test = new SchemaFieldSideEffect();
+    test.setConfig(TEST_PLUGIN_CONFIG);
+    SchemaMetadata schemaMetadata = getTestSchemaMetadata();
+
+    List<MCPItem> testOutput;
+    for (ChangeType changeType :
+        List.of(ChangeType.CREATE, ChangeType.CREATE_ENTITY, ChangeType.UPSERT)) {
+      // Run test
+      ChangeItemImpl schemaMetadataChangeItem =
+          ChangeItemImpl.builder()
+              .urn(TEST_URN)
+              .aspectName(SCHEMA_METADATA_ASPECT_NAME)
+              .changeType(changeType)
+              .entitySpec(TEST_REGISTRY.getEntitySpec(DATASET_ENTITY_NAME))
+              .aspectSpec(
+                  TEST_REGISTRY
+                      .getEntitySpec(DATASET_ENTITY_NAME)
+                      .getAspectSpec(SCHEMA_METADATA_ASPECT_NAME))
+              .recordTemplate(schemaMetadata)
+              .auditStamp(AuditStampUtils.createDefaultAuditStamp())
+              .build(mockAspectRetriever);
+      testOutput =
+          test.postMCPSideEffect(
+                  List.of(
+                      MCLItemImpl.builder()
+                          .build(
+                              schemaMetadataChangeItem,
+                              null,
+                              null,
+                              retrieverContext.getAspectRetriever())),
+                  retrieverContext)
+              .toList();
+
+      // Verify test
+      switch (changeType) {
+        default -> {
+          assertEquals(
+              testOutput.size(), 2, "Unexpected output items for changeType:" + changeType);
+
+          assertEquals(
+              testOutput,
+              List.of(
+                  ChangeItemImpl.builder()
+                      .urn(
+                          UrnUtils.getUrn(
+                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_id)"))
+                      .aspectName(SCHEMA_FIELD_ALIASES_ASPECT)
+                      .changeType(changeType)
+                      .entitySpec(TEST_REGISTRY.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME))
+                      .aspectSpec(
+                          TEST_REGISTRY
+                              .getEntitySpec(SCHEMA_FIELD_ENTITY_NAME)
+                              .getAspectSpec(SCHEMA_FIELD_ALIASES_ASPECT))
+                      .recordTemplate(
+                          new SchemaFieldAliases()
+                              .setAliases(
+                                  new UrnArray(
+                                      List.of(
+                                          UrnUtils.getUrn(
+                                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_id)")))))
+                      .auditStamp(schemaMetadataChangeItem.getAuditStamp())
+                      .systemMetadata(schemaMetadataChangeItem.getSystemMetadata())
+                      .build(mockAspectRetriever),
+                  ChangeItemImpl.builder()
+                      .urn(
+                          UrnUtils.getUrn(
+                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_name)"))
+                      .aspectName(SCHEMA_FIELD_ALIASES_ASPECT)
+                      .changeType(changeType)
+                      .entitySpec(TEST_REGISTRY.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME))
+                      .aspectSpec(
+                          TEST_REGISTRY
+                              .getEntitySpec(SCHEMA_FIELD_ENTITY_NAME)
+                              .getAspectSpec(SCHEMA_FIELD_ALIASES_ASPECT))
+                      .recordTemplate(
+                          new SchemaFieldAliases()
+                              .setAliases(
+                                  new UrnArray(
+                                      List.of(
+                                          UrnUtils.getUrn(
+                                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_name)")))))
+                      .auditStamp(schemaMetadataChangeItem.getAuditStamp())
+                      .systemMetadata(schemaMetadataChangeItem.getSystemMetadata())
+                      .build(mockAspectRetriever)));
+        }
+      }
+    }
+  }
+
+  @Test
+  public void statusToSchemaFieldStatusTest() {
+    SchemaFieldSideEffect test = new SchemaFieldSideEffect();
+    test.setConfig(TEST_PLUGIN_CONFIG);
+    SchemaMetadata schemaMetadata = getTestSchemaMetadata();
+    Status status = new Status().setRemoved(true);
+
+    // Case 1. schemaMetadata (exists), then status updated
+    reset(mockAspectRetriever);
+    when(mockAspectRetriever.getEntityRegistry()).thenReturn(TEST_REGISTRY);
+    when(mockAspectRetriever.getLatestAspectObjects(
+            Set.of(TEST_URN), Set.of(SCHEMA_METADATA_ASPECT_NAME)))
+        .thenReturn(
+            Map.of(
+                TEST_URN, Map.of(SCHEMA_METADATA_ASPECT_NAME, new Aspect(schemaMetadata.data()))));
+
+    List<MCPItem> testOutput;
+    for (ChangeType changeType : List.of(ChangeType.CREATE, ChangeType.UPSERT)) {
+      // Run Status test
+      ChangeItemImpl statusChangeItem =
+          ChangeItemImpl.builder()
+              .urn(TEST_URN)
+              .aspectName(STATUS_ASPECT_NAME)
+              .changeType(changeType)
+              .entitySpec(TEST_REGISTRY.getEntitySpec(DATASET_ENTITY_NAME))
+              .aspectSpec(
+                  TEST_REGISTRY
+                      .getEntitySpec(DATASET_ENTITY_NAME)
+                      .getAspectSpec(STATUS_ASPECT_NAME))
+              .recordTemplate(status)
+              .auditStamp(AuditStampUtils.createDefaultAuditStamp())
+              .build(mockAspectRetriever);
+      testOutput =
+          test.postMCPSideEffect(
+                  List.of(
+                      MCLItemImpl.builder()
+                          .build(
+                              statusChangeItem, null, null, retrieverContext.getAspectRetriever())),
+                  retrieverContext)
+              .collect(Collectors.toList());
+
+      // Verify test
+      switch (changeType) {
+        default -> {
+          assertEquals(
+              testOutput.size(), 2, "Unexpected output items for changeType:" + changeType);
+
+          assertEquals(
+              testOutput,
+              List.of(
+                  ChangeItemImpl.builder()
+                      .urn(
+                          UrnUtils.getUrn(
+                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_id)"))
+                      .aspectName(STATUS_ASPECT_NAME)
+                      .changeType(changeType)
+                      .entitySpec(TEST_REGISTRY.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME))
+                      .aspectSpec(
+                          TEST_REGISTRY
+                              .getEntitySpec(SCHEMA_FIELD_ENTITY_NAME)
+                              .getAspectSpec(STATUS_ASPECT_NAME))
+                      .recordTemplate(status)
+                      .auditStamp(statusChangeItem.getAuditStamp())
+                      .systemMetadata(statusChangeItem.getSystemMetadata())
+                      .build(mockAspectRetriever),
+                  ChangeItemImpl.builder()
+                      .urn(
+                          UrnUtils.getUrn(
+                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_name)"))
+                      .aspectName(STATUS_ASPECT_NAME)
+                      .changeType(changeType)
+                      .entitySpec(TEST_REGISTRY.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME))
+                      .aspectSpec(
+                          TEST_REGISTRY
+                              .getEntitySpec(SCHEMA_FIELD_ENTITY_NAME)
+                              .getAspectSpec(STATUS_ASPECT_NAME))
+                      .recordTemplate(status)
+                      .auditStamp(statusChangeItem.getAuditStamp())
+                      .systemMetadata(statusChangeItem.getSystemMetadata())
+                      .build(mockAspectRetriever)));
+        }
+      }
+    }
+
+    // Case 2. status (exists), then schemaMetadata
+    reset(mockAspectRetriever);
+    when(mockAspectRetriever.getEntityRegistry()).thenReturn(TEST_REGISTRY);
+    when(mockAspectRetriever.getLatestAspectObjects(Set.of(TEST_URN), Set.of(STATUS_ASPECT_NAME)))
+        .thenReturn(Map.of(TEST_URN, Map.of(STATUS_ASPECT_NAME, new Aspect(status.data()))));
+
+    for (ChangeType changeType : List.of(ChangeType.CREATE, ChangeType.UPSERT)) {
+      // Run test
+      ChangeItemImpl schemaMetadataChangeItem =
+          ChangeItemImpl.builder()
+              .urn(TEST_URN)
+              .aspectName(SCHEMA_METADATA_ASPECT_NAME)
+              .changeType(changeType)
+              .entitySpec(TEST_REGISTRY.getEntitySpec(DATASET_ENTITY_NAME))
+              .aspectSpec(
+                  TEST_REGISTRY
+                      .getEntitySpec(DATASET_ENTITY_NAME)
+                      .getAspectSpec(SCHEMA_METADATA_ASPECT_NAME))
+              .recordTemplate(schemaMetadata)
+              .auditStamp(AuditStampUtils.createDefaultAuditStamp())
+              .build(mockAspectRetriever);
+      testOutput =
+          test.postMCPSideEffect(
+                  List.of(
+                      MCLItemImpl.builder()
+                          .build(
+                              schemaMetadataChangeItem,
+                              null,
+                              null,
+                              retrieverContext.getAspectRetriever())),
+                  retrieverContext)
+              .collect(Collectors.toList());
+
+      // Verify test
+      switch (changeType) {
+        default -> {
+          assertEquals(
+              testOutput.size(), 4, "Unexpected output items for changeType:" + changeType);
+
+          assertEquals(
+              testOutput,
+              List.of(
+                  ChangeItemImpl.builder()
+                      .urn(
+                          UrnUtils.getUrn(
+                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_id)"))
+                      .aspectName(STATUS_ASPECT_NAME)
+                      .changeType(changeType)
+                      .entitySpec(TEST_REGISTRY.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME))
+                      .aspectSpec(
+                          TEST_REGISTRY
+                              .getEntitySpec(SCHEMA_FIELD_ENTITY_NAME)
+                              .getAspectSpec(STATUS_ASPECT_NAME))
+                      .recordTemplate(status)
+                      .auditStamp(schemaMetadataChangeItem.getAuditStamp())
+                      .systemMetadata(schemaMetadataChangeItem.getSystemMetadata())
+                      .build(mockAspectRetriever),
+                  ChangeItemImpl.builder()
+                      .urn(
+                          UrnUtils.getUrn(
+                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_name)"))
+                      .aspectName(STATUS_ASPECT_NAME)
+                      .changeType(changeType)
+                      .entitySpec(TEST_REGISTRY.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME))
+                      .aspectSpec(
+                          TEST_REGISTRY
+                              .getEntitySpec(SCHEMA_FIELD_ENTITY_NAME)
+                              .getAspectSpec(STATUS_ASPECT_NAME))
+                      .recordTemplate(status)
+                      .auditStamp(schemaMetadataChangeItem.getAuditStamp())
+                      .systemMetadata(schemaMetadataChangeItem.getSystemMetadata())
+                      .build(mockAspectRetriever),
+                  ChangeItemImpl.builder()
+                      .urn(
+                          UrnUtils.getUrn(
+                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_id)"))
+                      .aspectName(SCHEMA_FIELD_ALIASES_ASPECT)
+                      .changeType(changeType)
+                      .entitySpec(TEST_REGISTRY.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME))
+                      .aspectSpec(
+                          TEST_REGISTRY
+                              .getEntitySpec(SCHEMA_FIELD_ENTITY_NAME)
+                              .getAspectSpec(SCHEMA_FIELD_ALIASES_ASPECT))
+                      .recordTemplate(
+                          new SchemaFieldAliases()
+                              .setAliases(
+                                  new UrnArray(
+                                      List.of(
+                                          UrnUtils.getUrn(
+                                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_id)")))))
+                      .auditStamp(schemaMetadataChangeItem.getAuditStamp())
+                      .systemMetadata(schemaMetadataChangeItem.getSystemMetadata())
+                      .build(mockAspectRetriever),
+                  ChangeItemImpl.builder()
+                      .urn(
+                          UrnUtils.getUrn(
+                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_name)"))
+                      .aspectName(SCHEMA_FIELD_ALIASES_ASPECT)
+                      .changeType(changeType)
+                      .entitySpec(TEST_REGISTRY.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME))
+                      .aspectSpec(
+                          TEST_REGISTRY
+                              .getEntitySpec(SCHEMA_FIELD_ENTITY_NAME)
+                              .getAspectSpec(SCHEMA_FIELD_ALIASES_ASPECT))
+                      .recordTemplate(
+                          new SchemaFieldAliases()
+                              .setAliases(
+                                  new UrnArray(
+                                      List.of(
+                                          UrnUtils.getUrn(
+                                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_name)")))))
+                      .auditStamp(schemaMetadataChangeItem.getAuditStamp())
+                      .systemMetadata(schemaMetadataChangeItem.getSystemMetadata())
+                      .build(mockAspectRetriever)));
+        }
+      }
+    }
+  }
+
+  @Test
+  public void schemaMetadataDeleteTest() {
+    SchemaFieldSideEffect test = new SchemaFieldSideEffect();
+    test.setConfig(TEST_PLUGIN_CONFIG);
+    SchemaMetadata schemaMetadata = getTestSchemaMetadata();
+
+    // Run test
+    MCLItem schemaMetadataChangeItem =
+        MCLItemImpl.builder()
+            .metadataChangeLog(
+                new MetadataChangeLog()
+                    .setChangeType(ChangeType.DELETE)
+                    .setEntityUrn(TEST_URN)
+                    .setEntityType(DATASET_ENTITY_NAME)
+                    .setAspectName(SCHEMA_METADATA_ASPECT_NAME)
+                    .setPreviousAspectValue(GenericRecordUtils.serializeAspect(schemaMetadata))
+                    .setCreated(AuditStampUtils.createDefaultAuditStamp()))
+            .build(retrieverContext.getAspectRetriever());
+
+    List<MCPItem> testOutput =
+        test.postMCPSideEffect(List.of(schemaMetadataChangeItem), retrieverContext).toList();
+
+    List<MCPItem> expectedEveryAspectPerField = new ArrayList<>();
+    for (String schemaField :
+        List.of(
+            "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_id)",
+            "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_name)")) {
+      for (AspectSpec aspectSpec :
+          TEST_REGISTRY.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME).getAspectSpecs()) {
+        expectedEveryAspectPerField.add(
+            DeleteItemImpl.builder()
+                .urn(UrnUtils.getUrn(schemaField))
+                .aspectName(aspectSpec.getName())
+                .auditStamp(schemaMetadataChangeItem.getAuditStamp())
+                .entitySpec(TEST_REGISTRY.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME))
+                .aspectSpec(aspectSpec)
+                .build(retrieverContext.getAspectRetriever()));
+      }
+    }
+
+    assertEquals(
+        testOutput.size(),
+        expectedEveryAspectPerField.size(),
+        "Unexpected output items for changeType:" + ChangeType.DELETE);
+    assertEquals(
+        testOutput.stream()
+            .filter(item -> item.getAspectName().equals(SCHEMA_FIELD_KEY_ASPECT))
+            .count(),
+        2,
+        "Expected both key aspects");
+
+    assertEquals(testOutput, expectedEveryAspectPerField);
+  }
+
+  @Test
+  public void statusDeleteTest() {
+    SchemaFieldSideEffect test = new SchemaFieldSideEffect();
+    test.setConfig(TEST_PLUGIN_CONFIG);
+    Status status = new Status().setRemoved(false);
+
+    // mock response
+    reset(mockAspectRetriever);
+    when(mockAspectRetriever.getEntityRegistry()).thenReturn(TEST_REGISTRY);
+    when(mockAspectRetriever.getLatestAspectObjects(eq(Set.of(TEST_URN)), anySet()))
+        .thenReturn(
+            Map.of(
+                TEST_URN,
+                Map.of(SCHEMA_METADATA_ASPECT_NAME, new Aspect(getTestSchemaMetadata().data()))));
+
+    // Run test
+    MCLItem statusChangeItem =
+        MCLItemImpl.builder()
+            .metadataChangeLog(
+                new MetadataChangeLog()
+                    .setChangeType(ChangeType.DELETE)
+                    .setEntityUrn(TEST_URN)
+                    .setEntityType(DATASET_ENTITY_NAME)
+                    .setAspectName(STATUS_ASPECT_NAME)
+                    .setPreviousAspectValue(GenericRecordUtils.serializeAspect(status))
+                    .setCreated(AuditStampUtils.createDefaultAuditStamp()))
+            .build(retrieverContext.getAspectRetriever());
+
+    List<MCPItem> testOutput =
+        test.postMCPSideEffect(List.of(statusChangeItem), retrieverContext).toList();
+
+    List<MCPItem> expectedStatusDeletePerField = new ArrayList<>();
+    for (String schemaField :
+        List.of(
+            "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_id)",
+            "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_name)")) {
+      for (AspectSpec aspectSpec :
+          List.of(
+              TEST_REGISTRY
+                  .getEntitySpec(SCHEMA_FIELD_ENTITY_NAME)
+                  .getAspectSpec(STATUS_ASPECT_NAME))) {
+        expectedStatusDeletePerField.add(
+            DeleteItemImpl.builder()
+                .urn(UrnUtils.getUrn(schemaField))
+                .aspectName(aspectSpec.getName())
+                .auditStamp(statusChangeItem.getAuditStamp())
+                .entitySpec(TEST_REGISTRY.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME))
+                .aspectSpec(aspectSpec)
+                .build(retrieverContext.getAspectRetriever()));
+      }
+    }
+
+    assertEquals(
+        testOutput.size(),
+        expectedStatusDeletePerField.size(),
+        "Unexpected output items for changeType:" + ChangeType.DELETE);
+    assertEquals(
+        testOutput.stream().filter(item -> item.getAspectName().equals(STATUS_ASPECT_NAME)).count(),
+        2,
+        "Expected both status aspects");
+    assertEquals(testOutput, expectedStatusDeletePerField);
+  }
+
+  @Test
+  public void schemaMetadataRemovedFieldTest() {
+    SchemaFieldSideEffect test = new SchemaFieldSideEffect();
+    test.setConfig(TEST_PLUGIN_CONFIG);
+    test.setEntityChangeEventGeneratorRegistry(buildEntityChangeEventGeneratorRegistry());
+
+    SchemaMetadata previousSchemaMetadata = getTestSchemaMetadata();
+    SchemaMetadata currentSchemaMetadata = getTestSchemaMetadataWithRemovedField();
+
+    List<MCPItem> testOutput;
+    for (ChangeType changeType : List.of(ChangeType.UPSERT)) {
+      // Run test
+      ChangeItemImpl schemaMetadataChangeItem =
+          ChangeItemImpl.builder()
+              .urn(TEST_URN)
+              .aspectName(SCHEMA_METADATA_ASPECT_NAME)
+              .changeType(changeType)
+              .entitySpec(TEST_REGISTRY.getEntitySpec(DATASET_ENTITY_NAME))
+              .aspectSpec(
+                  TEST_REGISTRY
+                      .getEntitySpec(DATASET_ENTITY_NAME)
+                      .getAspectSpec(SCHEMA_METADATA_ASPECT_NAME))
+              .recordTemplate(currentSchemaMetadata)
+              .auditStamp(AuditStampUtils.createDefaultAuditStamp())
+              .build(mockAspectRetriever);
+      testOutput =
+          test.postMCPSideEffect(
+                  List.of(
+                      MCLItemImpl.builder()
+                          .build(
+                              schemaMetadataChangeItem,
+                              // populate previous item with the now removed field
+                              previousSchemaMetadata,
+                              null,
+                              retrieverContext.getAspectRetriever())),
+                  retrieverContext)
+              .toList();
+
+      // Verify test
+      switch (changeType) {
+        default -> {
+          assertEquals(
+              testOutput.size(), 1, "Unexpected output items for changeType:" + changeType);
+
+          assertEquals(
+              testOutput,
+              List.of(
+                  ChangeItemImpl.builder()
+                      .urn(
+                          UrnUtils.getUrn(
+                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_name)"))
+                      .aspectName(STATUS_ASPECT_NAME)
+                      .changeType(changeType)
+                      .entitySpec(TEST_REGISTRY.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME))
+                      .aspectSpec(
+                          TEST_REGISTRY
+                              .getEntitySpec(SCHEMA_FIELD_ENTITY_NAME)
+                              .getAspectSpec(STATUS_ASPECT_NAME))
+                      .recordTemplate(new Status().setRemoved(true))
+                      .auditStamp(schemaMetadataChangeItem.getAuditStamp())
+                      .systemMetadata(schemaMetadataChangeItem.getSystemMetadata())
+                      .build(mockAspectRetriever)));
+        }
+      }
+    }
+  }
+
+  private static SchemaMetadata getTestSchemaMetadata() {
+    String rawSchemaMetadataString =
+        "{\"foreignKeys\":[{\"name\":\"user id\",\"sourceFields\":[\"urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_id)\"],\"foreignFields\":[\"urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_deleted,PROD),user_id)\"],\"foreignDataset\":\"urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_deleted,PROD)\"}],\"platformSchema\":{\"com.linkedin.schema.KafkaSchema\":{\"documentSchemaType\":\"AVRO\",\"documentSchema\":\"{\\\"type\\\":\\\"record\\\",\\\"name\\\":\\\"SampleHiveSchema\\\",\\\"namespace\\\":\\\"com.linkedin.dataset\\\",\\\"doc\\\":\\\"Sample Hive dataset\\\",\\\"fields\\\":[{\\\"name\\\":\\\"field_foo\\\",\\\"type\\\":[\\\"string\\\"]},{\\\"name\\\":\\\"field_bar\\\",\\\"type\\\":[\\\"boolean\\\"]}]}\"}},\"created\":{\"actor\":\"urn:li:corpuser:jdoe\",\"time\":1674291843000},\"lastModified\":{\"actor\":\"urn:li:corpuser:jdoe\",\"time\":1674291843000},\"fields\":[{\"nullable\":false,\"fieldPath\":\"user_id\",\"description\":\"Id of the user created\",\"isPartOfKey\":false,\"type\":{\"type\":{\"com.linkedin.schema.BooleanType\":{}}},\"recursive\":false,\"nativeDataType\":\"varchar(100)\"},{\"nullable\":false,\"fieldPath\":\"user_name\",\"description\":\"Name of the user who signed up\",\"isPartOfKey\":false,\"type\":{\"type\":{\"com.linkedin.schema.BooleanType\":{}}},\"recursive\":false,\"nativeDataType\":\"boolean\"}],\"schemaName\":\"SampleHiveSchema\",\"version\":0,\"hash\":\"\",\"platform\":\"urn:li:dataPlatform:hive\"}";
+    ByteString rawSchemaMetadataBytes =
+        ByteString.copyString(rawSchemaMetadataString, StandardCharsets.UTF_8);
+    return GenericRecordUtils.deserializeAspect(
+        rawSchemaMetadataBytes, "application/json", SchemaMetadata.class);
+  }
+
+  private static SchemaMetadata getTestSchemaMetadataWithRemovedField() {
+    String rawSchemaMetadataString =
+        "{\"foreignKeys\":[{\"name\":\"user id\",\"sourceFields\":[\"urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_id)\"],\"foreignFields\":[\"urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_deleted,PROD),user_id)\"],\"foreignDataset\":\"urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_deleted,PROD)\"}],\"platformSchema\":{\"com.linkedin.schema.KafkaSchema\":{\"documentSchemaType\":\"AVRO\",\"documentSchema\":\"{\\\"type\\\":\\\"record\\\",\\\"name\\\":\\\"SampleHiveSchema\\\",\\\"namespace\\\":\\\"com.linkedin.dataset\\\",\\\"doc\\\":\\\"Sample Hive dataset\\\",\\\"fields\\\":[{\\\"name\\\":\\\"field_foo\\\",\\\"type\\\":[\\\"string\\\"]},{\\\"name\\\":\\\"field_bar\\\",\\\"type\\\":[\\\"boolean\\\"]}]}\"}},\"created\":{\"actor\":\"urn:li:corpuser:jdoe\",\"time\":1674291843000},\"lastModified\":{\"actor\":\"urn:li:corpuser:jdoe\",\"time\":1674291843000},\"fields\":[{\"nullable\":false,\"fieldPath\":\"user_id\",\"description\":\"Id of the user created\",\"isPartOfKey\":false,\"type\":{\"type\":{\"com.linkedin.schema.BooleanType\":{}}},\"recursive\":false,\"nativeDataType\":\"varchar(100)\"}],\"schemaName\":\"SampleHiveSchema\",\"version\":0,\"hash\":\"\",\"platform\":\"urn:li:dataPlatform:hive\"}";
+    ByteString rawSchemaMetadataBytes =
+        ByteString.copyString(rawSchemaMetadataString, StandardCharsets.UTF_8);
+    return GenericRecordUtils.deserializeAspect(
+        rawSchemaMetadataBytes, "application/json", SchemaMetadata.class);
+  }
+
+  private static EntityChangeEventGeneratorRegistry buildEntityChangeEventGeneratorRegistry() {
+    final EntityChangeEventGeneratorRegistry registry = new EntityChangeEventGeneratorRegistry();
+    registry.register(SCHEMA_METADATA_ASPECT_NAME, new SchemaMetadataChangeEventGenerator());
+
+    // Entity Lifecycle change event generators
+    registry.register(DATASET_KEY_ASPECT_NAME, new EntityKeyChangeEventGenerator<>());
+    registry.register(STATUS_ASPECT_NAME, new StatusChangeEventGenerator());
+
+    return registry;
+  }
+
+  @Test
+  public void schemaMetadataRestateAliasesTest() throws CloneNotSupportedException {
+    SchemaFieldSideEffect test = new SchemaFieldSideEffect();
+    test.setEntityChangeEventGeneratorRegistry(mock(EntityChangeEventGeneratorRegistry.class));
+    test.setConfig(TEST_PLUGIN_CONFIG);
+    SchemaMetadata schemaMetadata = getTestSchemaMetadata();
+
+    List<MCPItem> testOutput;
+    for (ChangeType changeType : List.of(ChangeType.RESTATE)) {
+      // Run test with RESTATE MCP
+      SystemMetadata systemMetadata = SystemMetadataUtils.createDefaultSystemMetadata();
+      MetadataChangeProposal restateMCP =
+          new MetadataChangeProposal()
+              .setEntityUrn(TEST_URN)
+              .setChangeType(changeType)
+              .setAspectName(SCHEMA_METADATA_ASPECT_NAME)
+              .setEntityType(TEST_URN.getEntityType())
+              .setSystemMetadata(systemMetadata)
+              .setAspect(GenericRecordUtils.serializeAspect(schemaMetadata));
+
+      MCPItem schemaMetadataChangeItem =
+          TestMCP.builder()
+              .urn(TEST_URN)
+              .metadataChangeProposal(restateMCP)
+              .entitySpec(TEST_REGISTRY.getEntitySpec(DATASET_ENTITY_NAME))
+              .changeType(changeType)
+              .aspectSpec(
+                  TEST_REGISTRY
+                      .getEntitySpec(DATASET_ENTITY_NAME)
+                      .getAspectSpec(SCHEMA_METADATA_ASPECT_NAME))
+              .auditStamp(AuditStampUtils.createDefaultAuditStamp())
+              .systemMetadata(systemMetadata)
+              .build();
+
+      testOutput =
+          test.postMCPSideEffect(
+                  List.of(
+                      MCLItemImpl.builder()
+                          .build(
+                              schemaMetadataChangeItem,
+                              schemaMetadata,
+                              schemaMetadataChangeItem.getSystemMetadata(),
+                              retrieverContext.getAspectRetriever())),
+                  retrieverContext)
+              .toList();
+
+      // Verify test
+      switch (changeType) {
+        default -> {
+          assertEquals(
+              testOutput.size(), 2, "Unexpected output items for changeType:" + changeType);
+
+          assertEquals(
+              testOutput,
+              List.of(
+                  ChangeItemImpl.builder()
+                      .urn(
+                          UrnUtils.getUrn(
+                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_id)"))
+                      .aspectName(SCHEMA_FIELD_ALIASES_ASPECT)
+                      .changeType(ChangeType.UPSERT)
+                      .entitySpec(TEST_REGISTRY.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME))
+                      .aspectSpec(
+                          TEST_REGISTRY
+                              .getEntitySpec(SCHEMA_FIELD_ENTITY_NAME)
+                              .getAspectSpec(SCHEMA_FIELD_ALIASES_ASPECT))
+                      .recordTemplate(
+                          new SchemaFieldAliases()
+                              .setAliases(
+                                  new UrnArray(
+                                      List.of(
+                                          UrnUtils.getUrn(
+                                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_id)")))))
+                      .auditStamp(schemaMetadataChangeItem.getAuditStamp())
+                      .systemMetadata(systemMetadata)
+                      .build(mockAspectRetriever),
+                  ChangeItemImpl.builder()
+                      .urn(
+                          UrnUtils.getUrn(
+                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_name)"))
+                      .aspectName(SCHEMA_FIELD_ALIASES_ASPECT)
+                      .changeType(ChangeType.UPSERT)
+                      .entitySpec(TEST_REGISTRY.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME))
+                      .aspectSpec(
+                          TEST_REGISTRY
+                              .getEntitySpec(SCHEMA_FIELD_ENTITY_NAME)
+                              .getAspectSpec(SCHEMA_FIELD_ALIASES_ASPECT))
+                      .recordTemplate(
+                          new SchemaFieldAliases()
+                              .setAliases(
+                                  new UrnArray(
+                                      List.of(
+                                          UrnUtils.getUrn(
+                                              "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD),user_name)")))))
+                      .auditStamp(schemaMetadataChangeItem.getAuditStamp())
+                      .systemMetadata(systemMetadata)
+                      .build(mockAspectRetriever)));
+        }
+      }
+    }
+  }
+}
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/LineageServiceTestBase.java b/metadata-io/src/test/java/com/linkedin/metadata/search/LineageServiceTestBase.java
index 3dbbfb2cebc3f3..eee0e0d0f2ec6f 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/LineageServiceTestBase.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/LineageServiceTestBase.java
@@ -27,7 +27,11 @@
 import com.linkedin.data.template.LongMap;
 import com.linkedin.data.template.SetMode;
 import com.linkedin.metadata.TestEntityUtil;
+import com.linkedin.metadata.config.DataHubAppConfiguration;
+import com.linkedin.metadata.config.MetadataChangeProposalConfig;
+import com.linkedin.metadata.config.cache.CacheConfiguration;
 import com.linkedin.metadata.config.cache.EntityDocCountCacheConfiguration;
+import com.linkedin.metadata.config.cache.SearchCacheConfiguration;
 import com.linkedin.metadata.config.cache.SearchLineageCacheConfiguration;
 import com.linkedin.metadata.config.search.SearchConfiguration;
 import com.linkedin.metadata.config.search.custom.CustomSearchConfiguration;
@@ -122,7 +126,11 @@ public void setup() throws RemoteInvocationException, URISyntaxException {
     operationContext =
         TestOperationContexts.systemContextNoSearchAuthorization(
                 new SnapshotEntityRegistry(new Snapshot()),
-                new IndexConventionImpl("lineage_search_service_test"))
+                new IndexConventionImpl(
+                    IndexConventionImpl.IndexConventionConfig.builder()
+                        .prefix("lineage_search_service_test")
+                        .hashIdAlgo("MD5")
+                        .build()))
             .asSession(RequestContext.TEST, Authorizer.EMPTY, TestOperationContexts.TEST_USER_AUTH);
     settingsBuilder = new SettingsBuilder(null);
     elasticSearchService = buildEntitySearchService();
@@ -139,10 +147,25 @@ private void resetService(boolean withCache, boolean withLightingCache) {
         new EntityDocCountCacheConfiguration();
     entityDocCountCacheConfiguration.setTtlSeconds(600L);
 
-    SearchLineageCacheConfiguration searchLineageCacheConfiguration =
-        new SearchLineageCacheConfiguration();
-    searchLineageCacheConfiguration.setTtlSeconds(600L);
-    searchLineageCacheConfiguration.setLightningThreshold(withLightingCache ? -1 : 300);
+    DataHubAppConfiguration appConfig = new DataHubAppConfiguration();
+    appConfig.setCache(new CacheConfiguration());
+    appConfig.getCache().setSearch(new SearchCacheConfiguration());
+    appConfig.getCache().getSearch().setLineage(new SearchLineageCacheConfiguration());
+    appConfig.getCache().getSearch().getLineage().setTtlSeconds(600L);
+    appConfig
+        .getCache()
+        .getSearch()
+        .getLineage()
+        .setLightningThreshold(withLightingCache ? -1 : 300);
+    appConfig.setMetadataChangeProposal(new MetadataChangeProposalConfig());
+    appConfig
+        .getMetadataChangeProposal()
+        .setSideEffects(new MetadataChangeProposalConfig.SideEffectsConfig());
+    appConfig
+        .getMetadataChangeProposal()
+        .getSideEffects()
+        .setSchemaField(new MetadataChangeProposalConfig.SideEffectConfig());
+    appConfig.getMetadataChangeProposal().getSideEffects().getSchemaField().setEnabled(false);
 
     lineageSearchService =
         spy(
@@ -157,11 +180,12 @@ private void resetService(boolean withCache, boolean withLightingCache) {
                 graphService,
                 cacheManager.getCache("test"),
                 withCache,
-                searchLineageCacheConfiguration));
+                appConfig));
   }
 
   @BeforeMethod
   public void wipe() throws Exception {
+    syncAfterWrite(getBulkProcessor());
     elasticSearchService.clear(operationContext);
     clearCache(false);
     syncAfterWrite(getBulkProcessor());
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/SearchServiceTestBase.java b/metadata-io/src/test/java/com/linkedin/metadata/search/SearchServiceTestBase.java
index a610cf95f827ae..1cd0c9550a0fc3 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/SearchServiceTestBase.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/SearchServiceTestBase.java
@@ -79,7 +79,11 @@ public void setup() throws RemoteInvocationException, URISyntaxException {
     operationContext =
         TestOperationContexts.systemContextNoSearchAuthorization(
                 new SnapshotEntityRegistry(new Snapshot()),
-                new IndexConventionImpl("search_service_test"))
+                new IndexConventionImpl(
+                    IndexConventionImpl.IndexConventionConfig.builder()
+                        .prefix("search_service_test")
+                        .hashIdAlgo("MD5")
+                        .build()))
             .asSession(RequestContext.TEST, Authorizer.EMPTY, TestOperationContexts.TEST_USER_AUTH);
 
     settingsBuilder = new SettingsBuilder(null);
@@ -108,6 +112,7 @@ private void resetSearchService() {
 
   @BeforeMethod
   public void wipe() throws Exception {
+    syncAfterWrite(getBulkProcessor());
     elasticSearchService.clear(operationContext);
     syncAfterWrite(getBulkProcessor());
   }
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/TestEntityTestBase.java b/metadata-io/src/test/java/com/linkedin/metadata/search/TestEntityTestBase.java
index 58574025aeeac3..b04c7d2bc60b92 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/TestEntityTestBase.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/TestEntityTestBase.java
@@ -62,7 +62,12 @@ public abstract class TestEntityTestBase extends AbstractTestNGSpringContextTest
   public void setup() {
     opContext =
         TestOperationContexts.systemContextNoSearchAuthorization(
-            new SnapshotEntityRegistry(new Snapshot()), new IndexConventionImpl("es_service_test"));
+            new SnapshotEntityRegistry(new Snapshot()),
+            new IndexConventionImpl(
+                IndexConventionImpl.IndexConventionConfig.builder()
+                    .prefix("es_service_test")
+                    .hashIdAlgo("MD5")
+                    .build()));
     settingsBuilder = new SettingsBuilder(null);
     elasticSearchService = buildService();
     elasticSearchService.reindexAll(Collections.emptySet());
@@ -70,7 +75,9 @@ public void setup() {
 
   @BeforeMethod
   public void wipe() throws Exception {
+    syncAfterWrite(getBulkProcessor());
     elasticSearchService.clear(opContext);
+    syncAfterWrite(getBulkProcessor());
   }
 
   @Nonnull
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/fixtures/SampleDataFixtureTestBase.java b/metadata-io/src/test/java/com/linkedin/metadata/search/fixtures/SampleDataFixtureTestBase.java
index a3f6f39e6387c4..7e434bf93329e2 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/fixtures/SampleDataFixtureTestBase.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/fixtures/SampleDataFixtureTestBase.java
@@ -216,7 +216,7 @@ public void testGetSortOrder() {
     SearchSourceBuilder builder = new SearchSourceBuilder();
     SortCriterion sortCriterion =
         new SortCriterion().setOrder(SortOrder.DESCENDING).setField(dateFieldName);
-    ESUtils.buildSortOrder(builder, sortCriterion, entitySpecs);
+    ESUtils.buildSortOrder(builder, Collections.singletonList(sortCriterion), entitySpecs);
     List<SortBuilder<?>> sorts = builder.sorts();
     assertEquals(sorts.size(), 2); // sort by last modified and then by urn
     for (SortBuilder sort : sorts) {
@@ -235,7 +235,7 @@ public void testGetSortOrder() {
     SearchSourceBuilder nameBuilder = new SearchSourceBuilder();
     SortCriterion nameCriterion =
         new SortCriterion().setOrder(SortOrder.ASCENDING).setField(entityNameField);
-    ESUtils.buildSortOrder(nameBuilder, nameCriterion, entitySpecs);
+    ESUtils.buildSortOrder(nameBuilder, Collections.singletonList(nameCriterion), entitySpecs);
     sorts = nameBuilder.sorts();
     assertEquals(sorts.size(), 2);
     for (SortBuilder sort : sorts) {
@@ -1959,7 +1959,7 @@ public void testSortOrdering() {
                 SEARCHABLE_ENTITIES,
                 query,
                 null,
-                criterion,
+                Collections.singletonList(criterion),
                 0,
                 100,
                 null);
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/indexbuilder/IndexBuilderTestBase.java b/metadata-io/src/test/java/com/linkedin/metadata/search/indexbuilder/IndexBuilderTestBase.java
index 92ca4c5ed8a05e..f639e5c5fd3937 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/indexbuilder/IndexBuilderTestBase.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/indexbuilder/IndexBuilderTestBase.java
@@ -39,9 +39,9 @@ public abstract class IndexBuilderTestBase extends AbstractTestNGSpringContextTe
   @Nonnull
   protected abstract RestHighLevelClient getSearchClient();
 
-  private static IndicesClient _indexClient;
+  private IndicesClient _indexClient;
   private static final String TEST_INDEX_NAME = "esindex_builder_test";
-  private static ESIndexBuilder testDefaultBuilder;
+  private ESIndexBuilder testDefaultBuilder;
 
   @BeforeClass
   public void setup() {
@@ -63,7 +63,7 @@ public void setup() {
   }
 
   @BeforeMethod
-  public static void wipe() throws Exception {
+  public void wipe() throws Exception {
     try {
       _indexClient
           .getAlias(new GetAliasesRequest(TEST_INDEX_NAME), RequestOptions.DEFAULT)
@@ -86,7 +86,7 @@ public static void wipe() throws Exception {
     }
   }
 
-  public static GetIndexResponse getTestIndex() throws IOException {
+  public GetIndexResponse getTestIndex() throws IOException {
     return _indexClient.get(
         new GetIndexRequest(TEST_INDEX_NAME).includeDefaults(true), RequestOptions.DEFAULT);
   }
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/query/BrowseDAOTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/query/BrowseDAOTest.java
index a0288d019644bd..b71e4ddc54a782 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/query/BrowseDAOTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/query/BrowseDAOTest.java
@@ -45,7 +45,11 @@ public void setup() throws RemoteInvocationException, URISyntaxException {
     mockClient = mock(RestHighLevelClient.class);
     opContext =
         TestOperationContexts.systemContextNoSearchAuthorization(
-            new IndexConventionImpl("es_browse_dao_test"));
+            new IndexConventionImpl(
+                IndexConventionImpl.IndexConventionConfig.builder()
+                    .prefix("es_browse_dao_test")
+                    .hashIdAlgo("MD5")
+                    .build()));
     browseDAO = new ESBrowseDAO(mockClient, searchConfiguration, customSearchConfiguration);
   }
 
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/utils/ESUtilsTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/utils/ESUtilsTest.java
index d56d9b0674884f..bbc494159a498f 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/utils/ESUtilsTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/utils/ESUtilsTest.java
@@ -145,6 +145,197 @@ public void testGetQueryBuilderFromCriterionEqualsValues() {
     Assert.assertEquals(result.toString(), expected);
   }
 
+  @Test
+  public void testGetQueryBuilderFromCriterionContain() {
+    final Criterion singleValueCriterion =
+        new Criterion().setField("myTestField").setCondition(Condition.CONTAIN).setValue("value1");
+
+    QueryBuilder result =
+        ESUtils.getQueryBuilderFromCriterion(
+            singleValueCriterion, false, new HashMap<>(), mock(AspectRetriever.class));
+
+    String expected =
+        "{\n"
+            + "  \"wildcard\" : {\n"
+            + "    \"myTestField.keyword\" : {\n"
+            + "      \"wildcard\" : \"*value1*\",\n"
+            + "      \"boost\" : 1.0,\n"
+            + "      \"_name\" : \"myTestField\"\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
+
+    Assert.assertEquals(result.toString(), expected);
+
+    final Criterion multiValueCriterion =
+        new Criterion()
+            .setField("myTestField")
+            .setCondition(Condition.CONTAIN)
+            .setValues(new StringArray(ImmutableList.of("value1", "value2")));
+
+    result =
+        ESUtils.getQueryBuilderFromCriterion(
+            multiValueCriterion, false, new HashMap<>(), mock(AspectRetriever.class));
+
+    expected =
+        "{\n"
+            + "  \"bool\" : {\n"
+            + "    \"should\" : [\n"
+            + "      {\n"
+            + "        \"wildcard\" : {\n"
+            + "          \"myTestField.keyword\" : {\n"
+            + "            \"wildcard\" : \"*value1*\",\n"
+            + "            \"boost\" : 1.0,\n"
+            + "            \"_name\" : \"myTestField\"\n"
+            + "          }\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"wildcard\" : {\n"
+            + "          \"myTestField.keyword\" : {\n"
+            + "            \"wildcard\" : \"*value2*\",\n"
+            + "            \"boost\" : 1.0,\n"
+            + "            \"_name\" : \"myTestField\"\n"
+            + "          }\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ],\n"
+            + "    \"adjust_pure_negative\" : true,\n"
+            + "    \"boost\" : 1.0\n"
+            + "  }\n"
+            + "}";
+
+    Assert.assertEquals(result.toString(), expected);
+  }
+
+  @Test
+  public void testWildcardQueryBuilderFromCriterionWhenStartsWith() {
+    final Criterion singleValueCriterion =
+        new Criterion()
+            .setField("myTestField")
+            .setCondition(Condition.START_WITH)
+            .setValue("value1");
+
+    QueryBuilder result =
+        ESUtils.getQueryBuilderFromCriterion(
+            singleValueCriterion, false, new HashMap<>(), mock(AspectRetriever.class));
+
+    String expected =
+        "{\n"
+            + "  \"wildcard\" : {\n"
+            + "    \"myTestField.keyword\" : {\n"
+            + "      \"wildcard\" : \"value1*\",\n"
+            + "      \"boost\" : 1.0,\n"
+            + "      \"_name\" : \"myTestField\"\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
+
+    Assert.assertEquals(result.toString(), expected);
+
+    final Criterion multiValueCriterion =
+        new Criterion()
+            .setField("myTestField")
+            .setCondition(Condition.START_WITH)
+            .setValues(new StringArray(ImmutableList.of("value1", "value2")));
+
+    result =
+        ESUtils.getQueryBuilderFromCriterion(
+            multiValueCriterion, false, new HashMap<>(), mock(AspectRetriever.class));
+
+    expected =
+        "{\n"
+            + "  \"bool\" : {\n"
+            + "    \"should\" : [\n"
+            + "      {\n"
+            + "        \"wildcard\" : {\n"
+            + "          \"myTestField.keyword\" : {\n"
+            + "            \"wildcard\" : \"value1*\",\n"
+            + "            \"boost\" : 1.0,\n"
+            + "            \"_name\" : \"myTestField\"\n"
+            + "          }\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"wildcard\" : {\n"
+            + "          \"myTestField.keyword\" : {\n"
+            + "            \"wildcard\" : \"value2*\",\n"
+            + "            \"boost\" : 1.0,\n"
+            + "            \"_name\" : \"myTestField\"\n"
+            + "          }\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ],\n"
+            + "    \"adjust_pure_negative\" : true,\n"
+            + "    \"boost\" : 1.0\n"
+            + "  }\n"
+            + "}";
+
+    Assert.assertEquals(result.toString(), expected);
+  }
+
+  @Test
+  public void testWildcardQueryBuilderFromCriterionWhenEndsWith() {
+    final Criterion singleValueCriterion =
+        new Criterion().setField("myTestField").setCondition(Condition.END_WITH).setValue("value1");
+
+    QueryBuilder result =
+        ESUtils.getQueryBuilderFromCriterion(
+            singleValueCriterion, false, new HashMap<>(), mock(AspectRetriever.class));
+
+    String expected =
+        "{\n"
+            + "  \"wildcard\" : {\n"
+            + "    \"myTestField.keyword\" : {\n"
+            + "      \"wildcard\" : \"*value1\",\n"
+            + "      \"boost\" : 1.0,\n"
+            + "      \"_name\" : \"myTestField\"\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
+    Assert.assertEquals(result.toString(), expected);
+
+    final Criterion multiValueCriterion =
+        new Criterion()
+            .setField("myTestField")
+            .setCondition(Condition.END_WITH)
+            .setValues(new StringArray(ImmutableList.of("value1", "value2")));
+
+    result =
+        ESUtils.getQueryBuilderFromCriterion(
+            multiValueCriterion, false, new HashMap<>(), mock(AspectRetriever.class));
+
+    expected =
+        "{\n"
+            + "  \"bool\" : {\n"
+            + "    \"should\" : [\n"
+            + "      {\n"
+            + "        \"wildcard\" : {\n"
+            + "          \"myTestField.keyword\" : {\n"
+            + "            \"wildcard\" : \"*value1\",\n"
+            + "            \"boost\" : 1.0,\n"
+            + "            \"_name\" : \"myTestField\"\n"
+            + "          }\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"wildcard\" : {\n"
+            + "          \"myTestField.keyword\" : {\n"
+            + "            \"wildcard\" : \"*value2\",\n"
+            + "            \"boost\" : 1.0,\n"
+            + "            \"_name\" : \"myTestField\"\n"
+            + "          }\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ],\n"
+            + "    \"adjust_pure_negative\" : true,\n"
+            + "    \"boost\" : 1.0\n"
+            + "  }\n"
+            + "}";
+
+    Assert.assertEquals(result.toString(), expected);
+  }
+
   @Test
   public void testGetQueryBuilderFromCriterionExists() {
     final Criterion singleValueCriterion =
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/systemmetadata/SystemMetadataServiceTestBase.java b/metadata-io/src/test/java/com/linkedin/metadata/systemmetadata/SystemMetadataServiceTestBase.java
index 7067dd3a6763e7..7cf3fab6e5bb83 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/systemmetadata/SystemMetadataServiceTestBase.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/systemmetadata/SystemMetadataServiceTestBase.java
@@ -32,7 +32,11 @@ public abstract class SystemMetadataServiceTestBase extends AbstractTestNGSpring
   protected abstract ESIndexBuilder getIndexBuilder();
 
   private final IndexConvention _indexConvention =
-      new IndexConventionImpl("es_system_metadata_service_test");
+      new IndexConventionImpl(
+          IndexConventionImpl.IndexConventionConfig.builder()
+              .prefix("es_system_metadata_service_test")
+              .hashIdAlgo("MD5")
+              .build());
 
   private ElasticSearchSystemMetadataService _client;
 
@@ -44,7 +48,9 @@ public void setup() {
 
   @BeforeMethod
   public void wipe() throws Exception {
+    syncAfterWrite(getBulkProcessor());
     _client.clear();
+    syncAfterWrite(getBulkProcessor());
   }
 
   @Nonnull
@@ -52,7 +58,7 @@ private ElasticSearchSystemMetadataService buildService() {
     ESSystemMetadataDAO dao =
         new ESSystemMetadataDAO(getSearchClient(), _indexConvention, getBulkProcessor(), 1);
     return new ElasticSearchSystemMetadataService(
-        getBulkProcessor(), _indexConvention, dao, getIndexBuilder());
+        getBulkProcessor(), _indexConvention, dao, getIndexBuilder(), "MD5");
   }
 
   @Test
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/timeline/eventgenerator/SchemaMetadataChangeEventGeneratorTest.java b/metadata-io/src/test/java/com/linkedin/metadata/timeline/eventgenerator/SchemaMetadataChangeEventGeneratorTest.java
index 3e9f1cd0fe092a..ef7b818c593010 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/timeline/eventgenerator/SchemaMetadataChangeEventGeneratorTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/timeline/eventgenerator/SchemaMetadataChangeEventGeneratorTest.java
@@ -7,16 +7,128 @@
 import com.linkedin.metadata.timeline.data.ChangeEvent;
 import com.linkedin.mxe.SystemMetadata;
 import com.linkedin.restli.internal.server.util.DataMapUtils;
+import com.linkedin.schema.SchemaField;
+import com.linkedin.schema.SchemaFieldArray;
 import com.linkedin.schema.SchemaMetadata;
+import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import org.apache.commons.io.IOUtils;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
 import org.testng.annotations.Test;
 
 public class SchemaMetadataChangeEventGeneratorTest extends AbstractTestNGSpringContextTests {
 
+  private static Urn getTestUrn() throws URISyntaxException {
+    return Urn.createFromString("urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleHdfsDataset,PROD)");
+  }
+
+  private static AuditStamp getTestAuditStamp() throws URISyntaxException {
+    return new AuditStamp()
+        .setActor(Urn.createFromString("urn:li:corpuser:__datahub_system"))
+        .setTime(1683829509553L);
+  }
+
+  private static void compareDescriptions(
+      Set<String> expectedDescriptions, List<ChangeEvent> actual) {
+    Set<String> actualDescriptions = new HashSet<>();
+    actual.forEach(
+        changeEvent -> {
+          actualDescriptions.add(changeEvent.getDescription());
+        });
+    assertEquals(expectedDescriptions, actualDescriptions);
+  }
+
+  private static Aspect<SchemaMetadata> getSchemaMetadata(List<SchemaField> schemaFieldList) {
+    return new Aspect<>(
+        new SchemaMetadata().setFields(new SchemaFieldArray(schemaFieldList)),
+        new SystemMetadata());
+  }
+
+  @Test
+  public void testNativeSchemaBackwardIncompatibleChange() throws Exception {
+    SchemaMetadataChangeEventGenerator test = new SchemaMetadataChangeEventGenerator();
+
+    Urn urn = getTestUrn();
+    String entity = "dataset";
+    String aspect = "schemaMetadata";
+    AuditStamp auditStamp = getTestAuditStamp();
+
+    Aspect<SchemaMetadata> from =
+        getSchemaMetadata(
+            List.of(new SchemaField().setFieldPath("ID").setNativeDataType("NUMBER(16,1)")));
+    Aspect<SchemaMetadata> to =
+        getSchemaMetadata(
+            List.of(new SchemaField().setFieldPath("ID").setNativeDataType("NUMBER(10,1)")));
+    List<ChangeEvent> actual = test.getChangeEvents(urn, entity, aspect, from, to, auditStamp);
+    // Test single field going from NUMBER(16,1) -> NUMBER(10,1)
+    assertEquals(1, actual.size());
+    compareDescriptions(
+        Set.of(
+            "A backwards incompatible change due to native datatype of the field 'ID' changed from 'NUMBER(16,1)' to 'NUMBER(10,1)'."),
+        actual);
+
+    List<ChangeEvent> actual2 = test.getChangeEvents(urn, entity, aspect, to, from, auditStamp);
+    // Test single field going from NUMBER(10,1) -> NUMBER(16,1)
+    assertEquals(1, actual2.size());
+    compareDescriptions(
+        Set.of(
+            "A backwards incompatible change due to native datatype of the field 'ID' changed from 'NUMBER(10,1)' to 'NUMBER(16,1)'."),
+        actual2);
+  }
+
+  @Test
+  public void testNativeSchemaFieldAddition() throws Exception {
+    SchemaMetadataChangeEventGenerator test = new SchemaMetadataChangeEventGenerator();
+
+    Urn urn = getTestUrn();
+    String entity = "dataset";
+    String aspect = "schemaMetadata";
+    AuditStamp auditStamp = getTestAuditStamp();
+
+    Aspect<SchemaMetadata> from =
+        getSchemaMetadata(
+            List.of(new SchemaField().setFieldPath("ID").setNativeDataType("NUMBER(16,1)")));
+    Aspect<SchemaMetadata> to3 =
+        getSchemaMetadata(
+            List.of(
+                new SchemaField().setFieldPath("aa").setNativeDataType("NUMBER(10,1)"),
+                new SchemaField().setFieldPath("ID").setNativeDataType("NUMBER(10,1)")));
+    List<ChangeEvent> actual = test.getChangeEvents(urn, entity, aspect, from, to3, auditStamp);
+    assertEquals(2, actual.size());
+    compareDescriptions(
+        Set.of(
+            "A backwards incompatible change due to native datatype of the field 'ID' changed from 'NUMBER(16,1)' to 'NUMBER(10,1)'.",
+            "A forwards & backwards compatible change due to the newly added field 'aa'."),
+        actual);
+  }
+
+  @Test
+  public void testSchemaFieldRename() throws Exception {
+    SchemaMetadataChangeEventGenerator test = new SchemaMetadataChangeEventGenerator();
+
+    Urn urn = getTestUrn();
+    String entity = "dataset";
+    String aspect = "schemaMetadata";
+    AuditStamp auditStamp = getTestAuditStamp();
+
+    Aspect<SchemaMetadata> from =
+        getSchemaMetadata(
+            List.of(new SchemaField().setFieldPath("ID").setNativeDataType("NUMBER(16,1)")));
+    Aspect<SchemaMetadata> to3 =
+        getSchemaMetadata(
+            List.of(new SchemaField().setFieldPath("ID2").setNativeDataType("NUMBER(16,1)")));
+    List<ChangeEvent> actual = test.getChangeEvents(urn, entity, aspect, from, to3, auditStamp);
+    compareDescriptions(
+        Set.of(
+            "A forwards & backwards compatible change due to renaming of the field 'ID to ID2'."),
+        actual);
+    assertEquals(1, actual.size());
+  }
+
   @Test
   public void testDelete() throws Exception {
     SchemaMetadataChangeEventGenerator test = new SchemaMetadataChangeEventGenerator();
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/timeseries/search/TimeseriesAspectServiceTestBase.java b/metadata-io/src/test/java/com/linkedin/metadata/timeseries/search/TimeseriesAspectServiceTestBase.java
index b44f01d90dae40..6c650e725fd5cf 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/timeseries/search/TimeseriesAspectServiceTestBase.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/timeseries/search/TimeseriesAspectServiceTestBase.java
@@ -126,7 +126,12 @@ public void setup() throws RemoteInvocationException, URISyntaxException {
 
     opContext =
         TestOperationContexts.systemContextNoSearchAuthorization(
-            entityRegistry, new IndexConventionImpl("es_timeseries_aspect_service_test"));
+            entityRegistry,
+            new IndexConventionImpl(
+                IndexConventionImpl.IndexConventionConfig.builder()
+                    .prefix("es_timeseries_aspect_service_test")
+                    .hashIdAlgo("MD5")
+                    .build()));
 
     elasticSearchTimeseriesAspectService = buildService();
     elasticSearchTimeseriesAspectService.reindexAll(Collections.emptySet());
@@ -152,7 +157,7 @@ private ElasticSearchTimeseriesAspectService buildService() {
 
   private void upsertDocument(TestEntityProfile dp, Urn urn) throws JsonProcessingException {
     Map<String, JsonNode> documents =
-        TimeseriesAspectTransformer.transform(urn, dp, aspectSpec, null);
+        TimeseriesAspectTransformer.transform(urn, dp, aspectSpec, null, "MD5");
     assertEquals(documents.size(), 3);
     documents.forEach(
         (key, value) ->
@@ -1291,7 +1296,7 @@ public void testCountByFilter() {
   @Test(
       groups = {"testCountAfterDelete"},
       dependsOnGroups = {"deleteAspectValues1"})
-  public void testCountByFilterAfterDelete() throws InterruptedException {
+  public void testCountByFilterAfterDelete() throws Exception {
     syncAfterWrite(getBulkProcessor());
     // Test with filter
     Criterion hasUrnCriterion =
diff --git a/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SampleDataFixtureConfiguration.java b/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SampleDataFixtureConfiguration.java
index 28a4a2b00cd6f1..20f6084f953299 100644
--- a/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SampleDataFixtureConfiguration.java
+++ b/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SampleDataFixtureConfiguration.java
@@ -86,12 +86,20 @@ protected String longTailIndexPrefix() {
 
   @Bean(name = "sampleDataIndexConvention")
   protected IndexConvention indexConvention(@Qualifier("sampleDataPrefix") String prefix) {
-    return new IndexConventionImpl(prefix);
+    return new IndexConventionImpl(
+        IndexConventionImpl.IndexConventionConfig.builder()
+            .prefix(prefix)
+            .hashIdAlgo("MD5")
+            .build());
   }
 
   @Bean(name = "longTailIndexConvention")
   protected IndexConvention longTailIndexConvention(@Qualifier("longTailPrefix") String prefix) {
-    return new IndexConventionImpl(prefix);
+    return new IndexConventionImpl(
+        IndexConventionImpl.IndexConventionConfig.builder()
+            .prefix(prefix)
+            .hashIdAlgo("MD5")
+            .build());
   }
 
   @Bean(name = "sampleDataFixtureName")
diff --git a/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SearchLineageFixtureConfiguration.java b/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SearchLineageFixtureConfiguration.java
index 4cd818db34bf4b..71ccaa1d325010 100644
--- a/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SearchLineageFixtureConfiguration.java
+++ b/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SearchLineageFixtureConfiguration.java
@@ -1,14 +1,18 @@
 package io.datahubproject.test.fixtures.search;
 
 import static com.linkedin.metadata.Constants.*;
+import static io.datahubproject.test.search.SearchTestUtils.getGraphQueryConfiguration;
 
 import com.linkedin.entity.client.EntityClient;
 import com.linkedin.metadata.client.JavaEntityClient;
+import com.linkedin.metadata.config.DataHubAppConfiguration;
+import com.linkedin.metadata.config.MetadataChangeProposalConfig;
 import com.linkedin.metadata.config.PreProcessHooks;
+import com.linkedin.metadata.config.cache.CacheConfiguration;
 import com.linkedin.metadata.config.cache.EntityDocCountCacheConfiguration;
+import com.linkedin.metadata.config.cache.SearchCacheConfiguration;
 import com.linkedin.metadata.config.cache.SearchLineageCacheConfiguration;
 import com.linkedin.metadata.config.search.ElasticSearchConfiguration;
-import com.linkedin.metadata.config.search.GraphQueryConfiguration;
 import com.linkedin.metadata.config.search.SearchConfiguration;
 import com.linkedin.metadata.config.search.custom.CustomSearchConfiguration;
 import com.linkedin.metadata.entity.EntityServiceImpl;
@@ -71,7 +75,11 @@ protected String indexPrefix() {
 
   @Bean(name = "searchLineageIndexConvention")
   protected IndexConvention indexConvention(@Qualifier("searchLineagePrefix") String prefix) {
-    return new IndexConventionImpl(prefix);
+    return new IndexConventionImpl(
+        IndexConventionImpl.IndexConventionConfig.builder()
+            .prefix(prefix)
+            .hashIdAlgo("MD5")
+            .build());
   }
 
   @Bean(name = "searchLineageFixtureName")
@@ -79,11 +87,21 @@ protected String fixtureName() {
     return "search_lineage";
   }
 
-  @Bean(name = "lineageCacheConfiguration")
-  protected SearchLineageCacheConfiguration searchLineageCacheConfiguration() {
-    SearchLineageCacheConfiguration conf = new SearchLineageCacheConfiguration();
-    conf.setLightningThreshold(300);
-    conf.setTtlSeconds(30);
+  @Bean(name = "lineageAppConfig")
+  protected DataHubAppConfiguration searchLineageAppConfiguration() {
+    DataHubAppConfiguration conf = new DataHubAppConfiguration();
+    conf.setCache(new CacheConfiguration());
+    conf.getCache().setSearch(new SearchCacheConfiguration());
+    conf.getCache().getSearch().setLineage(new SearchLineageCacheConfiguration());
+    conf.getCache().getSearch().getLineage().setLightningThreshold(300);
+    conf.getCache().getSearch().getLineage().setTtlSeconds(30);
+    conf.setMetadataChangeProposal(new MetadataChangeProposalConfig());
+    conf.getMetadataChangeProposal()
+        .setSideEffects(new MetadataChangeProposalConfig.SideEffectsConfig());
+    conf.getMetadataChangeProposal()
+        .getSideEffects()
+        .setSchemaField(new MetadataChangeProposalConfig.SideEffectConfig());
+    conf.getMetadataChangeProposal().getSideEffects().getSchemaField().setEnabled(false);
     return conf;
   }
 
@@ -172,11 +190,9 @@ protected ElasticSearchGraphService graphService(
             indexConvention,
             new ESGraphWriteDAO(indexConvention, bulkProcessor, 1),
             new ESGraphQueryDAO(
-                searchClient,
-                lineageRegistry,
-                indexConvention,
-                GraphQueryConfiguration.testDefaults),
-            indexBuilder);
+                searchClient, lineageRegistry, indexConvention, getGraphQueryConfiguration()),
+            indexBuilder,
+            indexConvention.getIdHashAlgo());
     graphService.reindexAll(Collections.emptySet());
     return graphService;
   }
@@ -188,7 +204,7 @@ protected LineageSearchService lineageSearchService(
       @Qualifier("searchLineageGraphService") ElasticSearchGraphService graphService,
       @Qualifier("searchLineagePrefix") String prefix,
       @Qualifier("searchLineageFixtureName") String fixtureName,
-      @Qualifier("lineageCacheConfiguration") SearchLineageCacheConfiguration cacheConfiguration)
+      @Qualifier("lineageAppConfig") DataHubAppConfiguration appConfig)
       throws IOException {
 
     // Load fixture data (after graphService mappings applied)
@@ -200,7 +216,7 @@ protected LineageSearchService lineageSearchService(
         .build()
         .read();
 
-    return new LineageSearchService(searchService, graphService, null, false, cacheConfiguration);
+    return new LineageSearchService(searchService, graphService, null, false, appConfig);
   }
 
   @Bean(name = "searchLineageSearchService")
diff --git a/metadata-io/src/test/java/io/datahubproject/test/search/BulkProcessorProxyListener.java b/metadata-io/src/test/java/io/datahubproject/test/search/BulkProcessorProxyListener.java
new file mode 100644
index 00000000000000..a409a1e97ad909
--- /dev/null
+++ b/metadata-io/src/test/java/io/datahubproject/test/search/BulkProcessorProxyListener.java
@@ -0,0 +1,44 @@
+package io.datahubproject.test.search;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.opensearch.action.bulk.BulkProcessor;
+import org.opensearch.action.bulk.BulkRequest;
+import org.opensearch.action.bulk.BulkResponse;
+
+public class BulkProcessorProxyListener implements BulkProcessor.Listener {
+  private final BulkProcessor.Listener listener;
+  private final AtomicInteger unsentItemsCounter = new AtomicInteger();
+
+  public BulkProcessorProxyListener(BulkProcessor.Listener listener) {
+    this.listener = listener;
+  }
+
+  @Override
+  public void beforeBulk(long l, BulkRequest bulkRequest) {
+    unsentItemsCounter.addAndGet(bulkRequest.numberOfActions());
+    listener.beforeBulk(l, bulkRequest);
+  }
+
+  @Override
+  public void afterBulk(long l, BulkRequest bulkRequest, BulkResponse bulkResponse) {
+    unsentItemsCounter.addAndGet(-bulkResponse.getItems().length);
+    listener.afterBulk(l, bulkRequest, bulkResponse);
+  }
+
+  @Override
+  public void afterBulk(long l, BulkRequest bulkRequest, Throwable throwable) {
+    listener.afterBulk(l, bulkRequest, throwable);
+  }
+
+  void waitForBulkProcessed() throws InterruptedException {
+    for (int i = 0; i < 6000; i++) {
+      if (unsentItemsCounter.get() == 0) {
+        break;
+      }
+      TimeUnit.MILLISECONDS.sleep(5);
+    }
+    // reset the counter just in case
+    unsentItemsCounter.set(0);
+  }
+}
diff --git a/metadata-io/src/test/java/io/datahubproject/test/search/BulkProcessorTestUtils.java b/metadata-io/src/test/java/io/datahubproject/test/search/BulkProcessorTestUtils.java
new file mode 100644
index 00000000000000..416a5d40bb0e3f
--- /dev/null
+++ b/metadata-io/src/test/java/io/datahubproject/test/search/BulkProcessorTestUtils.java
@@ -0,0 +1,67 @@
+package io.datahubproject.test.search;
+
+import com.linkedin.metadata.search.elasticsearch.update.ESBulkProcessor;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksRequest;
+import org.opensearch.action.admin.indices.refresh.RefreshRequest;
+import org.opensearch.action.bulk.BulkProcessor;
+import org.opensearch.client.RequestOptions;
+import org.opensearch.client.RestHighLevelClient;
+import org.opensearch.common.unit.TimeValue;
+import org.springframework.test.util.ReflectionTestUtils;
+
+public class BulkProcessorTestUtils {
+  private BulkProcessorTestUtils() {}
+
+  public static void syncAfterWrite(ESBulkProcessor bulkProcessor)
+      throws InterruptedException, IOException {
+    bulkProcessor.flush();
+    final RestHighLevelClient searchClient = getRestHighLevelClient(bulkProcessor);
+    // if the bulks are big it takes time for Elastic/OpenSearch to process these bulk requests
+    getBulkProcessorListener(bulkProcessor).waitForBulkProcessed();
+    waitForCompletion(searchClient);
+    // some tasks might have refresh = false, so we need to refresh manually
+    searchClient.indices().refresh(new RefreshRequest(), RequestOptions.DEFAULT);
+    waitForCompletion(searchClient);
+  }
+
+  private static void waitForCompletion(RestHighLevelClient searchClient)
+      throws IOException, InterruptedException {
+    while (!searchClient
+        .tasks()
+        .list(
+            new ListTasksRequest()
+                .setActions("indices:*,*/put,*/update")
+                .setWaitForCompletion(true)
+                .setTimeout(TimeValue.timeValueSeconds(30)),
+            RequestOptions.DEFAULT)
+        .getTasks()
+        .isEmpty()) {
+      // Mostly this is not reached, but in some rare cases it might
+      TimeUnit.MILLISECONDS.sleep(5);
+    }
+  }
+
+  private static RestHighLevelClient getRestHighLevelClient(ESBulkProcessor esBulkProcessor) {
+    return (RestHighLevelClient) ReflectionTestUtils.getField(esBulkProcessor, "searchClient");
+  }
+
+  private static BulkProcessorProxyListener getBulkProcessorListener(
+      ESBulkProcessor esBulkProcessor) {
+    var bulkProcessor = ReflectionTestUtils.getField(esBulkProcessor, "bulkProcessor");
+    var bulkRequestHandler = ReflectionTestUtils.getField(bulkProcessor, "bulkRequestHandler");
+    return (BulkProcessorProxyListener)
+        ReflectionTestUtils.getField(bulkRequestHandler, "listener");
+  }
+
+  public static void replaceBulkProcessorListener(ESBulkProcessor esBulkProcessor) {
+    var bulkProcessor =
+        (BulkProcessor) ReflectionTestUtils.getField(esBulkProcessor, "bulkProcessor");
+    var bulkRequestHandler = ReflectionTestUtils.getField(bulkProcessor, "bulkRequestHandler");
+    var bulkProcessorListener =
+        (BulkProcessor.Listener) ReflectionTestUtils.getField(bulkRequestHandler, "listener");
+    ReflectionTestUtils.setField(
+        bulkRequestHandler, "listener", new BulkProcessorProxyListener(bulkProcessorListener));
+  }
+}
diff --git a/metadata-io/src/test/java/io/datahubproject/test/search/SearchTestUtils.java b/metadata-io/src/test/java/io/datahubproject/test/search/SearchTestUtils.java
index a71c40b70f2b41..78e274063b6c73 100644
--- a/metadata-io/src/test/java/io/datahubproject/test/search/SearchTestUtils.java
+++ b/metadata-io/src/test/java/io/datahubproject/test/search/SearchTestUtils.java
@@ -15,6 +15,8 @@
 import com.linkedin.datahub.graphql.types.SearchableEntityType;
 import com.linkedin.datahub.graphql.types.entitytype.EntityTypeMapper;
 import com.linkedin.metadata.aspect.AspectRetriever;
+import com.linkedin.metadata.config.DataHubAppConfiguration;
+import com.linkedin.metadata.config.search.GraphQueryConfiguration;
 import com.linkedin.metadata.graph.LineageDirection;
 import com.linkedin.metadata.query.filter.Filter;
 import com.linkedin.metadata.search.LineageSearchResult;
@@ -24,6 +26,7 @@
 import com.linkedin.metadata.search.SearchService;
 import com.linkedin.metadata.search.elasticsearch.update.ESBulkProcessor;
 import io.datahubproject.metadata.context.OperationContext;
+import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -41,9 +44,9 @@
 public class SearchTestUtils {
   private SearchTestUtils() {}
 
-  public static void syncAfterWrite(ESBulkProcessor bulkProcessor) throws InterruptedException {
-    bulkProcessor.flush();
-    Thread.sleep(1000);
+  public static void syncAfterWrite(ESBulkProcessor bulkProcessor)
+      throws InterruptedException, IOException {
+    BulkProcessorTestUtils.syncAfterWrite(bulkProcessor);
   }
 
   public static final List<String> SEARCHABLE_ENTITIES;
@@ -221,6 +224,11 @@ public Authorizer getAuthorizer() {
           public OperationContext getOperationContext() {
             return opContext;
           }
+
+          @Override
+          public DataHubAppConfiguration getDataHubAppConfig() {
+            return new DataHubAppConfiguration();
+          }
         });
   }
 
@@ -253,4 +261,16 @@ public HttpAsyncClientBuilder customizeHttpClient(
               }
             });
   }
+
+  public static GraphQueryConfiguration getGraphQueryConfiguration() {
+    return new GraphQueryConfiguration() {
+      {
+        setBatchSize(1000);
+        setTimeoutSeconds(10);
+        setMaxResult(10000);
+        setEnableMultiPathSearch(true);
+        setBoostViaNodes(true);
+      }
+    };
+  }
 }
diff --git a/metadata-io/src/test/java/io/datahubproject/test/search/config/SearchTestContainerConfiguration.java b/metadata-io/src/test/java/io/datahubproject/test/search/config/SearchTestContainerConfiguration.java
index ab6644ce6ff6de..66394def5f99b5 100644
--- a/metadata-io/src/test/java/io/datahubproject/test/search/config/SearchTestContainerConfiguration.java
+++ b/metadata-io/src/test/java/io/datahubproject/test/search/config/SearchTestContainerConfiguration.java
@@ -1,5 +1,7 @@
 package io.datahubproject.test.search.config;
 
+import static io.datahubproject.test.search.BulkProcessorTestUtils.replaceBulkProcessorListener;
+
 import com.linkedin.metadata.config.search.ElasticSearchConfiguration;
 import com.linkedin.metadata.search.elasticsearch.indexbuilder.ESIndexBuilder;
 import com.linkedin.metadata.search.elasticsearch.update.ESBulkProcessor;
@@ -64,18 +66,21 @@ public RestHighLevelClient getElasticsearchClient(
   @Nonnull
   public ESBulkProcessor getBulkProcessor(
       @Qualifier("searchRestHighLevelClient") RestHighLevelClient searchClient) {
-    return ESBulkProcessor.builder(searchClient)
-        .async(true)
-        /*
-         * Force a refresh as part of this request. This refresh policy does not scale for high indexing or search throughput but is useful
-         * to present a consistent view to for indices with very low traffic. And it is wonderful for tests!
-         */
-        .writeRequestRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
-        .bulkRequestsLimit(10000)
-        .bulkFlushPeriod(REFRESH_INTERVAL_SECONDS - 1)
-        .retryInterval(1L)
-        .numRetries(1)
-        .build();
+    ESBulkProcessor esBulkProcessor =
+        ESBulkProcessor.builder(searchClient)
+            .async(true)
+            /*
+             * Force a refresh as part of this request. This refresh policy does not scale for high indexing or search throughput but is useful
+             * to present a consistent view to for indices with very low traffic. And it is wonderful for tests!
+             */
+            .writeRequestRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
+            .bulkRequestsLimit(10000)
+            .bulkFlushPeriod(REFRESH_INTERVAL_SECONDS - 1)
+            .retryInterval(1L)
+            .numRetries(1)
+            .build();
+    replaceBulkProcessorListener(esBulkProcessor);
+    return esBulkProcessor;
   }
 
   @Primary
diff --git a/metadata-jobs/mae-consumer-job/src/main/java/com/linkedin/metadata/kafka/MaeConsumerApplication.java b/metadata-jobs/mae-consumer-job/src/main/java/com/linkedin/metadata/kafka/MaeConsumerApplication.java
index f6533a6ac1d8a9..617bc8e0b73030 100644
--- a/metadata-jobs/mae-consumer-job/src/main/java/com/linkedin/metadata/kafka/MaeConsumerApplication.java
+++ b/metadata-jobs/mae-consumer-job/src/main/java/com/linkedin/metadata/kafka/MaeConsumerApplication.java
@@ -18,8 +18,6 @@
       "com.linkedin.metadata.service",
       "com.datahub.event",
       "com.linkedin.gms.factory.kafka",
-      "com.linkedin.gms.factory.kafka.common",
-      "com.linkedin.gms.factory.kafka.schemaregistry",
       "com.linkedin.metadata.boot.kafka",
       "com.linkedin.metadata.kafka",
       "com.linkedin.metadata.dao.producer",
@@ -34,7 +32,10 @@
       "com.linkedin.gms.factory.context",
       "com.linkedin.gms.factory.timeseries",
       "com.linkedin.gms.factory.assertion",
-      "com.linkedin.gms.factory.plugins"
+      "com.linkedin.gms.factory.plugins",
+      "com.linkedin.gms.factory.change",
+      "com.datahub.event.hook",
+      "com.linkedin.gms.factory.notifications"
     },
     excludeFilters = {
       @ComponentScan.Filter(
diff --git a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MCLKafkaListener.java b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MCLKafkaListener.java
new file mode 100644
index 00000000000000..70b452722abc76
--- /dev/null
+++ b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MCLKafkaListener.java
@@ -0,0 +1,103 @@
+package com.linkedin.metadata.kafka;
+
+import com.codahale.metrics.Histogram;
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.Timer;
+import com.linkedin.metadata.EventUtils;
+import com.linkedin.metadata.kafka.hook.MetadataChangeLogHook;
+import com.linkedin.metadata.utils.metrics.MetricUtils;
+import com.linkedin.mxe.MetadataChangeLog;
+import io.datahubproject.metadata.context.OperationContext;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+
+@Slf4j
+public class MCLKafkaListener {
+  private static final Histogram kafkaLagStats =
+      MetricUtils.get()
+          .histogram(
+              MetricRegistry.name(
+                  "com.linkedin.metadata.kafka.MetadataChangeLogProcessor", "kafkaLag"));
+
+  private final String consumerGroupId;
+  private final List<MetadataChangeLogHook> hooks;
+
+  public MCLKafkaListener(
+      OperationContext systemOperationContext,
+      String consumerGroup,
+      List<MetadataChangeLogHook> hooks) {
+    this.consumerGroupId = consumerGroup;
+    this.hooks = hooks;
+    this.hooks.forEach(hook -> hook.init(systemOperationContext));
+
+    log.info(
+        "Enabled MCL Hooks - Group: {} Hooks: {}",
+        consumerGroup,
+        hooks.stream().map(hook -> hook.getClass().getSimpleName()).collect(Collectors.toList()));
+  }
+
+  public void consume(final ConsumerRecord<String, GenericRecord> consumerRecord) {
+    try (Timer.Context i = MetricUtils.timer(this.getClass(), "consume").time()) {
+      kafkaLagStats.update(System.currentTimeMillis() - consumerRecord.timestamp());
+      final GenericRecord record = consumerRecord.value();
+      log.debug(
+          "Got MCL event consumer: {} key: {}, topic: {}, partition: {}, offset: {}, value size: {}, timestamp: {}",
+          consumerGroupId,
+          consumerRecord.key(),
+          consumerRecord.topic(),
+          consumerRecord.partition(),
+          consumerRecord.offset(),
+          consumerRecord.serializedValueSize(),
+          consumerRecord.timestamp());
+      MetricUtils.counter(this.getClass(), consumerGroupId + "_received_mcl_count").inc();
+
+      MetadataChangeLog event;
+      try {
+        event = EventUtils.avroToPegasusMCL(record);
+      } catch (Exception e) {
+        MetricUtils.counter(
+                this.getClass(), consumerGroupId + "_avro_to_pegasus_conversion_failure")
+            .inc();
+        log.error("Error deserializing message due to: ", e);
+        log.error("Message: {}", record.toString());
+        return;
+      }
+
+      log.info(
+          "Invoking MCL hooks for consumer: {} urn: {}, aspect name: {}, entity type: {}, change type: {}",
+          consumerGroupId,
+          event.getEntityUrn(),
+          event.hasAspectName() ? event.getAspectName() : null,
+          event.hasEntityType() ? event.getEntityType() : null,
+          event.hasChangeType() ? event.getChangeType() : null);
+
+      // Here - plug in additional "custom processor hooks"
+      for (MetadataChangeLogHook hook : this.hooks) {
+        log.info(
+            "Invoking MCL hook {} for urn: {}",
+            hook.getClass().getSimpleName(),
+            event.getEntityUrn());
+        try (Timer.Context ignored =
+            MetricUtils.timer(this.getClass(), hook.getClass().getSimpleName() + "_latency")
+                .time()) {
+          hook.invoke(event);
+        } catch (Exception e) {
+          // Just skip this hook and continue. - Note that this represents "at most once"//
+          // processing.
+          MetricUtils.counter(this.getClass(), hook.getClass().getSimpleName() + "_failure").inc();
+          log.error(
+              "Failed to execute MCL hook with name {}", hook.getClass().getCanonicalName(), e);
+        }
+      }
+      // TODO: Manually commit kafka offsets after full processing.
+      MetricUtils.counter(this.getClass(), consumerGroupId + "_consumed_mcl_count").inc();
+      log.info(
+          "Successfully completed MCL hooks for consumer: {} urn: {}",
+          consumerGroupId,
+          event.getEntityUrn());
+    }
+  }
+}
diff --git a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MCLKafkaListenerRegistrar.java b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MCLKafkaListenerRegistrar.java
new file mode 100644
index 00000000000000..fb2880f617d301
--- /dev/null
+++ b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MCLKafkaListenerRegistrar.java
@@ -0,0 +1,120 @@
+package com.linkedin.metadata.kafka;
+
+import com.linkedin.metadata.kafka.config.MetadataChangeLogProcessorCondition;
+import com.linkedin.metadata.kafka.hook.MetadataChangeLogHook;
+import com.linkedin.mxe.Topics;
+import io.datahubproject.metadata.context.OperationContext;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.kafka.annotation.EnableKafka;
+import org.springframework.kafka.config.KafkaListenerContainerFactory;
+import org.springframework.kafka.config.KafkaListenerEndpoint;
+import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
+import org.springframework.kafka.config.MethodKafkaListenerEndpoint;
+import org.springframework.messaging.handler.annotation.support.DefaultMessageHandlerMethodFactory;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@EnableKafka
+@Component
+@Conditional(MetadataChangeLogProcessorCondition.class)
+public class MCLKafkaListenerRegistrar implements InitializingBean {
+
+  @Autowired
+  @Qualifier("systemOperationContext")
+  private OperationContext systemOperationContext;
+
+  @Autowired private KafkaListenerEndpointRegistry kafkaListenerEndpointRegistry;
+
+  @Autowired
+  @Qualifier("kafkaEventConsumer")
+  private KafkaListenerContainerFactory<?> kafkaListenerContainerFactory;
+
+  @Value("${METADATA_CHANGE_LOG_KAFKA_CONSUMER_GROUP_ID:generic-mae-consumer-job-client}")
+  private String consumerGroupBase;
+
+  @Value("${METADATA_CHANGE_LOG_VERSIONED_TOPIC_NAME:" + Topics.METADATA_CHANGE_LOG_VERSIONED + "}")
+  private String mclVersionedTopicName;
+
+  @Value(
+      "${METADATA_CHANGE_LOG_TIMESERIES_TOPIC_NAME:" + Topics.METADATA_CHANGE_LOG_TIMESERIES + "}")
+  private String mclTimeseriesTopicName;
+
+  @Autowired private List<MetadataChangeLogHook> metadataChangeLogHooks;
+
+  @Override
+  public void afterPropertiesSet() {
+    Map<String, List<MetadataChangeLogHook>> hookGroups =
+        getMetadataChangeLogHooks().stream()
+            .collect(Collectors.groupingBy(MetadataChangeLogHook::getConsumerGroupSuffix));
+
+    log.info(
+        "MetadataChangeLogProcessor Consumer Groups: {}",
+        hookGroups.keySet().stream().map(this::buildConsumerGroupName).collect(Collectors.toSet()));
+
+    hookGroups.forEach(
+        (key, hooks) -> {
+          KafkaListenerEndpoint kafkaListenerEndpoint =
+              createListenerEndpoint(
+                  buildConsumerGroupName(key),
+                  List.of(mclVersionedTopicName, mclTimeseriesTopicName),
+                  hooks);
+          registerMCLKafkaListener(kafkaListenerEndpoint, true);
+        });
+  }
+
+  public List<MetadataChangeLogHook> getMetadataChangeLogHooks() {
+    return metadataChangeLogHooks.stream()
+        .filter(MetadataChangeLogHook::isEnabled)
+        .sorted(Comparator.comparing(MetadataChangeLogHook::executionOrder))
+        .toList();
+  }
+
+  @SneakyThrows
+  public void registerMCLKafkaListener(
+      KafkaListenerEndpoint kafkaListenerEndpoint, boolean startImmediately) {
+    kafkaListenerEndpointRegistry.registerListenerContainer(
+        kafkaListenerEndpoint, kafkaListenerContainerFactory, startImmediately);
+  }
+
+  private KafkaListenerEndpoint createListenerEndpoint(
+      String consumerGroupId, List<String> topics, List<MetadataChangeLogHook> hooks) {
+    MethodKafkaListenerEndpoint<String, GenericRecord> kafkaListenerEndpoint =
+        new MethodKafkaListenerEndpoint<>();
+    kafkaListenerEndpoint.setId(consumerGroupId);
+    kafkaListenerEndpoint.setGroupId(consumerGroupId);
+    kafkaListenerEndpoint.setAutoStartup(true);
+    kafkaListenerEndpoint.setTopics(topics.toArray(new String[topics.size()]));
+    kafkaListenerEndpoint.setMessageHandlerMethodFactory(new DefaultMessageHandlerMethodFactory());
+    kafkaListenerEndpoint.setBean(
+        new MCLKafkaListener(systemOperationContext, consumerGroupId, hooks));
+    try {
+      kafkaListenerEndpoint.setMethod(
+          MCLKafkaListener.class.getMethod("consume", ConsumerRecord.class));
+    } catch (NoSuchMethodException e) {
+      throw new RuntimeException(e);
+    }
+
+    return kafkaListenerEndpoint;
+  }
+
+  private String buildConsumerGroupName(@Nonnull String suffix) {
+    if (suffix.isEmpty()) {
+      return consumerGroupBase;
+    } else {
+      return String.join("-", consumerGroupBase, suffix);
+    }
+  }
+}
diff --git a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeLogProcessor.java b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeLogProcessor.java
deleted file mode 100644
index 6112ad798d73dc..00000000000000
--- a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeLogProcessor.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.linkedin.metadata.kafka;
-
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
-import com.linkedin.gms.factory.kafka.KafkaEventConsumerFactory;
-import com.linkedin.metadata.EventUtils;
-import com.linkedin.metadata.kafka.config.MetadataChangeLogProcessorCondition;
-import com.linkedin.metadata.kafka.hook.MetadataChangeLogHook;
-import com.linkedin.metadata.kafka.hook.UpdateIndicesHook;
-import com.linkedin.metadata.kafka.hook.event.EntityChangeEventGeneratorHook;
-import com.linkedin.metadata.kafka.hook.form.FormAssignmentHook;
-import com.linkedin.metadata.kafka.hook.incident.IncidentsSummaryHook;
-import com.linkedin.metadata.kafka.hook.ingestion.IngestionSchedulerHook;
-import com.linkedin.metadata.kafka.hook.siblings.SiblingAssociationHook;
-import com.linkedin.metadata.utils.metrics.MetricUtils;
-import com.linkedin.mxe.MetadataChangeLog;
-import com.linkedin.mxe.Topics;
-import io.datahubproject.metadata.context.OperationContext;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.avro.generic.GenericRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Import;
-import org.springframework.kafka.annotation.EnableKafka;
-import org.springframework.kafka.annotation.KafkaListener;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-@Conditional(MetadataChangeLogProcessorCondition.class)
-@Import({
-  UpdateIndicesHook.class,
-  IngestionSchedulerHook.class,
-  EntityChangeEventGeneratorHook.class,
-  KafkaEventConsumerFactory.class,
-  SiblingAssociationHook.class,
-  FormAssignmentHook.class,
-  IncidentsSummaryHook.class,
-})
-@EnableKafka
-public class MetadataChangeLogProcessor {
-
-  @Getter private final List<MetadataChangeLogHook> hooks;
-  private final Histogram kafkaLagStats =
-      MetricUtils.get().histogram(MetricRegistry.name(this.getClass(), "kafkaLag"));
-
-  @Autowired
-  public MetadataChangeLogProcessor(
-      @Qualifier("systemOperationContext") OperationContext systemOperationContext,
-      List<MetadataChangeLogHook> metadataChangeLogHooks) {
-    this.hooks =
-        metadataChangeLogHooks.stream()
-            .filter(MetadataChangeLogHook::isEnabled)
-            .sorted(Comparator.comparing(MetadataChangeLogHook::executionOrder))
-            .collect(Collectors.toList());
-    log.info(
-        "Enabled hooks: {}",
-        this.hooks.stream()
-            .map(hook -> hook.getClass().getSimpleName())
-            .collect(Collectors.toList()));
-    this.hooks.forEach(hook -> hook.init(systemOperationContext));
-  }
-
-  @KafkaListener(
-      id = "${METADATA_CHANGE_LOG_KAFKA_CONSUMER_GROUP_ID:generic-mae-consumer-job-client}",
-      topics = {
-        "${METADATA_CHANGE_LOG_VERSIONED_TOPIC_NAME:" + Topics.METADATA_CHANGE_LOG_VERSIONED + "}",
-        "${METADATA_CHANGE_LOG_TIMESERIES_TOPIC_NAME:" + Topics.METADATA_CHANGE_LOG_TIMESERIES + "}"
-      },
-      containerFactory = "kafkaEventConsumer")
-  public void consume(final ConsumerRecord<String, GenericRecord> consumerRecord) {
-    try (Timer.Context i = MetricUtils.timer(this.getClass(), "consume").time()) {
-      kafkaLagStats.update(System.currentTimeMillis() - consumerRecord.timestamp());
-      final GenericRecord record = consumerRecord.value();
-      log.info(
-          "Got MCL event key: {}, topic: {}, partition: {}, offset: {}, value size: {}, timestamp: {}",
-          consumerRecord.key(),
-          consumerRecord.topic(),
-          consumerRecord.partition(),
-          consumerRecord.offset(),
-          consumerRecord.serializedValueSize(),
-          consumerRecord.timestamp());
-      MetricUtils.counter(this.getClass(), "received_mcl_count").inc();
-
-      MetadataChangeLog event;
-      try {
-        event = EventUtils.avroToPegasusMCL(record);
-        log.debug(
-            "Successfully converted Avro MCL to Pegasus MCL. urn: {}, key: {}",
-            event.getEntityUrn(),
-            event.getEntityKeyAspect());
-      } catch (Exception e) {
-        MetricUtils.counter(this.getClass(), "avro_to_pegasus_conversion_failure").inc();
-        log.error("Error deserializing message due to: ", e);
-        log.error("Message: {}", record.toString());
-        return;
-      }
-
-      log.info(
-          "Invoking MCL hooks for urn: {}, aspect name: {}, entity type: {}, change type: {}",
-          event.getEntityUrn(),
-          event.hasAspectName() ? event.getAspectName() : null,
-          event.hasEntityType() ? event.getEntityType() : null,
-          event.hasChangeType() ? event.getChangeType() : null);
-
-      // Here - plug in additional "custom processor hooks"
-      for (MetadataChangeLogHook hook : this.hooks) {
-        if (!hook.isEnabled()) {
-          log.info(String.format("Skipping disabled hook %s", hook.getClass()));
-          continue;
-        }
-        log.info(
-            "Invoking MCL hook {} for urn: {}",
-            hook.getClass().getSimpleName(),
-            event.getEntityUrn());
-        try (Timer.Context ignored =
-            MetricUtils.timer(this.getClass(), hook.getClass().getSimpleName() + "_latency")
-                .time()) {
-          hook.invoke(event);
-        } catch (Exception e) {
-          // Just skip this hook and continue. - Note that this represents "at most once"//
-          // processing.
-          MetricUtils.counter(this.getClass(), hook.getClass().getSimpleName() + "_failure").inc();
-          log.error(
-              "Failed to execute MCL hook with name {}", hook.getClass().getCanonicalName(), e);
-        }
-      }
-      // TODO: Manually commit kafka offsets after full processing.
-      MetricUtils.counter(this.getClass(), "consumed_mcl_count").inc();
-      log.info("Successfully completed MCL hooks for urn: {}", event.getEntityUrn());
-    }
-  }
-}
diff --git a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/MetadataChangeLogHook.java b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/MetadataChangeLogHook.java
index 145d1ded724cc0..876df4279b7b8a 100644
--- a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/MetadataChangeLogHook.java
+++ b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/MetadataChangeLogHook.java
@@ -18,13 +18,19 @@ default MetadataChangeLogHook init(@Nonnull OperationContext systemOperationCont
     return this;
   }
 
+  /**
+   * Suffix for the consumer group
+   *
+   * @return suffix
+   */
+  @Nonnull
+  String getConsumerGroupSuffix();
+
   /**
    * Return whether the hook is enabled or not. If not enabled, the below invoke method is not
    * triggered
    */
-  default boolean isEnabled() {
-    return true;
-  }
+  boolean isEnabled();
 
   /** Invoke the hook when a MetadataChangeLog is received */
   void invoke(@Nonnull MetadataChangeLog log) throws Exception;
diff --git a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/UpdateIndicesHook.java b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/UpdateIndicesHook.java
index a0e304b26ea60f..bd804b0f4424ca 100644
--- a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/UpdateIndicesHook.java
+++ b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/UpdateIndicesHook.java
@@ -2,6 +2,7 @@
 
 import static com.linkedin.metadata.Constants.*;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.linkedin.gms.factory.common.GraphServiceFactory;
 import com.linkedin.gms.factory.common.SystemMetadataServiceFactory;
 import com.linkedin.gms.factory.entityregistry.EntityRegistryFactory;
@@ -12,7 +13,9 @@
 import com.linkedin.mxe.MetadataChangeLog;
 import io.datahubproject.metadata.context.OperationContext;
 import javax.annotation.Nonnull;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Import;
 import org.springframework.stereotype.Component;
@@ -34,15 +37,27 @@ public class UpdateIndicesHook implements MetadataChangeLogHook {
   private final boolean isEnabled;
   private final boolean reprocessUIEvents;
   private OperationContext systemOperationContext;
+  @Getter private final String consumerGroupSuffix;
 
+  @Autowired
   public UpdateIndicesHook(
       UpdateIndicesService updateIndicesService,
       @Nonnull @Value("${updateIndices.enabled:true}") Boolean isEnabled,
       @Nonnull @Value("${featureFlags.preProcessHooks.reprocessEnabled:false}")
-          Boolean reprocessUIEvents) {
+          Boolean reprocessUIEvents,
+      @Nonnull @Value("${updateIndices.consumerGroupSuffix}") String consumerGroupSuffix) {
     this.updateIndicesService = updateIndicesService;
     this.isEnabled = isEnabled;
     this.reprocessUIEvents = reprocessUIEvents;
+    this.consumerGroupSuffix = consumerGroupSuffix;
+  }
+
+  @VisibleForTesting
+  public UpdateIndicesHook(
+      UpdateIndicesService updateIndicesService,
+      @Nonnull Boolean isEnabled,
+      @Nonnull Boolean reprocessUIEvents) {
+    this(updateIndicesService, isEnabled, reprocessUIEvents, "");
   }
 
   @Override
diff --git a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/event/EntityChangeEventGeneratorHook.java b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/event/EntityChangeEventGeneratorHook.java
index 8dc98d77233ceb..de570cc91b2fe7 100644
--- a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/event/EntityChangeEventGeneratorHook.java
+++ b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/event/EntityChangeEventGeneratorHook.java
@@ -1,5 +1,8 @@
 package com.linkedin.metadata.kafka.hook.event;
 
+import static com.linkedin.metadata.Constants.SCHEMA_FIELD_ENTITY_NAME;
+
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.urn.Urn;
@@ -13,6 +16,7 @@
 import com.linkedin.metadata.models.AspectSpec;
 import com.linkedin.metadata.timeline.data.ChangeEvent;
 import com.linkedin.metadata.timeline.eventgenerator.Aspect;
+import com.linkedin.metadata.timeline.eventgenerator.ChangeEventGeneratorUtils;
 import com.linkedin.metadata.timeline.eventgenerator.EntityChangeEventGenerator;
 import com.linkedin.metadata.timeline.eventgenerator.EntityChangeEventGeneratorRegistry;
 import com.linkedin.metadata.utils.GenericRecordUtils;
@@ -29,6 +33,7 @@
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -78,10 +83,13 @@ public class EntityChangeEventGeneratorHook implements MetadataChangeLogHook {
   private static final Set<String> SUPPORTED_OPERATIONS =
       ImmutableSet.of("CREATE", "UPSERT", "DELETE");
 
-  private final EntityChangeEventGeneratorRegistry _entityChangeEventGeneratorRegistry;
+  private static final Set<String> ENTITY_EXCLUSIONS = ImmutableSet.of(SCHEMA_FIELD_ENTITY_NAME);
+
+  private final EntityChangeEventGeneratorRegistry entityChangeEventGeneratorRegistry;
   private final OperationContext systemOperationContext;
-  private final SystemEntityClient _entityClient;
-  private final Boolean _isEnabled;
+  private final SystemEntityClient systemEntityClient;
+  private final Boolean isEnabled;
+  @Getter private final String consumerGroupSuffix;
 
   @Autowired
   public EntityChangeEventGeneratorHook(
@@ -89,17 +97,28 @@ public EntityChangeEventGeneratorHook(
       @Nonnull @Qualifier("entityChangeEventGeneratorRegistry")
           final EntityChangeEventGeneratorRegistry entityChangeEventGeneratorRegistry,
       @Nonnull final SystemEntityClient entityClient,
-      @Nonnull @Value("${entityChangeEvents.enabled:true}") Boolean isEnabled) {
+      @Nonnull @Value("${entityChangeEvents.enabled:true}") Boolean isEnabled,
+      @Nonnull @Value("${entityChangeEvents.consumerGroupSuffix}") String consumerGroupSuffix) {
     this.systemOperationContext = systemOperationContext;
-    _entityChangeEventGeneratorRegistry =
+    this.entityChangeEventGeneratorRegistry =
         Objects.requireNonNull(entityChangeEventGeneratorRegistry);
-    _entityClient = Objects.requireNonNull(entityClient);
-    _isEnabled = isEnabled;
+    this.systemEntityClient = Objects.requireNonNull(entityClient);
+    this.isEnabled = isEnabled;
+    this.consumerGroupSuffix = consumerGroupSuffix;
+  }
+
+  @VisibleForTesting
+  public EntityChangeEventGeneratorHook(
+      @Nonnull OperationContext systemOperationContext,
+      @Nonnull final EntityChangeEventGeneratorRegistry entityChangeEventGeneratorRegistry,
+      @Nonnull final SystemEntityClient entityClient,
+      @Nonnull Boolean isEnabled) {
+    this(systemOperationContext, entityChangeEventGeneratorRegistry, entityClient, isEnabled, "");
   }
 
   @Override
   public boolean isEnabled() {
-    return _isEnabled;
+    return isEnabled;
   }
 
   @Override
@@ -134,7 +153,8 @@ public void invoke(@Nonnull final MetadataChangeLog logEvent) throws Exception {
               : null;
 
       final List<ChangeEvent> changeEvents =
-          generateChangeEvents(
+          ChangeEventGeneratorUtils.generateChangeEvents(
+              entityChangeEventGeneratorRegistry,
               logEvent.getEntityUrn(),
               logEvent.getEntityType(),
               logEvent.getAspectName(),
@@ -166,7 +186,7 @@ private <T extends RecordTemplate> List<ChangeEvent> generateChangeEvents(
       @Nonnull final Aspect to,
       @Nonnull AuditStamp auditStamp) {
     final List<EntityChangeEventGenerator<T>> entityChangeEventGenerators =
-        _entityChangeEventGeneratorRegistry.getEntityChangeEventGenerators(aspectName).stream()
+        entityChangeEventGeneratorRegistry.getEntityChangeEventGenerators(aspectName).stream()
             // Note: Assumes that correct types have been registered for the aspect.
             .map(changeEventGenerator -> (EntityChangeEventGenerator<T>) changeEventGenerator)
             .collect(Collectors.toList());
@@ -181,12 +201,13 @@ private <T extends RecordTemplate> List<ChangeEvent> generateChangeEvents(
 
   private boolean isEligibleForProcessing(final MetadataChangeLog log) {
     return SUPPORTED_OPERATIONS.contains(log.getChangeType().toString())
-        && SUPPORTED_ASPECT_NAMES.contains(log.getAspectName());
+        && SUPPORTED_ASPECT_NAMES.contains(log.getAspectName())
+        && !ENTITY_EXCLUSIONS.contains(log.getEntityType());
   }
 
   private void emitPlatformEvent(
       @Nonnull final PlatformEvent event, @Nonnull final String partitioningKey) throws Exception {
-    _entityClient.producePlatformEvent(
+    systemEntityClient.producePlatformEvent(
         systemOperationContext, Constants.CHANGE_EVENT_PLATFORM_EVENT_NAME, partitioningKey, event);
   }
 
diff --git a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/form/FormAssignmentHook.java b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/form/FormAssignmentHook.java
index 8d093fe0b8a12d..063fa6de92c838 100644
--- a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/form/FormAssignmentHook.java
+++ b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/form/FormAssignmentHook.java
@@ -2,6 +2,7 @@
 
 import static com.linkedin.metadata.Constants.*;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.linkedin.events.metadata.ChangeType;
 import com.linkedin.form.DynamicFormAssignment;
@@ -15,6 +16,7 @@
 import java.util.Objects;
 import java.util.Set;
 import javax.annotation.Nonnull;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -53,17 +55,25 @@ public class FormAssignmentHook implements MetadataChangeLogHook {
       ImmutableSet.of(
           ChangeType.UPSERT, ChangeType.CREATE, ChangeType.CREATE_ENTITY, ChangeType.RESTATE);
 
-  private final FormService _formService;
-  private final boolean _isEnabled;
+  private final FormService formService;
+  private final boolean isEnabled;
 
   private OperationContext systemOperationContext;
+  @Getter private final String consumerGroupSuffix;
 
   @Autowired
   public FormAssignmentHook(
       @Nonnull final FormService formService,
-      @Nonnull @Value("${forms.hook.enabled:true}") Boolean isEnabled) {
-    _formService = Objects.requireNonNull(formService, "formService is required");
-    _isEnabled = isEnabled;
+      @Nonnull @Value("${forms.hook.enabled:true}") Boolean isEnabled,
+      @Nonnull @Value("${forms.hook.consumerGroupSuffix}") String consumerGroupSuffix) {
+    this.formService = Objects.requireNonNull(formService, "formService is required");
+    this.isEnabled = isEnabled;
+    this.consumerGroupSuffix = consumerGroupSuffix;
+  }
+
+  @VisibleForTesting
+  public FormAssignmentHook(@Nonnull final FormService formService, @Nonnull Boolean isEnabled) {
+    this(formService, isEnabled, "");
   }
 
   @Override
@@ -74,12 +84,12 @@ public FormAssignmentHook init(@Nonnull OperationContext systemOperationContext)
 
   @Override
   public boolean isEnabled() {
-    return _isEnabled;
+    return isEnabled;
   }
 
   @Override
   public void invoke(@Nonnull final MetadataChangeLog event) {
-    if (_isEnabled && isEligibleForProcessing(event)) {
+    if (isEnabled && isEligibleForProcessing(event)) {
       if (isFormDynamicFilterUpdated(event)) {
         handleFormFilterUpdated(event);
       }
@@ -96,7 +106,7 @@ private void handleFormFilterUpdated(@Nonnull final MetadataChangeLog event) {
             DynamicFormAssignment.class);
 
     // 2. Register a automation to assign it.
-    _formService.upsertFormAssignmentRunner(
+    formService.upsertFormAssignmentRunner(
         systemOperationContext, event.getEntityUrn(), formFilters);
   }
 
diff --git a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/incident/IncidentsSummaryHook.java b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/incident/IncidentsSummaryHook.java
index 7c03a11a81f7ac..5483fed9116e17 100644
--- a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/incident/IncidentsSummaryHook.java
+++ b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/incident/IncidentsSummaryHook.java
@@ -2,6 +2,7 @@
 
 import static com.linkedin.metadata.Constants.*;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.linkedin.common.IncidentSummaryDetails;
 import com.linkedin.common.IncidentSummaryDetailsArray;
@@ -27,6 +28,7 @@
 import java.util.Objects;
 import java.util.Set;
 import javax.annotation.Nonnull;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -57,20 +59,31 @@ public class IncidentsSummaryHook implements MetadataChangeLogHook {
       ImmutableSet.of(INCIDENT_INFO_ASPECT_NAME, STATUS_ASPECT_NAME);
 
   private OperationContext systemOperationContext;
-  private final IncidentService _incidentService;
-  private final boolean _isEnabled;
+  private final IncidentService incidentService;
+  private final boolean isEnabled;
+  @Getter private final String consumerGroupSuffix;
 
   /** Max number of incidents to allow in incident summary, limited to prevent HTTP errors */
-  private final int _maxIncidentHistory;
+  private final int maxIncidentHistory;
 
   @Autowired
   public IncidentsSummaryHook(
       @Nonnull final IncidentService incidentService,
-      @Nonnull @Value("${incidents.hook.enabled:true}") Boolean isEnabled,
-      @Nonnull @Value("${incidents.hook.maxIncidentHistory:100}") Integer maxIncidentHistory) {
-    _incidentService = Objects.requireNonNull(incidentService, "incidentService is required");
-    _isEnabled = isEnabled;
-    _maxIncidentHistory = maxIncidentHistory;
+      @Nonnull @Value("${incidents.hook.enabled}") Boolean isEnabled,
+      @Nonnull @Value("${incidents.hook.maxIncidentHistory}") Integer maxIncidentHistory,
+      @Nonnull @Value("${incidents.hook.consumerGroupSuffix}") String consumerGroupSuffix) {
+    this.incidentService = Objects.requireNonNull(incidentService, "incidentService is required");
+    this.isEnabled = isEnabled;
+    this.maxIncidentHistory = maxIncidentHistory;
+    this.consumerGroupSuffix = consumerGroupSuffix;
+  }
+
+  @VisibleForTesting
+  public IncidentsSummaryHook(
+      @Nonnull final IncidentService incidentService,
+      @Nonnull Boolean isEnabled,
+      @Nonnull Integer maxIncidentHistory) {
+    this(incidentService, isEnabled, maxIncidentHistory, "");
   }
 
   @Override
@@ -81,12 +94,12 @@ public IncidentsSummaryHook init(@Nonnull OperationContext systemOperationContex
 
   @Override
   public boolean isEnabled() {
-    return _isEnabled;
+    return isEnabled;
   }
 
   @Override
   public void invoke(@Nonnull final MetadataChangeLog event) {
-    if (_isEnabled && isEligibleForProcessing(event)) {
+    if (isEnabled && isEligibleForProcessing(event)) {
       log.debug("Urn {} received by Incident Summary Hook.", event.getEntityUrn());
       final Urn urn = HookUtils.getUrnFromEvent(event, systemOperationContext.getEntityRegistry());
       // Handle the deletion case.
@@ -104,7 +117,7 @@ public void invoke(@Nonnull final MetadataChangeLog event) {
   private void handleIncidentSoftDeleted(@Nonnull final Urn incidentUrn) {
     // 1. Fetch incident info.
     IncidentInfo incidentInfo =
-        _incidentService.getIncidentInfo(systemOperationContext, incidentUrn);
+        incidentService.getIncidentInfo(systemOperationContext, incidentUrn);
 
     // 2. Retrieve associated urns.
     if (incidentInfo != null) {
@@ -127,7 +140,7 @@ private void handleIncidentSoftDeleted(@Nonnull final Urn incidentUrn) {
   private void handleIncidentUpdated(@Nonnull final Urn incidentUrn) {
     // 1. Fetch incident info + status
     IncidentInfo incidentInfo =
-        _incidentService.getIncidentInfo(systemOperationContext, incidentUrn);
+        incidentService.getIncidentInfo(systemOperationContext, incidentUrn);
 
     // 2. Retrieve associated urns.
     if (incidentInfo != null) {
@@ -179,14 +192,14 @@ private void addIncidentToSummary(
       IncidentsSummaryUtils.removeIncidentFromResolvedSummary(incidentUrn, summary);
 
       // Then, add to active.
-      IncidentsSummaryUtils.addIncidentToActiveSummary(details, summary, _maxIncidentHistory);
+      IncidentsSummaryUtils.addIncidentToActiveSummary(details, summary, maxIncidentHistory);
 
     } else if (IncidentState.RESOLVED.equals(status.getState())) {
       // First, ensure this isn't in any summaries anymore.
       IncidentsSummaryUtils.removeIncidentFromActiveSummary(incidentUrn, summary);
 
       // Then, add to resolved.
-      IncidentsSummaryUtils.addIncidentToResolvedSummary(details, summary, _maxIncidentHistory);
+      IncidentsSummaryUtils.addIncidentToResolvedSummary(details, summary, maxIncidentHistory);
     }
 
     // 3. Emit the change back!
@@ -196,7 +209,7 @@ private void addIncidentToSummary(
   @Nonnull
   private IncidentsSummary getIncidentsSummary(@Nonnull final Urn entityUrn) {
     IncidentsSummary maybeIncidentsSummary =
-        _incidentService.getIncidentsSummary(systemOperationContext, entityUrn);
+        incidentService.getIncidentsSummary(systemOperationContext, entityUrn);
     return maybeIncidentsSummary == null
         ? new IncidentsSummary()
             .setResolvedIncidentDetails(new IncidentSummaryDetailsArray())
@@ -260,7 +273,7 @@ private boolean isIncidentUpdate(@Nonnull final MetadataChangeLog event) {
   private void updateIncidentSummary(
       @Nonnull final Urn entityUrn, @Nonnull final IncidentsSummary newSummary) {
     try {
-      _incidentService.updateIncidentsSummary(systemOperationContext, entityUrn, newSummary);
+      incidentService.updateIncidentsSummary(systemOperationContext, entityUrn, newSummary);
     } catch (Exception e) {
       log.error(
           String.format(
diff --git a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/ingestion/IngestionSchedulerHook.java b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/ingestion/IngestionSchedulerHook.java
index c13f0f75708f74..5569fade7e6eb1 100644
--- a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/ingestion/IngestionSchedulerHook.java
+++ b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/ingestion/IngestionSchedulerHook.java
@@ -15,6 +15,7 @@
 import com.linkedin.mxe.MetadataChangeLog;
 import io.datahubproject.metadata.context.OperationContext;
 import javax.annotation.Nonnull;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -29,27 +30,36 @@
 @Component
 @Import({EntityRegistryFactory.class, IngestionSchedulerFactory.class})
 public class IngestionSchedulerHook implements MetadataChangeLogHook {
-  private final IngestionScheduler _scheduler;
-  private final boolean _isEnabled;
+  private final IngestionScheduler scheduler;
+  private final boolean isEnabled;
   private OperationContext systemOperationContext;
+  @Getter private final String consumerGroupSuffix;
 
   @Autowired
   public IngestionSchedulerHook(
       @Nonnull final IngestionScheduler scheduler,
-      @Nonnull @Value("${ingestionScheduler.enabled:true}") Boolean isEnabled) {
-    _scheduler = scheduler;
-    _isEnabled = isEnabled;
+      @Nonnull @Value("${ingestionScheduler.enabled:true}") Boolean isEnabled,
+      @Nonnull @Value("${ingestionScheduler.consumerGroupSuffix}") String consumerGroupSuffix) {
+    this.scheduler = scheduler;
+    this.isEnabled = isEnabled;
+    this.consumerGroupSuffix = consumerGroupSuffix;
+  }
+
+  @VisibleForTesting
+  public IngestionSchedulerHook(
+      @Nonnull final IngestionScheduler scheduler, @Nonnull Boolean isEnabled) {
+    this(scheduler, isEnabled, "");
   }
 
   @Override
   public boolean isEnabled() {
-    return _isEnabled;
+    return isEnabled;
   }
 
   @Override
   public IngestionSchedulerHook init(@Nonnull OperationContext systemOperationContext) {
     this.systemOperationContext = systemOperationContext;
-    _scheduler.init();
+    scheduler.init();
     return this;
   }
 
@@ -66,11 +76,11 @@ public void invoke(@Nonnull MetadataChangeLog event) {
       final Urn urn = getUrnFromEvent(event);
 
       if (ChangeType.DELETE.equals(event.getChangeType())) {
-        _scheduler.unscheduleNextIngestionSourceExecution(urn);
+        scheduler.unscheduleNextIngestionSourceExecution(urn);
       } else {
         // Update the scheduler to reflect the latest changes.
         final DataHubIngestionSourceInfo info = getInfoFromEvent(event);
-        _scheduler.scheduleNextIngestionSourceExecution(urn, info);
+        scheduler.scheduleNextIngestionSourceExecution(urn, info);
       }
     }
   }
@@ -138,6 +148,6 @@ private DataHubIngestionSourceInfo getInfoFromEvent(final MetadataChangeLog even
 
   @VisibleForTesting
   IngestionScheduler scheduler() {
-    return _scheduler;
+    return scheduler;
   }
 }
diff --git a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/siblings/SiblingAssociationHook.java b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/siblings/SiblingAssociationHook.java
index f068679da7757e..bbe0feed7de115 100644
--- a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/siblings/SiblingAssociationHook.java
+++ b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/hook/siblings/SiblingAssociationHook.java
@@ -41,6 +41,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
+import lombok.Getter;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,17 +71,28 @@ public class SiblingAssociationHook implements MetadataChangeLogHook {
 
   private final SystemEntityClient systemEntityClient;
   private final EntitySearchService entitySearchService;
-  private final boolean _isEnabled;
+  private final boolean isEnabled;
   private OperationContext systemOperationContext;
+  @Getter private final String consumerGroupSuffix;
 
   @Autowired
   public SiblingAssociationHook(
       @Nonnull final SystemEntityClient systemEntityClient,
       @Nonnull final EntitySearchService searchService,
-      @Nonnull @Value("${siblings.enabled:true}") Boolean isEnabled) {
+      @Nonnull @Value("${siblings.enabled:true}") Boolean isEnabled,
+      @Nonnull @Value("${siblings.consumerGroupSuffix}") String consumerGroupSuffix) {
     this.systemEntityClient = systemEntityClient;
     entitySearchService = searchService;
-    _isEnabled = isEnabled;
+    this.isEnabled = isEnabled;
+    this.consumerGroupSuffix = consumerGroupSuffix;
+  }
+
+  @VisibleForTesting
+  public SiblingAssociationHook(
+      @Nonnull final SystemEntityClient systemEntityClient,
+      @Nonnull final EntitySearchService searchService,
+      @Nonnull Boolean isEnabled) {
+    this(systemEntityClient, searchService, isEnabled, "");
   }
 
   @Value("${siblings.enabled:false}")
@@ -99,7 +111,7 @@ public SiblingAssociationHook init(@Nonnull OperationContext systemOperationCont
 
   @Override
   public boolean isEnabled() {
-    return _isEnabled;
+    return isEnabled;
   }
 
   @Override
diff --git a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/UpdateIndicesHookTest.java b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/UpdateIndicesHookTest.java
index 411fe02260bb1b..9f6734852bd252 100644
--- a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/UpdateIndicesHookTest.java
+++ b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/UpdateIndicesHookTest.java
@@ -4,6 +4,7 @@
 import static com.linkedin.metadata.kafka.hook.MCLProcessingTestDataGenerator.*;
 import static com.linkedin.metadata.search.utils.QueryUtils.newRelationshipFilter;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
 
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.InputField;
@@ -47,6 +48,7 @@
 import com.linkedin.metadata.systemmetadata.SystemMetadataService;
 import com.linkedin.metadata.timeseries.TimeseriesAspectService;
 import com.linkedin.metadata.utils.GenericRecordUtils;
+import com.linkedin.metadata.utils.elasticsearch.IndexConventionImpl;
 import com.linkedin.mxe.MetadataChangeLog;
 import com.linkedin.mxe.SystemMetadata;
 import com.linkedin.schema.NumberType;
@@ -113,11 +115,12 @@ public void setupTest() {
     mockConfigurationProvider = Mockito.mock(ConfigurationProvider.class);
     mockEntityIndexBuilders = Mockito.mock(EntityIndexBuilders.class);
 
+    when(mockEntityIndexBuilders.getIndexConvention()).thenReturn(IndexConventionImpl.noPrefix(""));
+
     ElasticSearchConfiguration elasticSearchConfiguration = new ElasticSearchConfiguration();
     SystemUpdateConfiguration systemUpdateConfiguration = new SystemUpdateConfiguration();
     systemUpdateConfiguration.setWaitForSystemUpdate(false);
-    Mockito.when(mockConfigurationProvider.getElasticSearch())
-        .thenReturn(elasticSearchConfiguration);
+    when(mockConfigurationProvider.getElasticSearch()).thenReturn(elasticSearchConfiguration);
     updateIndicesService =
         new UpdateIndicesService(
             mockGraphService,
@@ -125,7 +128,8 @@ public void setupTest() {
             mockTimeseriesAspectService,
             mockSystemMetadataService,
             searchDocumentTransformer,
-            mockEntityIndexBuilders);
+            mockEntityIndexBuilders,
+            "MD5");
 
     OperationContext systemOperationContext =
         TestOperationContexts.systemContextNoSearchAuthorization();
@@ -235,7 +239,8 @@ public void testInputFieldsEdgesAreAdded() throws Exception {
             mockTimeseriesAspectService,
             mockSystemMetadataService,
             searchDocumentTransformer,
-            mockEntityIndexBuilders);
+            mockEntityIndexBuilders,
+            "MD5");
 
     updateIndicesHook = new UpdateIndicesHook(updateIndicesService, true, false);
     updateIndicesHook.init(
@@ -483,32 +488,27 @@ private EntityRegistry createMockEntityRegistry() {
     AspectSpec aspectSpec = createMockAspectSpec(InputFields.class, InputFields.dataSchema());
     AspectSpec upstreamLineageAspectSpec =
         createMockAspectSpec(UpstreamLineage.class, UpstreamLineage.dataSchema());
-    Mockito.when(mockEntityRegistry.getEntitySpec(Constants.CHART_ENTITY_NAME))
-        .thenReturn(entitySpec);
-    Mockito.when(mockEntityRegistry.getEntitySpec(Constants.DATASET_ENTITY_NAME))
-        .thenReturn(entitySpec);
-    Mockito.when(mockEntityRegistry.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME)).thenReturn(entitySpec);
-    Mockito.when(mockEntityRegistry.getEntitySpec(DATA_PLATFORM_ENTITY_NAME))
-        .thenReturn(entitySpec);
-    Mockito.when(entitySpec.getAspectSpec(Constants.INPUT_FIELDS_ASPECT_NAME))
-        .thenReturn(aspectSpec);
-    Mockito.when(entitySpec.getAspectSpec(Constants.UPSTREAM_LINEAGE_ASPECT_NAME))
+    when(mockEntityRegistry.getEntitySpec(Constants.CHART_ENTITY_NAME)).thenReturn(entitySpec);
+    when(mockEntityRegistry.getEntitySpec(Constants.DATASET_ENTITY_NAME)).thenReturn(entitySpec);
+    when(mockEntityRegistry.getEntitySpec(SCHEMA_FIELD_ENTITY_NAME)).thenReturn(entitySpec);
+    when(mockEntityRegistry.getEntitySpec(DATA_PLATFORM_ENTITY_NAME)).thenReturn(entitySpec);
+    when(entitySpec.getAspectSpec(Constants.INPUT_FIELDS_ASPECT_NAME)).thenReturn(aspectSpec);
+    when(entitySpec.getAspectSpec(Constants.UPSTREAM_LINEAGE_ASPECT_NAME))
         .thenReturn(upstreamLineageAspectSpec);
-    Mockito.when(aspectSpec.isTimeseries()).thenReturn(false);
-    Mockito.when(aspectSpec.getName()).thenReturn(Constants.INPUT_FIELDS_ASPECT_NAME);
-    Mockito.when(upstreamLineageAspectSpec.isTimeseries()).thenReturn(false);
-    Mockito.when(upstreamLineageAspectSpec.getName())
-        .thenReturn(Constants.UPSTREAM_LINEAGE_ASPECT_NAME);
+    when(aspectSpec.isTimeseries()).thenReturn(false);
+    when(aspectSpec.getName()).thenReturn(Constants.INPUT_FIELDS_ASPECT_NAME);
+    when(upstreamLineageAspectSpec.isTimeseries()).thenReturn(false);
+    when(upstreamLineageAspectSpec.getName()).thenReturn(Constants.UPSTREAM_LINEAGE_ASPECT_NAME);
     AspectSpec chartKeyAspectSpec = createMockAspectSpec(ChartKey.class, ChartKey.dataSchema());
-    Mockito.when(entitySpec.getKeyAspectSpec()).thenReturn(chartKeyAspectSpec);
+    when(entitySpec.getKeyAspectSpec()).thenReturn(chartKeyAspectSpec);
     return mockEntityRegistry;
   }
 
   private <T extends RecordTemplate> AspectSpec createMockAspectSpec(
       Class<T> clazz, RecordDataSchema schema) {
     AspectSpec mockSpec = Mockito.mock(AspectSpec.class);
-    Mockito.when(mockSpec.getDataTemplateClass()).thenReturn((Class<RecordTemplate>) clazz);
-    Mockito.when(mockSpec.getPegasusSchema()).thenReturn(schema);
+    when(mockSpec.getDataTemplateClass()).thenReturn((Class<RecordTemplate>) clazz);
+    when(mockSpec.getPegasusSchema()).thenReturn(schema);
     return mockSpec;
   }
 
diff --git a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/event/EntityChangeEventGeneratorHookTest.java b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/event/EntityChangeEventGeneratorHookTest.java
index b06b7df1846bde..3897d663c96818 100644
--- a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/event/EntityChangeEventGeneratorHookTest.java
+++ b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/event/EntityChangeEventGeneratorHookTest.java
@@ -309,11 +309,16 @@ public void testInvokeEntityOwnerChange() throws Exception {
     final Ownership newOwners = new Ownership();
     final Urn ownerUrn1 = Urn.createFromString("urn:li:corpuser:test1");
     final Urn ownerUrn2 = Urn.createFromString("urn:li:corpuser:test2");
+    final Urn ownerUrn3 = Urn.createFromString("urn:li:corpuser:test3");
     newOwners.setOwners(
         new OwnerArray(
             ImmutableList.of(
                 new Owner().setOwner(ownerUrn1).setType(OwnershipType.TECHNICAL_OWNER),
-                new Owner().setOwner(ownerUrn2).setType(OwnershipType.BUSINESS_OWNER))));
+                new Owner().setOwner(ownerUrn2).setType(OwnershipType.BUSINESS_OWNER),
+                new Owner()
+                    .setOwner(ownerUrn3)
+                    .setType(OwnershipType.CUSTOM)
+                    .setTypeUrn(Urn.createFromString("urn:li:ownershipType:my_custom_type")))));
     final Ownership prevOwners = new Ownership();
     prevOwners.setOwners(new OwnerArray());
     event.setAspect(GenericRecordUtils.serializeAspect(newOwners));
@@ -354,7 +359,24 @@ public void testInvokeEntityOwnerChange() throws Exception {
                 "ownerType",
                 OwnershipType.BUSINESS_OWNER.toString()),
             actorUrn);
-    verifyProducePlatformEvent(_mockClient, platformEvent2, true);
+    verifyProducePlatformEvent(_mockClient, platformEvent2, false);
+
+    PlatformEvent platformEvent3 =
+        createChangeEvent(
+            DATASET_ENTITY_NAME,
+            Urn.createFromString(TEST_DATASET_URN),
+            ChangeCategory.OWNER,
+            ChangeOperation.ADD,
+            ownerUrn3.toString(),
+            ImmutableMap.of(
+                "ownerUrn",
+                ownerUrn3.toString(),
+                "ownerType",
+                OwnershipType.CUSTOM.toString(),
+                "ownerTypeUrn",
+                "urn:li:ownershipType:my_custom_type"),
+            actorUrn);
+    verifyProducePlatformEvent(_mockClient, platformEvent3, true);
   }
 
   @Test
diff --git a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLGMSSpringTest.java b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLGMSSpringTest.java
index c2a8de161eafe1..10f149e6062957 100644
--- a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLGMSSpringTest.java
+++ b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLGMSSpringTest.java
@@ -3,7 +3,7 @@
 import static org.testng.AssertJUnit.*;
 
 import com.linkedin.gms.factory.config.ConfigurationProvider;
-import com.linkedin.metadata.kafka.MetadataChangeLogProcessor;
+import com.linkedin.metadata.kafka.MCLKafkaListenerRegistrar;
 import com.linkedin.metadata.kafka.hook.UpdateIndicesHook;
 import com.linkedin.metadata.kafka.hook.event.EntityChangeEventGeneratorHook;
 import com.linkedin.metadata.kafka.hook.incident.IncidentsSummaryHook;
@@ -35,23 +35,23 @@ public class MCLGMSSpringTest extends AbstractTestNGSpringContextTests {
 
   @Test
   public void testHooks() {
-    MetadataChangeLogProcessor metadataChangeLogProcessor =
-        applicationContext.getBean(MetadataChangeLogProcessor.class);
+    MCLKafkaListenerRegistrar registrar =
+        applicationContext.getBean(MCLKafkaListenerRegistrar.class);
     assertTrue(
-        metadataChangeLogProcessor.getHooks().stream()
+        registrar.getMetadataChangeLogHooks().stream()
             .noneMatch(hook -> hook instanceof IngestionSchedulerHook));
     assertTrue(
-        metadataChangeLogProcessor.getHooks().stream()
+        registrar.getMetadataChangeLogHooks().stream()
             .anyMatch(hook -> hook instanceof UpdateIndicesHook));
     assertTrue(
-        metadataChangeLogProcessor.getHooks().stream()
+        registrar.getMetadataChangeLogHooks().stream()
             .anyMatch(hook -> hook instanceof SiblingAssociationHook));
     assertTrue(
-        metadataChangeLogProcessor.getHooks().stream()
+        registrar.getMetadataChangeLogHooks().stream()
             .anyMatch(hook -> hook instanceof EntityChangeEventGeneratorHook));
     assertEquals(
         1,
-        metadataChangeLogProcessor.getHooks().stream()
+        registrar.getMetadataChangeLogHooks().stream()
             .filter(hook -> hook instanceof IncidentsSummaryHook)
             .count());
   }
diff --git a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLMAESpringTest.java b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLMAESpringTest.java
index 23de7707cc571d..2049e974999b18 100644
--- a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLMAESpringTest.java
+++ b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLMAESpringTest.java
@@ -4,7 +4,7 @@
 import static org.testng.AssertJUnit.assertTrue;
 
 import com.linkedin.gms.factory.config.ConfigurationProvider;
-import com.linkedin.metadata.kafka.MetadataChangeLogProcessor;
+import com.linkedin.metadata.kafka.MCLKafkaListenerRegistrar;
 import com.linkedin.metadata.kafka.hook.UpdateIndicesHook;
 import com.linkedin.metadata.kafka.hook.event.EntityChangeEventGeneratorHook;
 import com.linkedin.metadata.kafka.hook.incident.IncidentsSummaryHook;
@@ -33,23 +33,23 @@ public class MCLMAESpringTest extends AbstractTestNGSpringContextTests {
 
   @Test
   public void testHooks() {
-    MetadataChangeLogProcessor metadataChangeLogProcessor =
-        applicationContext.getBean(MetadataChangeLogProcessor.class);
+    MCLKafkaListenerRegistrar registrar =
+        applicationContext.getBean(MCLKafkaListenerRegistrar.class);
     assertTrue(
-        metadataChangeLogProcessor.getHooks().stream()
+        registrar.getMetadataChangeLogHooks().stream()
             .noneMatch(hook -> hook instanceof IngestionSchedulerHook));
     assertTrue(
-        metadataChangeLogProcessor.getHooks().stream()
+        registrar.getMetadataChangeLogHooks().stream()
             .anyMatch(hook -> hook instanceof UpdateIndicesHook));
     assertTrue(
-        metadataChangeLogProcessor.getHooks().stream()
+        registrar.getMetadataChangeLogHooks().stream()
             .anyMatch(hook -> hook instanceof SiblingAssociationHook));
     assertTrue(
-        metadataChangeLogProcessor.getHooks().stream()
+        registrar.getMetadataChangeLogHooks().stream()
             .anyMatch(hook -> hook instanceof EntityChangeEventGeneratorHook));
     assertEquals(
         1,
-        metadataChangeLogProcessor.getHooks().stream()
+        registrar.getMetadataChangeLogHooks().stream()
             .filter(hook -> hook instanceof IncidentsSummaryHook)
             .count());
   }
diff --git a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringCommonTestConfiguration.java b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringCommonTestConfiguration.java
index f6f71a12a6951f..68768051eccad0 100644
--- a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringCommonTestConfiguration.java
+++ b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringCommonTestConfiguration.java
@@ -34,10 +34,13 @@
 @ComponentScan(
     basePackages = {
       "com.linkedin.metadata.kafka",
-      "com.linkedin.gms.factory.kafka.common",
-      "com.linkedin.gms.factory.kafka.schemaregistry",
+      "com.linkedin.gms.factory.kafka",
       "com.linkedin.gms.factory.entity.update.indices",
-      "com.linkedin.gms.factory.timeline.eventgenerator"
+      "com.linkedin.gms.factory.timeline.eventgenerator",
+      "com.linkedin.metadata.dao.producer",
+      "com.linkedin.gms.factory.change",
+      "com.datahub.event.hook",
+      "com.linkedin.gms.factory.notifications"
     })
 public class MCLSpringCommonTestConfiguration {
 
diff --git a/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/PlatformEventProcessor.java b/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/PlatformEventProcessor.java
index c4116b314254ca..358a2ac0c2ee33 100644
--- a/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/PlatformEventProcessor.java
+++ b/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/PlatformEventProcessor.java
@@ -3,9 +3,7 @@
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
-import com.datahub.event.hook.BusinessAttributeUpdateHook;
 import com.datahub.event.hook.PlatformEventHook;
-import com.linkedin.gms.factory.kafka.KafkaEventConsumerFactory;
 import com.linkedin.metadata.EventUtils;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import com.linkedin.mxe.PlatformEvent;
@@ -21,7 +19,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Import;
 import org.springframework.kafka.annotation.EnableKafka;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Component;
@@ -29,7 +26,6 @@
 @Slf4j
 @Component
 @Conditional(PlatformEventProcessorCondition.class)
-@Import({BusinessAttributeUpdateHook.class, KafkaEventConsumerFactory.class})
 @EnableKafka
 public class PlatformEventProcessor {
 
@@ -49,6 +45,11 @@ public PlatformEventProcessor(
         platformEventHooks.stream()
             .filter(PlatformEventHook::isEnabled)
             .collect(Collectors.toList());
+    log.info(
+        "Enabled platform hooks: {}",
+        this.hooks.stream()
+            .map(hook -> hook.getClass().getSimpleName())
+            .collect(Collectors.toList()));
     this.hooks.forEach(PlatformEventHook::init);
   }
 
diff --git a/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/hook/PlatformEventHook.java b/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/hook/PlatformEventHook.java
index 37241861f2e5e6..7fcc2a07b950bf 100644
--- a/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/hook/PlatformEventHook.java
+++ b/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/hook/PlatformEventHook.java
@@ -20,9 +20,7 @@ default void init() {}
    * Return whether the hook is enabled or not. If not enabled, the below invoke method is not
    * triggered
    */
-  default boolean isEnabled() {
-    return true;
-  }
+  boolean isEnabled();
 
   /** Invoke the hook when a PlatformEvent is received */
   void invoke(@Nonnull OperationContext opContext, @Nonnull PlatformEvent event);
diff --git a/metadata-models/src/main/pegasus/com/linkedin/common/Documentation.pdl b/metadata-models/src/main/pegasus/com/linkedin/common/Documentation.pdl
new file mode 100644
index 00000000000000..7ac3d2612077b9
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/common/Documentation.pdl
@@ -0,0 +1,32 @@
+namespace com.linkedin.common
+
+/**
+ * Aspect used for storing all applicable documentations on assets.
+ * This aspect supports multiple documentations from different sources.
+ * There is an implicit assumption that there is only one documentation per
+   source.
+ * For example, if there are two documentations from the same source, the
+   latest one will overwrite the previous one.
+ * If there are two documentations from different sources, both will be
+   stored.
+  * Future evolution considerations:
+  * The first entity that uses this aspect is Schema Field. We will expand this
+    aspect to other entities eventually.
+  * The values of the documentation are not currently searchable. This will be
+    changed once this aspect develops opinion on which documentation entry is
+    the authoritative one.
+  * Ensuring that there is only one documentation per source is a business
+    rule that is not enforced by the aspect yet. This will currently be enforced by the
+    application that uses this aspect. We will eventually enforce this rule in
+    the aspect using AspectMutators.
+ */
+@Aspect = {
+  "name": "documentation"
+}
+record Documentation {
+
+  /**
+   * Documentations associated with this asset. We could be receiving docs from different sources
+   */
+  documentations: array[DocumentationAssociation]
+}
diff --git a/metadata-models/src/main/pegasus/com/linkedin/common/DocumentationAssociation.pdl b/metadata-models/src/main/pegasus/com/linkedin/common/DocumentationAssociation.pdl
new file mode 100644
index 00000000000000..19404346797bb0
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/common/DocumentationAssociation.pdl
@@ -0,0 +1,30 @@
+namespace com.linkedin.common
+
+/**
+ * Properties of applied documentation including the attribution of the doc
+ */
+record DocumentationAssociation {
+ /**
+  * Description of this asset
+  */
+  documentation: string
+
+  /**
+   * Information about who, why, and how this metadata was applied
+   */
+  @Searchable = {
+    "/time": {
+        "fieldName": "documentationAttributionDates",
+        "fieldType": "DATETIME"
+      },
+    "/actor": {
+        "fieldName": "documentationAttributionActors",
+        "fieldType": "URN"
+      },
+    "/source": {
+        "fieldName": "documentationAttributionSources",
+        "fieldType": "URN"
+      },
+  }
+  attribution: optional MetadataAttribution
+}
diff --git a/metadata-models/src/main/pegasus/com/linkedin/common/GlossaryTermAssociation.pdl b/metadata-models/src/main/pegasus/com/linkedin/common/GlossaryTermAssociation.pdl
index 80dc07981816aa..a5267bbc635e43 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/common/GlossaryTermAssociation.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/common/GlossaryTermAssociation.pdl
@@ -30,4 +30,23 @@ record GlossaryTermAssociation {
    */
   context: optional string
 
+  /**
+   * Information about who, why, and how this metadata was applied
+   */
+  @Searchable = {
+    "/time": {
+        "fieldName": "termAttributionDates",
+        "fieldType": "DATETIME"
+      },
+    "/actor": {
+        "fieldName": "termAttributionActors",
+        "fieldType": "URN"
+      },
+    "/source": {
+        "fieldName": "termAttributionSources",
+        "fieldType": "URN"
+      },
+  }
+  attribution: optional MetadataAttribution
+
 }
diff --git a/metadata-models/src/main/pegasus/com/linkedin/common/MetadataAttribution.pdl b/metadata-models/src/main/pegasus/com/linkedin/common/MetadataAttribution.pdl
new file mode 100644
index 00000000000000..4691ed6323ea18
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/common/MetadataAttribution.pdl
@@ -0,0 +1,29 @@
+namespace com.linkedin.common
+
+/**
+ * Information about who, why, and how this metadata was applied
+ */
+record MetadataAttribution {
+  /**
+   * When this metadata was updated.
+   */
+  time: Time
+
+  /**
+   * The entity (e.g. a member URN) responsible for applying the assocated metadata. This can
+   * either be a user (in case of UI edits) or the datahub system for automation.
+   */
+  actor: Urn
+
+  /**
+   * The DataHub source responsible for applying the associated metadata. This will only be filled out
+   * when a DataHub source is responsible. This includes the specific metadata test urn, the automation urn.
+   */
+  source: optional Urn
+
+  /**
+   * The details associated with why this metadata was applied. For example, this could include
+   * the actual regex rule, sql statement, ingestion pipeline ID, etc.
+   */
+  sourceDetail: map[string, string] = { }
+}
diff --git a/metadata-models/src/main/pegasus/com/linkedin/common/TagAssociation.pdl b/metadata-models/src/main/pegasus/com/linkedin/common/TagAssociation.pdl
index 904371fb7b49e1..8a58ca97de1956 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/common/TagAssociation.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/common/TagAssociation.pdl
@@ -14,4 +14,23 @@ record TagAssociation {
    * Additional context about the association
    */
   context: optional string
+
+  /**
+   * Information about who, why, and how this metadata was applied
+   */
+  @Searchable = {
+    "/time": {
+        "fieldName": "tagAttributionDates",
+        "fieldType": "DATETIME"
+      },
+    "/actor": {
+        "fieldName": "tagAttributionActors",
+        "fieldType": "URN"
+      },
+    "/source": {
+        "fieldName": "tagAttributionSources",
+        "fieldType": "URN"
+      },
+  }
+  attribution: optional MetadataAttribution
 }
diff --git a/metadata-models/src/main/pegasus/com/linkedin/dataproduct/DataProductAssociation.pdl b/metadata-models/src/main/pegasus/com/linkedin/dataproduct/DataProductAssociation.pdl
index 93bd9a4e0e5610..bb43695427c636 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/dataproduct/DataProductAssociation.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/dataproduct/DataProductAssociation.pdl
@@ -7,4 +7,9 @@ import com.linkedin.common.Edge
  **/
 record DataProductAssociation includes Edge {
 
+    /**
+    * If set to true, this asset is an output port of the Data Product.
+    */
+    outputPort: boolean = false
+
 }
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl
index 939231d2d4738d..48e0bfb26227fb 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl
@@ -19,4 +19,13 @@ record EditableDatasetProperties includes ChangeAuditStamps {
     "fieldName": "editedDescription",
   }
   description: optional string
+
+  /**
+   * Editable display name of the Dataset
+   */
+  @Searchable = {
+    "fieldType": "TEXT_PARTIAL",
+    "fieldName": "editedName",
+  }
+  name: optional string
 }
diff --git a/metadata-models/src/main/pegasus/com/linkedin/dataset/PartitionSummary.pdl b/metadata-models/src/main/pegasus/com/linkedin/dataset/PartitionSummary.pdl
new file mode 100644
index 00000000000000..da126fa7d83d77
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/dataset/PartitionSummary.pdl
@@ -0,0 +1,22 @@
+namespace com.linkedin.dataset
+
+/**
+ * Defines how the data is partitioned
+ */
+record PartitionSummary {
+    /**
+    * A unique id / value for the partition for which statistics were collected,
+    * generated by applying the key definition to a given row.
+    */
+    partition: string
+
+    /**
+     * The created time for a given partition.
+     */
+    createdTime: optional long
+
+    /**
+     * The last modified / touched time for a given partition.
+     */
+    lastModifiedTime: optional long
+}
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/dataset/PartitionsSummary.pdl b/metadata-models/src/main/pegasus/com/linkedin/dataset/PartitionsSummary.pdl
new file mode 100644
index 00000000000000..34e696890d64ff
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/dataset/PartitionsSummary.pdl
@@ -0,0 +1,19 @@
+namespace com.linkedin.dataset
+
+/**
+ * Defines how the data is partitioned for Data Lake tables (e.g. Hive, S3, Iceberg, Delta, Hudi, etc).
+ */
+@Aspect = {
+  "name": "partitionsSummary"
+}
+record PartitionsSummary {
+    /**
+    * The minimum partition as ordered
+    */
+    minPartition: optional PartitionSummary
+
+    /**
+    * The maximum partition as ordered
+    */
+    maxPartition: optional PartitionSummary
+}
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/domain/DomainProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/domain/DomainProperties.pdl
index eb307b726855db..2d93d9399bf722 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/domain/DomainProperties.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/domain/DomainProperties.pdl
@@ -26,6 +26,10 @@ record DomainProperties includes CustomProperties {
   /**
    * Description of the Domain
    */
+   @Searchable = {
+    "fieldType": "TEXT",
+    "hasValuesFieldName": "hasDescription"
+  }
   description: optional string
 
   /**
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/key/DataHubActionKey.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/key/DataHubActionKey.pdl
new file mode 100644
index 00000000000000..8205ecbb807168
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/key/DataHubActionKey.pdl
@@ -0,0 +1,14 @@
+namespace com.linkedin.metadata.key
+
+/**
+ * Key for a DataHub Action Pipeline
+ */
+@Aspect = {
+  "name": "dataHubActionKey"
+}
+record DataHubActionKey {
+  /**
+   * A unique id for the Action, either generated or provided
+   */
+  id: string
+}
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/search/SearchEntity.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/search/SearchEntity.pdl
index df457c1ba26f99..046c076dd151df 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/metadata/search/SearchEntity.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/search/SearchEntity.pdl
@@ -35,4 +35,9 @@ record SearchEntity {
    * If the key aspect is present, assume ALL aspects should be restricted including the entity's Urn.
    */
   restrictedAspects: optional array[string]
+
+   /**
+    * Extra fields from the search document based on what is requested in the search request
+    */
+   extraFields: optional map[string, string]
 }
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/post/PostInfo.pdl b/metadata-models/src/main/pegasus/com/linkedin/post/PostInfo.pdl
index 7eb080653e9c33..70ff38f3b7633c 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/post/PostInfo.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/post/PostInfo.pdl
@@ -1,5 +1,8 @@
 namespace com.linkedin.post
 
+import com.linkedin.common.Urn
+import com.linkedin.common.AuditStamp
+
 /**
  * Information about a DataHub Post.
  */
@@ -32,4 +35,24 @@ record PostInfo {
     "fieldType": "COUNT"
   }
   lastModified: long
+
+  /**
+   * The audit stamp at which the request was last updated
+   */
+  @Searchable = {
+    "/time": {
+        "fieldName": "created",
+        "fieldType": "COUNT"
+      }
+  }
+  auditStamp: optional AuditStamp
+
+  /**
+   * Optional URN that the post is associated with.
+   */
+  @Relationship = {
+    "name": "PostTarget",
+    "entityTypes": [ "dataset", "schemaField", "chart", "dashboard", "dataFlow", "dataJob", "dataProduct" ]
+  }
+  target: optional Urn
 }
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/schema/EditableSchemaFieldInfo.pdl b/metadata-models/src/main/pegasus/com/linkedin/schema/EditableSchemaFieldInfo.pdl
index 4e6e135ae05da5..816277bd1e0c96 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/schema/EditableSchemaFieldInfo.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/schema/EditableSchemaFieldInfo.pdl
@@ -36,7 +36,19 @@ record EditableSchemaFieldInfo {
       "fieldName": "editedFieldTags",
       "fieldType": "URN",
       "boostScore": 0.5
-    }
+    },
+    "/tags/*/attribution/time": {
+        "fieldName": "editedFieldTagAttributionDates",
+        "fieldType": "DATETIME"
+      },
+    "/tags/*/attribution/actor": {
+        "fieldName": "editedFieldTagAttributionActors",
+        "fieldType": "URN"
+      },
+    "/tags/*/attribution/source": {
+        "fieldName": "editedFieldTagAttributionSources",
+        "fieldType": "URN"
+      },
   }
   globalTags: optional GlobalTags
 
@@ -54,7 +66,19 @@ record EditableSchemaFieldInfo {
       "fieldName": "editedFieldGlossaryTerms",
       "fieldType": "URN",
       "boostScore": 0.5
-    }
+    },
+    "/terms/*/attribution/time": {
+        "fieldName": "editedFieldTermAttributionDates",
+        "fieldType": "DATETIME"
+      },
+    "/terms/*/attribution/actor": {
+        "fieldName": "editedFieldTermAttributionActors",
+        "fieldType": "URN"
+      },
+    "/terms/*/attribution/source": {
+        "fieldName": "editedFieldTermAttributionSources",
+        "fieldType": "URN"
+      },
   }
   glossaryTerms: optional GlossaryTerms
 }
diff --git a/metadata-models/src/main/pegasus/com/linkedin/schema/SchemaField.pdl b/metadata-models/src/main/pegasus/com/linkedin/schema/SchemaField.pdl
index 4874d1081bc263..f91e2004401cf9 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/schema/SchemaField.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/schema/SchemaField.pdl
@@ -96,7 +96,19 @@ record SchemaField {
       "fieldName": "fieldTags",
       "fieldType": "URN",
       "boostScore": 0.5
-    }
+    },
+    "/tags/*/attribution/time": {
+        "fieldName": "fieldTagAttributionDates",
+        "fieldType": "DATETIME"
+      },
+    "/tags/*/attribution/actor": {
+        "fieldName": "fieldTagAttributionActors",
+        "fieldType": "URN"
+      },
+    "/tags/*/attribution/source": {
+        "fieldName": "fieldTagAttributionSources",
+        "fieldType": "URN"
+      },
   }
   globalTags: optional GlobalTags
 
@@ -114,7 +126,19 @@ record SchemaField {
       "fieldName": "fieldGlossaryTerms",
       "fieldType": "URN",
       "boostScore": 0.5
-    }
+    },
+    "/terms/*/attribution/time": {
+        "fieldName": "fieldTermAttributionDates",
+        "fieldType": "DATETIME"
+      },
+    "/terms/*/attribution/actor": {
+        "fieldName": "fieldTermAttributionActors",
+        "fieldType": "URN"
+      },
+    "/terms/*/attribution/source": {
+        "fieldName": "fieldTermAttributionSources",
+        "fieldType": "URN"
+      },
   }
   glossaryTerms: optional GlossaryTerms
 
@@ -126,6 +150,8 @@ record SchemaField {
 
   /**
    * For Datasets which are partitioned, this determines the partitioning key.
+   * Note that multiple columns can be part of a partitioning key, but currently we do not support
+   * rendering the ordered partitioning key.
    */
   isPartitioningKey: optional boolean
 
diff --git a/metadata-models/src/main/pegasus/com/linkedin/schemafield/schemaFieldAliases.pdl b/metadata-models/src/main/pegasus/com/linkedin/schemafield/schemaFieldAliases.pdl
new file mode 100644
index 00000000000000..d735ef6305d549
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/schemafield/schemaFieldAliases.pdl
@@ -0,0 +1,22 @@
+namespace com.linkedin.schemafield
+
+import com.linkedin.common.Urn
+
+@Aspect = {
+   "name": "schemaFieldAliases"
+}
+
+record SchemaFieldAliases {
+
+    /**
+    * Used to store aliases
+    */
+    @Searchable = {
+        "/*": {
+            "fieldName": "schemaFieldAliases",
+            "fieldType": "URN",
+            "queryByDefault": false,
+        }
+    }
+    aliases: optional array[Urn]
+}
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/schemafield/schemafieldInfo.pdl b/metadata-models/src/main/pegasus/com/linkedin/schemafield/schemafieldInfo.pdl
index 086d9df34deadd..b29ca928765986 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/schemafield/schemafieldInfo.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/schemafield/schemafieldInfo.pdl
@@ -1,5 +1,7 @@
 namespace com.linkedin.schemafield
 
+import com.linkedin.common.Urn
+
 @Aspect = {
    "name": "schemafieldInfo"
 }
@@ -8,6 +10,17 @@ record SchemaFieldInfo {
     @Searchable = {
         "fieldType": "KEYWORD",
         "fieldNameAliases": [ "_entityName" ]
-      }
-      name: optional string
+    }
+    name: optional string
+
+    /**
+    * Used to store field path variations for the schemaField urn.
+    */
+    @Searchable = {
+        "/*": {
+            "fieldType": "URN",
+            "queryByDefault": true,
+        }
+    }
+    schemaFieldAliases: optional array[Urn]
 }
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/settings/global/DocPropagationFeatureSettings.pdl b/metadata-models/src/main/pegasus/com/linkedin/settings/global/DocPropagationFeatureSettings.pdl
new file mode 100644
index 00000000000000..9838184734d862
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/settings/global/DocPropagationFeatureSettings.pdl
@@ -0,0 +1,8 @@
+namespace com.linkedin.settings.global
+
+
+record DocPropagationFeatureSettings includes FeatureSettings {
+    
+    columnPropagationEnabled: boolean = true
+    
+}
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/settings/global/FeatureSettings.pdl b/metadata-models/src/main/pegasus/com/linkedin/settings/global/FeatureSettings.pdl
new file mode 100644
index 00000000000000..dbc82c8e71a6ba
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/settings/global/FeatureSettings.pdl
@@ -0,0 +1,22 @@
+namespace com.linkedin.settings.global
+
+/**
+ * A standardized settings template for a feature.
+ */
+
+record FeatureSettings {
+
+    enabled: boolean
+
+    /**
+     * The configuration for the feature, in JSON format.
+    */
+    config: optional string
+
+    /**
+     * The version of the configuration schema that has been used to serialize
+       the config.
+     * If not provided, the version is assumed to be the latest version.
+     */
+     configVersion: optional string
+}
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/settings/global/GlobalSettingsInfo.pdl b/metadata-models/src/main/pegasus/com/linkedin/settings/global/GlobalSettingsInfo.pdl
index 91dca1de0c452e..6c6f4d0036ce03 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/settings/global/GlobalSettingsInfo.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/settings/global/GlobalSettingsInfo.pdl
@@ -12,8 +12,17 @@ record GlobalSettingsInfo {
    * SSO integrations between DataHub and identity providers
    */
   sso: optional SsoSettings
+
   /**
    * Settings related to the Views Feature
    */
    views: optional GlobalViewsSettings
+
+  /**
+   * Settings related to the documentation propagation feature
+   */
+   docPropagation: optional DocPropagationFeatureSettings = {
+        "enabled": true
+        "columnPropagationEnabled": true
+   }
 }
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/test/TestResult.pdl b/metadata-models/src/main/pegasus/com/linkedin/test/TestResult.pdl
index 11c4aa944fa4f4..5f90f038d44756 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/test/TestResult.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/test/TestResult.pdl
@@ -1,6 +1,7 @@
 namespace com.linkedin.test
 
 import com.linkedin.common.Urn
+import com.linkedin.common.AuditStamp
 
 /**
  * Information about a Test Result
@@ -24,4 +25,15 @@ record TestResult {
       */
       FAILURE
     }
-}
\ No newline at end of file
+
+    /**
+    * The md5 of the test definition that was used to compute this result.
+    * See TestInfo.testDefinition.md5 for more information.
+    */
+    testDefinitionMd5: optional string
+
+    /**
+    * The audit stamp of when the result was computed, including the actor who computed it.
+    */
+    lastComputed: optional AuditStamp
+}
diff --git a/metadata-models/src/main/pegasus/com/linkedin/timeseries/PartitionSpec.pdl b/metadata-models/src/main/pegasus/com/linkedin/timeseries/PartitionSpec.pdl
index 084af1513ec807..146a285e24dbab 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/timeseries/PartitionSpec.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/timeseries/PartitionSpec.pdl
@@ -1,24 +1,28 @@
 namespace com.linkedin.timeseries
 
 /**
- * Defines how the data is partitioned
+ * A reference to a specific partition in a dataset.
  */
 record PartitionSpec {
-
-  type: enum PartitionType {
-          FULL_TABLE,
-          QUERY,
-          PARTITION            
-      } = "PARTITION"
-      
   /**
-   * String representation of the partition
+   * A unique id / value for the partition for which statistics were collected,
+   * generated by applying the key definition to a given row.
    */
   @TimeseriesField = {}
   partition: string
 
   /**
-   * Time window of the partition if applicable
+   * Time window of the partition, if we are able to extract it from the partition key.
    */
   timePartition: optional TimeWindow
+
+  /**
+   * Unused!
+   */
+  @deprecated
+  type: enum PartitionType {
+          FULL_TABLE,
+          QUERY,
+          PARTITION
+      } = "PARTITION"
 }
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/upgrade/DataHubUpgradeResult.pdl b/metadata-models/src/main/pegasus/com/linkedin/upgrade/DataHubUpgradeResult.pdl
index fc5becba979411..c9c08270c29b02 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/upgrade/DataHubUpgradeResult.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/upgrade/DataHubUpgradeResult.pdl
@@ -8,6 +8,11 @@ namespace com.linkedin.upgrade
 }
 record DataHubUpgradeResult {
 
+    /**
+     * Upgrade state  UpgradeResult.Result
+     */
+    state: optional DataHubUpgradeState = "SUCCEEDED"
+
     /**
      * Timestamp when we started this DataHubUpgrade
      */
diff --git a/metadata-models/src/main/pegasus/com/linkedin/upgrade/DataHubUpgradeState.pdl b/metadata-models/src/main/pegasus/com/linkedin/upgrade/DataHubUpgradeState.pdl
new file mode 100644
index 00000000000000..d620f29f3d882e
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/upgrade/DataHubUpgradeState.pdl
@@ -0,0 +1,23 @@
+namespace com.linkedin.upgrade
+
+enum DataHubUpgradeState {
+    /**
+     * Upgrade in progress.
+     */
+    IN_PROGRESS
+
+    /**
+     * Upgrade was successful.
+     */
+    SUCCEEDED
+
+    /**
+     * Upgrade with an error state, however the upgrade should be re-run.
+     */
+    FAILED
+
+    /**
+     * Upgrade with an error state and should not be re-run.
+     */
+    ABORTED
+}
\ No newline at end of file
diff --git a/metadata-models/src/main/resources/entity-registry.yml b/metadata-models/src/main/resources/entity-registry.yml
index 6006ca179d162c..7beb08a6b1032f 100644
--- a/metadata-models/src/main/resources/entity-registry.yml
+++ b/metadata-models/src/main/resources/entity-registry.yml
@@ -45,6 +45,7 @@ entities:
       - access
       - structuredProperties
       - forms
+      - partitionsSummary
   - name: dataHubPolicy
     doc: DataHub Policies represent access policies granted to users or groups on metadata operations like edit, view etc.
     category: internal
@@ -74,6 +75,7 @@ entities:
       - forms
       - subTypes
       - incidentsSummary
+      - testResults
   - name: dataFlow
     category: core
     keyAspect: dataFlowKey
@@ -95,12 +97,14 @@ entities:
       - incidentsSummary
       - forms
       - subTypes
+      - testResults
   - name: dataProcess
     keyAspect: dataProcessKey
     aspects:
       - dataProcessInfo
       - ownership
       - status
+      - testResults
   - name: dataProcessInstance
     doc: DataProcessInstance represents an instance of a datajob/jobflow run
     keyAspect: dataProcessInstanceKey
@@ -111,6 +115,7 @@ entities:
       - dataProcessInstanceRelationships
       - dataProcessInstanceRunEvent
       - status
+      - testResults
   - name: chart
     category: core
     keyAspect: chartKey
@@ -136,6 +141,7 @@ entities:
       - structuredProperties
       - incidentsSummary
       - forms
+      - testResults
   - name: dashboard
     keyAspect: dashboardKey
     aspects:
@@ -159,6 +165,7 @@ entities:
       - structuredProperties
       - incidentsSummary
       - forms
+      - testResults
   - name: notebook
     doc: Notebook represents a combination of query, text, chart and etc. This is in BETA version
     keyAspect: notebookKey
@@ -176,6 +183,7 @@ entities:
       - subTypes
       - dataPlatformInstance
       - browsePathsV2
+      - testResults
   - name: corpuser
     doc: CorpUser represents an identity of a person (or an account) in the enterprise.
     keyAspect: corpUserKey
@@ -193,6 +201,7 @@ entities:
       - roleMembership
       - structuredProperties
       - forms
+      - testResults
   - name: corpGroup
     doc: CorpGroup represents an identity of a group of users in the enterprise.
     keyAspect: corpGroupKey
@@ -206,6 +215,7 @@ entities:
       - roleMembership
       - structuredProperties
       - forms
+      - testResults
   - name: domain
     doc: A data domain within an organization.
     category: core
@@ -216,6 +226,7 @@ entities:
       - ownership
       - structuredProperties
       - forms
+      - testResults
   - name: container
     doc: A container of related data assets.
     category: core
@@ -236,6 +247,7 @@ entities:
       - browsePathsV2
       - structuredProperties
       - forms
+      - testResults
   - name: tag
     category: core
     keyAspect: tagKey
@@ -244,6 +256,7 @@ entities:
       - ownership
       - deprecation
       - status
+      - testResults
   - name: glossaryTerm
     category: core
     keyAspect: glossaryTermKey
@@ -259,6 +272,7 @@ entities:
       - browsePaths
       - structuredProperties
       - forms
+      - testResults
   - name: glossaryNode
     category: core
     keyAspect: glossaryNodeKey
@@ -269,6 +283,7 @@ entities:
       - status
       - structuredProperties
       - forms
+      - testResults
   - name: dataHubIngestionSource
     category: internal
     keyAspect: dataHubIngestionSourceKey
@@ -340,6 +355,7 @@ entities:
       - browsePathsV2
       - structuredProperties
       - forms
+      - testResults
   - name: mlModelGroup
     category: core
     keyAspect: mlModelGroupKey
@@ -357,6 +373,7 @@ entities:
       - browsePathsV2
       - structuredProperties
       - forms
+      - testResults
   - name: mlModelDeployment
     category: core
     keyAspect: mlModelDeploymentKey
@@ -367,6 +384,7 @@ entities:
       - deprecation
       - globalTags
       - dataPlatformInstance
+      - testResults
   - name: mlFeatureTable
     category: core
     keyAspect: mlFeatureTableKey
@@ -385,6 +403,7 @@ entities:
       - browsePathsV2
       - structuredProperties
       - forms
+      - testResults
   - name: mlFeature
     category: core
     keyAspect: mlFeatureKey
@@ -403,6 +422,7 @@ entities:
       - browsePathsV2
       - structuredProperties
       - forms
+      - testResults
   - name: mlPrimaryKey
     category: core
     keyAspect: mlPrimaryKeyKey
@@ -419,6 +439,7 @@ entities:
       - dataPlatformInstance
       - structuredProperties
       - forms
+      - testResults
   - name: telemetry
     category: internal
     keyAspect: telemetryKey
@@ -454,6 +475,10 @@ entities:
       - structuredProperties
       - forms
       - businessAttributes
+      - status
+      - schemaFieldAliases
+      - documentation
+      - testResults
   - name: globalSettings
     doc: Global settings for an the platform
     category: internal
@@ -521,6 +546,7 @@ entities:
       - status
       - structuredProperties
       - forms
+      - testResults
   - name: ownershipType
     doc: Ownership Type represents a user-created ownership category for a person or group who is responsible for an asset.
     category: core
@@ -548,6 +574,10 @@ entities:
     keyAspect: dataHubPersonaKey
     aspects:
       - dataHubPersonaInfo
+  - name: dataHubAction
+    category: internal
+    keyAspect: dataHubActionKey
+    aspects: []
   - name: entityType
     doc: A type of entity in the DataHub Metadata Model.
     category: core
@@ -644,6 +674,12 @@ plugins:
           aspectName: propertyDefinition
         - entityName: structuredProperty
           aspectName: structuredPropertyKey
+    - className: 'com.linkedin.metadata.aspect.plugins.hooks.MCPSideEffect'
+      enabled: true
+      spring:
+        enabled: true
+      packageScan:
+        - com.linkedin.gms.factory.plugins
   mutationHooks:
     - className: 'com.linkedin.metadata.structuredproperties.hooks.StructuredPropertiesSoftDelete'
       packageScan:
@@ -670,4 +706,4 @@ plugins:
       spring:
         enabled: true
       packageScan:
-        - com.linkedin.gms.factory.plugins
\ No newline at end of file
+        - com.linkedin.gms.factory.plugins
diff --git a/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/SearchContext.java b/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/SearchContext.java
index c067e91c3524cf..5ad7bdc14820c3 100644
--- a/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/SearchContext.java
+++ b/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/SearchContext.java
@@ -21,7 +21,7 @@
 public class SearchContext implements ContextInterface {
 
   public static SearchContext EMPTY =
-      SearchContext.builder().indexConvention(IndexConventionImpl.NO_PREFIX).build();
+      SearchContext.builder().indexConvention(IndexConventionImpl.noPrefix("")).build();
 
   public static SearchContext withFlagDefaults(
       @Nonnull SearchContext searchContext,
diff --git a/metadata-operation-context/src/main/java/io/datahubproject/metadata/services/SecretService.java b/metadata-operation-context/src/main/java/io/datahubproject/metadata/services/SecretService.java
index bea03235abfb4c..48e7f80173cfde 100644
--- a/metadata-operation-context/src/main/java/io/datahubproject/metadata/services/SecretService.java
+++ b/metadata-operation-context/src/main/java/io/datahubproject/metadata/services/SecretService.java
@@ -50,7 +50,7 @@ public String encrypt(String value) {
       } catch (NoSuchAlgorithmException e) {
         e.printStackTrace();
       }
-      Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+      Cipher cipher = Cipher.getInstance("AES");
       cipher.init(Cipher.ENCRYPT_MODE, secretKey);
       return _encoder.encodeToString(cipher.doFinal(value.getBytes(StandardCharsets.UTF_8)));
     } catch (Exception e) {
@@ -72,7 +72,7 @@ public String decrypt(String encryptedValue) {
       } catch (NoSuchAlgorithmException e) {
         e.printStackTrace();
       }
-      Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5PADDING");
+      Cipher cipher = Cipher.getInstance("AES");
       cipher.init(Cipher.DECRYPT_MODE, secretKey);
       return new String(cipher.doFinal(_decoder.decode(encryptedValue)));
     } catch (Exception e) {
diff --git a/metadata-operation-context/src/main/java/io/datahubproject/test/metadata/context/TestOperationContexts.java b/metadata-operation-context/src/main/java/io/datahubproject/test/metadata/context/TestOperationContexts.java
index e54c040fe13b58..76f58fb4751085 100644
--- a/metadata-operation-context/src/main/java/io/datahubproject/test/metadata/context/TestOperationContexts.java
+++ b/metadata-operation-context/src/main/java/io/datahubproject/test/metadata/context/TestOperationContexts.java
@@ -191,7 +191,7 @@ public static OperationContext systemContext(
     IndexConvention indexConvention =
         Optional.ofNullable(indexConventionSupplier)
             .map(Supplier::get)
-            .orElse(IndexConventionImpl.NO_PREFIX);
+            .orElse(IndexConventionImpl.noPrefix("MD5"));
 
     ServicesRegistryContext servicesRegistryContext =
         Optional.ofNullable(servicesRegistrySupplier).orElse(() -> null).get();
diff --git a/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/SearchContextTest.java b/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/SearchContextTest.java
index 4858bb342258a5..ba955af9a113da 100644
--- a/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/SearchContextTest.java
+++ b/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/SearchContextTest.java
@@ -12,26 +12,26 @@ public class SearchContextTest {
   @Test
   public void searchContextId() {
     SearchContext testNoFlags =
-        SearchContext.builder().indexConvention(IndexConventionImpl.NO_PREFIX).build();
+        SearchContext.builder().indexConvention(IndexConventionImpl.noPrefix("MD5")).build();
 
     assertEquals(
         testNoFlags.getCacheKeyComponent(),
         SearchContext.builder()
-            .indexConvention(IndexConventionImpl.NO_PREFIX)
+            .indexConvention(IndexConventionImpl.noPrefix("MD5"))
             .build()
             .getCacheKeyComponent(),
         "Expected consistent context ids across instances");
 
     SearchContext testWithFlags =
         SearchContext.builder()
-            .indexConvention(IndexConventionImpl.NO_PREFIX)
+            .indexConvention(IndexConventionImpl.noPrefix("MD5"))
             .searchFlags(new SearchFlags().setFulltext(true))
             .build();
 
     assertEquals(
         testWithFlags.getCacheKeyComponent(),
         SearchContext.builder()
-            .indexConvention(IndexConventionImpl.NO_PREFIX)
+            .indexConvention(IndexConventionImpl.noPrefix("MD5"))
             .searchFlags(new SearchFlags().setFulltext(true))
             .build()
             .getCacheKeyComponent(),
@@ -44,7 +44,7 @@ public void searchContextId() {
     assertNotEquals(
         testWithFlags.getCacheKeyComponent(),
         SearchContext.builder()
-            .indexConvention(IndexConventionImpl.NO_PREFIX)
+            .indexConvention(IndexConventionImpl.noPrefix("MD5"))
             .searchFlags(new SearchFlags().setFulltext(true).setIncludeRestricted(true))
             .build()
             .getCacheKeyComponent(),
@@ -53,7 +53,12 @@ public void searchContextId() {
     assertNotEquals(
         testNoFlags.getCacheKeyComponent(),
         SearchContext.builder()
-            .indexConvention(new IndexConventionImpl("Some Prefix"))
+            .indexConvention(
+                new IndexConventionImpl(
+                    IndexConventionImpl.IndexConventionConfig.builder()
+                        .prefix("Some Prefix")
+                        .hashIdAlgo("MD5")
+                        .build()))
             .searchFlags(null)
             .build()
             .getCacheKeyComponent(),
@@ -61,7 +66,7 @@ public void searchContextId() {
 
     assertNotEquals(
         SearchContext.builder()
-            .indexConvention(IndexConventionImpl.NO_PREFIX)
+            .indexConvention(IndexConventionImpl.noPrefix("MD5"))
             .searchFlags(
                 new SearchFlags()
                     .setFulltext(false)
@@ -70,7 +75,7 @@ public void searchContextId() {
             .build()
             .getCacheKeyComponent(),
         SearchContext.builder()
-            .indexConvention(IndexConventionImpl.NO_PREFIX)
+            .indexConvention(IndexConventionImpl.noPrefix("MD5"))
             .searchFlags(new SearchFlags().setFulltext(true).setIncludeRestricted(true))
             .build()
             .getCacheKeyComponent(),
@@ -80,7 +85,7 @@ public void searchContextId() {
   @Test
   public void testImmutableSearchFlags() {
     SearchContext initial =
-        SearchContext.builder().indexConvention(IndexConventionImpl.NO_PREFIX).build();
+        SearchContext.builder().indexConvention(IndexConventionImpl.noPrefix("MD5")).build();
     assertEquals(initial.getSearchFlags(), new SearchFlags().setSkipCache(false));
 
     SearchContext mutated = initial.withFlagDefaults(flags -> flags.setSkipCache(true));
diff --git a/metadata-service/auth-filter/src/main/java/com/datahub/auth/authentication/filter/AuthenticationFilter.java b/metadata-service/auth-filter/src/main/java/com/datahub/auth/authentication/filter/AuthenticationFilter.java
index dd68e4d36f14e4..ee2efd2ae95365 100644
--- a/metadata-service/auth-filter/src/main/java/com/datahub/auth/authentication/filter/AuthenticationFilter.java
+++ b/metadata-service/auth-filter/src/main/java/com/datahub/auth/authentication/filter/AuthenticationFilter.java
@@ -92,7 +92,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
           "Failed to authenticate request. Received an AuthenticationExpiredException from authenticator chain.",
           e);
       ((HttpServletResponse) response)
-          .sendError(HttpServletResponse.SC_UNAUTHORIZED, e.getMessage());
+          .sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized to perform this action.");
       return;
     }
 
diff --git a/metadata-service/auth-impl/src/main/java/com/datahub/authentication/post/PostService.java b/metadata-service/auth-impl/src/main/java/com/datahub/authentication/post/PostService.java
index f5cb5edb608e06..63e5fcb2c4bbdc 100644
--- a/metadata-service/auth-impl/src/main/java/com/datahub/authentication/post/PostService.java
+++ b/metadata-service/auth-impl/src/main/java/com/datahub/authentication/post/PostService.java
@@ -2,6 +2,7 @@
 
 import static com.linkedin.metadata.Constants.*;
 import static com.linkedin.metadata.entity.AspectUtils.*;
+import static com.linkedin.metadata.utils.SystemMetadataUtils.createDefaultSystemMetadata;
 
 import com.linkedin.common.Media;
 import com.linkedin.common.MediaType;
@@ -63,10 +64,11 @@ public PostContent mapPostContent(
   }
 
   public boolean createPost(
-      @Nonnull OperationContext opCcontext,
+      @Nonnull OperationContext opContext,
       @Nonnull String postType,
-      @Nonnull PostContent postContent)
-      throws RemoteInvocationException {
+      @Nonnull PostContent postContent,
+      @Nullable String targetUrn)
+      throws RemoteInvocationException, URISyntaxException {
     final String uuid = UUID.randomUUID().toString();
     final PostKey postKey = new PostKey().setId(uuid);
     final long currentTimeMillis = Instant.now().toEpochMilli();
@@ -75,11 +77,28 @@ public boolean createPost(
             .setType(PostType.valueOf(postType))
             .setContent(postContent)
             .setCreated(currentTimeMillis)
+            .setAuditStamp(
+                new com.linkedin.common.AuditStamp()
+                    .setTime(currentTimeMillis)
+                    .setActor(
+                        Urn.createFromString(
+                            opContext.getSessionAuthentication().getActor().toUrnStr())))
             .setLastModified(currentTimeMillis);
 
+    if (targetUrn != null) {
+      try {
+        postInfo.setTarget(Urn.createFromString(targetUrn));
+      } catch (URISyntaxException e) {
+        throw new RuntimeException(e);
+      }
+    }
+
     final MetadataChangeProposal proposal =
         buildMetadataChangeProposal(POST_ENTITY_NAME, postKey, POST_INFO_ASPECT_NAME, postInfo);
-    _entityClient.ingestProposal(opCcontext, proposal);
+
+    proposal.setSystemMetadata(createDefaultSystemMetadata());
+
+    _entityClient.ingestProposal(opContext, proposal);
 
     return true;
   }
diff --git a/metadata-service/auth-impl/src/test/java/com/datahub/authentication/post/PostServiceTest.java b/metadata-service/auth-impl/src/test/java/com/datahub/authentication/post/PostServiceTest.java
index a4f7ad6cd6780e..1028e28ed1624f 100644
--- a/metadata-service/auth-impl/src/test/java/com/datahub/authentication/post/PostServiceTest.java
+++ b/metadata-service/auth-impl/src/test/java/com/datahub/authentication/post/PostServiceTest.java
@@ -18,11 +18,13 @@
 import com.linkedin.r2.RemoteInvocationException;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.test.metadata.context.TestOperationContexts;
+import java.net.URISyntaxException;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class PostServiceTest {
   private static final Urn POST_URN = UrnUtils.getUrn("urn:li:post:123");
+  private static final Urn ENTITY_URN = UrnUtils.getUrn("urn:li:domain:123");
   private static final MediaType POST_MEDIA_TYPE = MediaType.IMAGE;
   private static final String POST_MEDIA_LOCATION =
       "https://datahubproject.io/img/datahub-logo-color-light-horizontal.svg";
@@ -69,8 +71,8 @@ public void testMapPostContent() {
   }
 
   @Test
-  public void testCreatePost() throws RemoteInvocationException {
-    _postService.createPost(opContext, POST_TYPE.toString(), POST_CONTENT);
+  public void testCreatePost() throws RemoteInvocationException, URISyntaxException {
+    _postService.createPost(opContext, POST_TYPE.toString(), POST_CONTENT, ENTITY_URN.toString());
     verify(_entityClient, times(1)).ingestProposal(any(OperationContext.class), any());
   }
 
diff --git a/metadata-service/auth-servlet-impl/src/main/java/com/datahub/auth/authentication/AuthServiceController.java b/metadata-service/auth-servlet-impl/src/main/java/com/datahub/auth/authentication/AuthServiceController.java
index 71eaca71a3641a..de2582af00a932 100644
--- a/metadata-service/auth-servlet-impl/src/main/java/com/datahub/auth/authentication/AuthServiceController.java
+++ b/metadata-service/auth-servlet-impl/src/main/java/com/datahub/auth/authentication/AuthServiceController.java
@@ -123,7 +123,7 @@ CompletableFuture<ResponseEntity<String>> generateSessionTokenForUser(
     try {
       bodyJson = mapper.readTree(jsonStr);
     } catch (JsonProcessingException e) {
-      log.error("Failed to parse json while attempting to generate session token {}", jsonStr, e);
+      log.error("Failed to parse json while attempting to generate session token ", e);
       return CompletableFuture.completedFuture(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
     }
     if (bodyJson == null) {
@@ -238,7 +238,7 @@ CompletableFuture<ResponseEntity<String>> signUp(final HttpEntity<String> httpEn
           try {
             Urn inviteTokenUrn = _inviteTokenService.getInviteTokenUrn(inviteTokenString);
             if (!_inviteTokenService.isInviteTokenValid(systemOperationContext, inviteTokenUrn)) {
-              log.error("Invalid invite token {}", inviteTokenString);
+              log.error("Invalid invite token");
               return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
             }
 
@@ -386,7 +386,7 @@ CompletableFuture<ResponseEntity<String>> track(final HttpEntity<String> httpEnt
     try {
       bodyJson = mapper.readTree(jsonStr);
     } catch (JsonProcessingException e) {
-      log.error("Failed to parse json while attempting to track analytics event {}", jsonStr);
+      log.error("Failed to parse json while attempting to track analytics event", e);
       return CompletableFuture.completedFuture(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
     }
     if (bodyJson == null) {
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java b/metadata-service/configuration/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java
similarity index 94%
rename from datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java
rename to metadata-service/configuration/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java
index 85a2c09ed79a71..167515a13c4da2 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java
+++ b/metadata-service/configuration/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java
@@ -21,5 +21,6 @@ public class FeatureFlags {
   private boolean schemaFieldEntityFetchEnabled = false;
   private boolean businessAttributeEntityEnabled = false;
   private boolean dataContractsEnabled = false;
+  private boolean editableDatasetNameEnabled = false;
   private boolean showSeparateSiblings = false;
 }
diff --git a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/DataHubAppConfiguration.java b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/DataHubAppConfiguration.java
new file mode 100644
index 00000000000000..28cc9304bf913f
--- /dev/null
+++ b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/DataHubAppConfiguration.java
@@ -0,0 +1,57 @@
+package com.linkedin.metadata.config;
+
+import com.linkedin.datahub.graphql.featureflags.FeatureFlags;
+import com.linkedin.metadata.config.cache.CacheConfiguration;
+import com.linkedin.metadata.config.kafka.KafkaConfiguration;
+import com.linkedin.metadata.config.search.ElasticSearchConfiguration;
+import com.linkedin.metadata.config.telemetry.TelemetryConfiguration;
+import lombok.Data;
+
+@Data
+public class DataHubAppConfiguration {
+
+  /** Ingestion related configs */
+  private IngestionConfiguration ingestion;
+
+  /** Telemetry related configs */
+  private TelemetryConfiguration telemetry;
+
+  /** Viz related configs */
+  private VisualConfiguration visualConfig;
+
+  /** Tests related configs */
+  private TestsConfiguration metadataTests;
+
+  /** DataHub top-level server configurations */
+  private DataHubConfiguration datahub;
+
+  /** Views feature related configs */
+  private ViewsConfiguration views;
+
+  /** Feature flags indicating what is turned on vs turned off */
+  private FeatureFlags featureFlags;
+
+  /** Kafka related configs. */
+  private KafkaConfiguration kafka;
+
+  /** ElasticSearch configurations */
+  private ElasticSearchConfiguration elasticSearch;
+
+  /** System Update configurations */
+  private SystemUpdateConfiguration systemUpdate;
+
+  /** The base URL where DataHub is hosted. */
+  private String baseUrl;
+
+  /** Configuration for caching */
+  private CacheConfiguration cache;
+
+  /** Ebean related configuration */
+  private EbeanConfiguration ebean;
+
+  /** GraphQL Configurations */
+  private GraphQLConfiguration graphQL;
+
+  /** MCP throttling configuration */
+  private MetadataChangeProposalConfig metadataChangeProposal;
+}
diff --git a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/MetadataChangeProposalConfig.java b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/MetadataChangeProposalConfig.java
index 3d3808bc5feb45..f988758beee363 100644
--- a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/MetadataChangeProposalConfig.java
+++ b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/MetadataChangeProposalConfig.java
@@ -8,6 +8,7 @@
 public class MetadataChangeProposalConfig {
 
   ThrottlesConfig throttle;
+  SideEffectsConfig sideEffects;
 
   @Data
   @Accessors(chain = true)
@@ -27,4 +28,16 @@ public static class ThrottleConfig {
     Integer multiplier;
     Integer maxIntervalMs;
   }
+
+  @Data
+  @Accessors(chain = true)
+  public static class SideEffectsConfig {
+    SideEffectConfig schemaField;
+  }
+
+  @Data
+  @Accessors(chain = true)
+  public static class SideEffectConfig {
+    boolean enabled;
+  }
 }
diff --git a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/kafka/KafkaConfiguration.java b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/kafka/KafkaConfiguration.java
index 2345f88352c170..b03aedc1a7b5eb 100644
--- a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/kafka/KafkaConfiguration.java
+++ b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/kafka/KafkaConfiguration.java
@@ -1,9 +1,25 @@
 package com.linkedin.metadata.config.kafka;
 
+import java.util.HashMap;
+import java.util.Map;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import org.springframework.lang.Nullable;
 
 @Data
 public class KafkaConfiguration {
+  // Avoiding dependencies on other libraries (Spring/Kafka) for configuration
+  public static final String KEY_SERIALIZER_CLASS_CONFIG = "key.serializer";
+  public static final String VALUE_SERIALIZER_CLASS_CONFIG = "value.serializer";
+  public static final String KEY_DESERIALIZER_CLASS_CONFIG = "key.deserializer";
+  public static final String VALUE_DESERIALIZER_CLASS_CONFIG = "value.deserializer";
+  public static final String KEY_DESERIALIZER_DELEGATE_CLASS =
+      "spring.deserializer.key.delegate.class";
+  public static final String VALUE_DESERIALIZER_DELEGATE_CLASS =
+      "spring.deserializer.value.delegate.class";
 
   private String bootstrapServers;
 
@@ -14,4 +30,103 @@ public class KafkaConfiguration {
   private ProducerConfiguration producer;
 
   private ConsumerConfiguration consumer;
+
+  private SerDeConfig serde;
+
+  @Data
+  public static class SerDeConfig {
+    private SerDeKeyValueConfig usageEvent;
+    private SerDeKeyValueConfig event;
+  }
+
+  @Data
+  @Builder(toBuilder = true)
+  @AllArgsConstructor
+  @NoArgsConstructor
+  public static class SerDeKeyValueConfig {
+    private SerDeProperties key;
+    private SerDeProperties value;
+    @Nullable private Map<String, String> properties;
+
+    protected Map<String, String> getProperties() {
+      return getProperties(null);
+    }
+
+    public Map<String, String> getProperties(@Nullable SerDeKeyValueConfig schemaRegistryConfig) {
+      final HashMap<String, String> props =
+          new HashMap<>(properties != null ? properties : Map.of());
+      if (schemaRegistryConfig != null) {
+        props.putAll(schemaRegistryConfig.getProperties());
+      }
+      return props;
+    }
+
+    public Map<String, String> getProducerProperties(
+        @Nullable SerDeKeyValueConfig schemaRegistryConfig) {
+      final SerDeKeyValueConfig config =
+          schemaRegistryConfig == null ? this : withSchemaRegistryOverride(schemaRegistryConfig);
+      return Map.of(
+          KEY_SERIALIZER_CLASS_CONFIG, config.getKey().getSerializer(),
+          VALUE_SERIALIZER_CLASS_CONFIG, config.getValue().getSerializer());
+    }
+
+    public Map<String, String> getConsumerProperties(
+        @Nullable SerDeKeyValueConfig schemaRegistryConfig) {
+      final SerDeKeyValueConfig config =
+          schemaRegistryConfig == null ? this : withSchemaRegistryOverride(schemaRegistryConfig);
+
+      HashMap<String, String> consumerProperties =
+          new HashMap<>(
+              Map.of(
+                  KEY_DESERIALIZER_CLASS_CONFIG, config.getKey().getDeserializer(),
+                  VALUE_DESERIALIZER_CLASS_CONFIG, config.getValue().getDeserializer()));
+
+      if (config.getKey().getDelegateDeserializer() == null
+          && config.getValue().getDelegateDeserializer() == null) {
+        return consumerProperties;
+      }
+
+      if (config.getKey().getDelegateDeserializer() != null) {
+        consumerProperties.put(
+            KEY_DESERIALIZER_DELEGATE_CLASS, config.getKey().getDelegateDeserializer());
+      }
+      if (config.getValue().getDelegateDeserializer() != null) {
+        consumerProperties.put(
+            VALUE_DESERIALIZER_DELEGATE_CLASS, config.getValue().getDelegateDeserializer());
+      }
+
+      return consumerProperties;
+    }
+
+    public SerDeKeyValueConfig withSchemaRegistryOverride(
+        @NonNull SerDeKeyValueConfig schemaRegistryConfig) {
+      // Handle case where delegation is used, but missing from schemaRegistryConfig
+      return schemaRegistryConfig.toBuilder()
+          .key(key.withSchemaRegistryOverride(schemaRegistryConfig.getKey()))
+          .value(value.withSchemaRegistryOverride(schemaRegistryConfig.getValue()))
+          .build();
+    }
+  }
+
+  @Data
+  @Builder(toBuilder = true)
+  @AllArgsConstructor
+  @NoArgsConstructor
+  public static class SerDeProperties {
+    private String serializer;
+    private String deserializer;
+    @Nullable private String delegateDeserializer;
+
+    public SerDeProperties withSchemaRegistryOverride(
+        @NonNull SerDeProperties schemaRegistryOverride) {
+      if (delegateDeserializer != null
+          && schemaRegistryOverride.getDelegateDeserializer() == null) {
+        return schemaRegistryOverride.toBuilder()
+            .delegateDeserializer(schemaRegistryOverride.getDeserializer())
+            .deserializer(deserializer)
+            .build();
+      }
+      return schemaRegistryOverride;
+    }
+  }
 }
diff --git a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/DocIdsConfiguration.java b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/DocIdsConfiguration.java
new file mode 100644
index 00000000000000..56bcbc8d0c4fd5
--- /dev/null
+++ b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/DocIdsConfiguration.java
@@ -0,0 +1,8 @@
+package com.linkedin.metadata.config.search;
+
+import lombok.Data;
+
+@Data
+public class DocIdsConfiguration {
+  private EntityDocIdConfiguration schemaField;
+}
diff --git a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/ElasticSearchConfiguration.java b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/ElasticSearchConfiguration.java
index 130620a9ab918c..9426c83f17b708 100644
--- a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/ElasticSearchConfiguration.java
+++ b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/ElasticSearchConfiguration.java
@@ -8,4 +8,6 @@ public class ElasticSearchConfiguration {
   private BuildIndicesConfiguration buildIndices;
   public String implementation;
   private SearchConfiguration search;
+  private String idHashAlgo;
+  private IndexConfiguration index;
 }
diff --git a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/EntityDocIdConfiguration.java b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/EntityDocIdConfiguration.java
new file mode 100644
index 00000000000000..5e580fe30ee32c
--- /dev/null
+++ b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/EntityDocIdConfiguration.java
@@ -0,0 +1,8 @@
+package com.linkedin.metadata.config.search;
+
+import lombok.Data;
+
+@Data
+public class EntityDocIdConfiguration {
+  private boolean hashIdEnabled;
+}
diff --git a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/GraphQueryConfiguration.java b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/GraphQueryConfiguration.java
index cd869a61bf3abb..7a4af8c24262ed 100644
--- a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/GraphQueryConfiguration.java
+++ b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/GraphQueryConfiguration.java
@@ -17,15 +17,4 @@ public class GraphQueryConfiguration {
    * to be prioritized in the case of a multiple path situation with multi-path search disabled
    */
   private boolean boostViaNodes;
-
-  public static GraphQueryConfiguration testDefaults;
-
-  static {
-    testDefaults = new GraphQueryConfiguration();
-    testDefaults.setBatchSize(1000);
-    testDefaults.setTimeoutSeconds(10);
-    testDefaults.setMaxResult(10000);
-    testDefaults.setEnableMultiPathSearch(true);
-    testDefaults.setBoostViaNodes(true);
-  }
 }
diff --git a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/IndexConfiguration.java b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/IndexConfiguration.java
new file mode 100644
index 00000000000000..b54cc89726858c
--- /dev/null
+++ b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/search/IndexConfiguration.java
@@ -0,0 +1,9 @@
+package com.linkedin.metadata.config.search;
+
+import lombok.Data;
+
+@Data
+public class IndexConfiguration {
+  private String prefix;
+  private DocIdsConfiguration docIds;
+}
diff --git a/metadata-service/configuration/src/main/resources/application.yaml b/metadata-service/configuration/src/main/resources/application.yaml
index 6d66ddaea510af..0977c64d0e8609 100644
--- a/metadata-service/configuration/src/main/resources/application.yaml
+++ b/metadata-service/configuration/src/main/resources/application.yaml
@@ -72,6 +72,8 @@ datahub:
     host: ${DATAHUB_GMS_HOST:localhost}
     port: ${DATAHUB_GMS_PORT:8080}
     useSSL: ${DATAHUB_GMS_USE_SSL:${GMS_USE_SSL:false}}
+    async:
+      request-timeout-ms: ${DATAHUB_GMS_ASYNC_REQUEST_TIMEOUT_MS:55000}
 
     # URI instead of above host/port/ssl
     # Priority is given to the URI setting over separate host/port/useSSL parameters
@@ -174,6 +176,7 @@ elasticsearch:
   opensearchUseAwsIamAuth: ${OPENSEARCH_USE_AWS_IAM_AUTH:false}
   region: ${AWS_REGION:#{null}}
   implementation: ${ELASTICSEARCH_IMPLEMENTATION:elasticsearch} # elasticsearch or opensearch, for handling divergent cases
+  idHashAlgo: ${ELASTIC_ID_HASH_ALGO:MD5}
   sslContext: # Required if useSSL is true
     protocol: ${ELASTICSEARCH_SSL_PROTOCOL:#{null}}
     secureRandomImplementation: ${ELASTICSEARCH_SSL_SECURE_RANDOM_IMPL:#{null}}
@@ -206,6 +209,9 @@ elasticsearch:
     enableSettingsReindex: ${ELASTICSEARCH_INDEX_BUILDER_SETTINGS_REINDEX:false}
     settingsOverrides: ${ELASTICSEARCH_INDEX_BUILDER_SETTINGS_OVERRIDES:#{null}}
     entitySettingsOverrides: ${ELASTICSEARCH_INDEX_BUILDER_ENTITY_SETTINGS_OVERRIDES:#{null}}
+    docIds:
+      schemaField:
+        hashIdEnabled: ${ELASTICSEARCH_INDEX_DOC_IDS_SCHEMA_FIELD_HASH_ID_ENABLED:false}
   buildIndices:
     allowDocCountMismatch: ${ELASTICSEARCH_BUILD_INDICES_ALLOW_DOC_COUNT_MISMATCH:false} # when cloneIndices is also enabled
     cloneIndices: ${ELASTICSEARCH_BUILD_INDICES_CLONE_INDICES:true}
@@ -244,6 +250,23 @@ kafka:
   listener:
     concurrency: ${KAFKA_LISTENER_CONCURRENCY:1}
   bootstrapServers: ${KAFKA_BOOTSTRAP_SERVER:http://localhost:9092}
+  serde:
+    usageEvent:
+      key:
+        serializer: ${KAFKA_SERDE_USAGE_EVENTS_KEY_SERIALIZER:org.apache.kafka.common.serialization.StringSerializer}
+        deserializer: ${KAFKA_SERDE_USAGE_EVENTS_KEY_DESERIALIZER:org.apache.kafka.common.serialization.StringDeserializer}
+      value:
+        serializer: ${KAFKA_SERDE_USAGE_EVENTS_VALUE_SERIALIZER:org.apache.kafka.common.serialization.StringSerializer}
+        deserializer: ${KAFKA_SERDE_USAGE_EVENTS_VALUE_DESERIALIZER:org.apache.kafka.common.serialization.StringDeserializer}
+    event:
+      key:
+        serializer: ${KAFKA_SERDE_EVENT_KEY_SERIALIZER:org.apache.kafka.common.serialization.StringSerializer}
+        deserializer: ${KAFKA_SERDE_EVENT_KEY_DESERIALIZER:org.springframework.kafka.support.serializer.ErrorHandlingDeserializer}
+        delegateDeserializer: ${KAFKA_SERDE_EVENT_KEY_DELEGATE_DESERIALIZER:org.apache.kafka.common.serialization.StringDeserializer}
+      value:
+        serializer: ${KAFKA_SERDE_EVENT_VALUE_SERIALIZER:io.confluent.kafka.serializers.KafkaAvroSerializer}
+        deserializer: ${KAFKA_SERDE_EVENT_VALUE_DESERIALIZER:org.springframework.kafka.support.serializer.ErrorHandlingDeserializer}
+        delegateDeserializer: ${KAFKA_SERDE_EVENT_VALUE_DELEGATE_DESERIALIZER:io.confluent.kafka.serializers.KafkaAvroDeserializer}
   producer:
     retryCount: ${KAFKA_PRODUCER_RETRY_COUNT:3}
     deliveryTimeout: ${KAFKA_PRODUCER_DELIVERY_TIMEOUT:30000}
@@ -295,10 +318,18 @@ metadataTests:
 
 siblings:
   enabled: ${ENABLE_SIBLING_HOOK:true} # enable to turn on automatic sibling associations for dbt
+  consumerGroupSuffix: ${SIBLINGS_HOOK_CONSUMER_GROUP_SUFFIX:}
 updateIndices:
   enabled: ${ENABLE_UPDATE_INDICES_HOOK:true}
+  consumerGroupSuffix: ${UPDATE_INDICES_CONSUMER_GROUP_SUFFIX:}
 ingestionScheduler:
   enabled: ${ENABLE_INGESTION_SCHEDULER_HOOK:true} # enable to execute ingestion scheduling
+  consumerGroupSuffix: ${INGESTION_SCHEDULER_HOOK_CONSUMER_GROUP_SUFFIX:}
+incidents:
+  hook:
+    enabled: ${ENABLE_INCIDENTS_HOOK:true}
+    maxIncidentHistory: ${MAX_INCIDENT_HISTORY:100}
+    consumerGroupSuffix: ${INCIDENTS_HOOK_CONSUMER_GROUP_SUFFIX:}
 
 bootstrap:
   upgradeDefaultBrowsePaths:
@@ -326,6 +357,11 @@ systemUpdate:
     batchSize: ${BOOTSTRAP_SYSTEM_UPDATE_DATA_JOB_NODE_CLL_BATCH_SIZE:1000}
     delayMs: ${BOOTSTRAP_SYSTEM_UPDATE_DATA_JOB_NODE_CLL_DELAY_MS:30000}
     limit: ${BOOTSTRAP_SYSTEM_UPDATE_DATA_JOB_NODE_CLL_LIMIT:0}
+  domainDescription:
+    enabled: ${BOOTSTRAP_SYSTEM_UPDATE_DOMAIN_DESCRIPTION_ENABLED:true}
+    batchSize: ${BOOTSTRAP_SYSTEM_UPDATE_DOMAIN_DESCRIPTION_BATCH_SIZE:1000}
+    delayMs: ${BOOTSTRAP_SYSTEM_UPDATE_DOMAIN_DESCRIPTION_DELAY_MS:30000}
+    limit: ${BOOTSTRAP_SYSTEM_UPDATE_DOMAIN_DESCRIPTION_CLL_LIMIT:0}
   browsePathsV2:
     enabled: ${BOOTSTRAP_SYSTEM_UPDATE_BROWSE_PATHS_V2_ENABLED:true}
     batchSize: ${BOOTSTRAP_SYSTEM_UPDATE_BROWSE_PATHS_V2_BATCH_SIZE:5000}
@@ -341,6 +377,16 @@ systemUpdate:
     batchSize: ${BOOTSTRAP_SYSTEM_UPDATE_OWNERSHIP_TYPES_BATCH_SIZE:1000}
     reprocess:
       enabled: ${BOOTSTRAP_SYSTEM_UPDATE_OWNERSHIP_TYPES_REPROCESS:false}
+  schemaFieldsFromSchemaMetadata:
+    enabled: ${SYSTEM_UPDATE_SCHEMA_FIELDS_FROM_SCHEMA_METADATA_ENABLED:false}
+    batchSize: ${SYSTEM_UPDATE_SCHEMA_FIELDS_FROM_SCHEMA_METADATA_BATCH_SIZE:500}
+    delayMs: ${SYSTEM_UPDATE_SCHEMA_FIELDS_FROM_SCHEMA_METADATA_DELAY_MS:1000}
+    limit: ${SYSTEM_UPDATE_SCHEMA_FIELDS_FROM_SCHEMA_METADATA_LIMIT:0}
+  schemaFieldsDocIds:
+    enabled: ${SYSTEM_UPDATE_SCHEMA_FIELDS_DOC_IDS_ENABLED:false}
+    batchSize: ${SYSTEM_UPDATE_SCHEMA_FIELDS_DOC_IDS_BATCH_SIZE:500}
+    delayMs: ${SYSTEM_UPDATE_SCHEMA_FIELDS_DOC_IDS_DELAY_MS:5000}
+    limit: ${SYSTEM_UPDATE_SCHEMA_FIELDS_DOC_IDS_LIMIT:0}
 
 structuredProperties:
   enabled: ${ENABLE_STRUCTURED_PROPERTIES_HOOK:true} # applies structured properties mappings
@@ -365,7 +411,7 @@ featureFlags:
   preProcessHooks:
     uiEnabled: ${PRE_PROCESS_HOOKS_UI_ENABLED:true} # Circumvents Kafka for processing index updates for UI changes sourced from GraphQL to avoid processing delays
     reprocessEnabled: ${PRE_PROCESS_HOOKS_UI_ENABLED:false} # If enabled, will reprocess UI sourced events asynchronously when reading from Kafka after pre-processing them synchronously
-  showAcrylInfo: ${SHOW_ACRYL_INFO:false} # Show different CTAs within DataHub around moving to Managed DataHub. Set to true for the demo site.
+  showAcrylInfo: ${SHOW_ACRYL_INFO:false} # Show different CTAs within DataHub around moving to DataHub Cloud. Set to true for the demo site.
   erModelRelationshipFeatureEnabled: ${ER_MODEL_RELATIONSHIP_FEATURE_ENABLED:false} # Enable Join Tables Feature and show within Dataset view as Relations
   nestedDomainsEnabled: ${NESTED_DOMAINS_ENABLED:true} # Enables the nested Domains feature that allows users to have sub-Domains. If this is off, Domains appear "flat" again
   schemaFieldEntityFetchEnabled: ${SCHEMA_FIELD_ENTITY_FETCH_ENABLED:true} # Enables fetching for schema field entities from the database when we hydrate them on schema fields
@@ -375,6 +421,7 @@ featureFlags:
 
 entityChangeEvents:
   enabled: ${ENABLE_ENTITY_CHANGE_EVENTS_HOOK:true}
+  consumerGroupSuffix: ${ECE_CONSUMER_GROUP_SUFFIX:}
 
 views:
   enabled: ${VIEWS_ENABLED:true}
@@ -459,6 +506,7 @@ springdoc.api-docs.groups.enabled: true
 forms:
   hook:
     enabled: { $FORMS_HOOK_ENABLED:true }
+    consumerGroupSuffix: ${FORMS_HOOK_CONSUMER_GROUP_SUFFIX:}
 
 businessAttribute:
   fetchRelatedEntitiesCount: ${BUSINESS_ATTRIBUTE_RELATED_ENTITIES_COUNT:20000}
@@ -469,6 +517,9 @@ businessAttribute:
 metadataChangeProposal:
   validation:
     ignoreUnknown: ${MCP_VALIDATION_IGNORE_UNKNOWN:true}
+  sideEffects:
+    schemaField:
+      enabled: ${MCP_SIDE_EFFECTS_SCHEMA_FIELD_ENABLED:false}
   throttle:
     updateIntervalMs: ${MCP_THROTTLE_UPDATE_INTERVAL_MS:60000}
 
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/ElasticSearchGraphServiceFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/ElasticSearchGraphServiceFactory.java
index eb56e8d42c158e..55eb931625fecc 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/ElasticSearchGraphServiceFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/ElasticSearchGraphServiceFactory.java
@@ -11,6 +11,7 @@
 import javax.annotation.Nonnull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -30,7 +31,8 @@ public class ElasticSearchGraphServiceFactory {
 
   @Bean(name = "elasticSearchGraphService")
   @Nonnull
-  protected ElasticSearchGraphService getInstance() {
+  protected ElasticSearchGraphService getInstance(
+      @Value("${elasticsearch.idHashAlgo}") final String idHashAlgo) {
     LineageRegistry lineageRegistry = new LineageRegistry(entityRegistry);
     return new ElasticSearchGraphService(
         lineageRegistry,
@@ -45,6 +47,7 @@ protected ElasticSearchGraphService getInstance() {
             lineageRegistry,
             components.getIndexConvention(),
             configurationProvider.getElasticSearch().getSearch().getGraph()),
-        components.getIndexBuilder());
+        components.getIndexBuilder(),
+        idHashAlgo);
   }
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/ElasticSearchSystemMetadataServiceFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/ElasticSearchSystemMetadataServiceFactory.java
index d560fba399f340..fb48d64ce7ba9e 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/ElasticSearchSystemMetadataServiceFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/ElasticSearchSystemMetadataServiceFactory.java
@@ -6,6 +6,7 @@
 import javax.annotation.Nonnull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -19,7 +20,8 @@ public class ElasticSearchSystemMetadataServiceFactory {
 
   @Bean(name = "elasticSearchSystemMetadataService")
   @Nonnull
-  protected ElasticSearchSystemMetadataService getInstance() {
+  protected ElasticSearchSystemMetadataService getInstance(
+      @Value("${elasticsearch.idHashAlgo}") final String elasticIdHashAlgo) {
     return new ElasticSearchSystemMetadataService(
         components.getBulkProcessor(),
         components.getIndexConvention(),
@@ -28,6 +30,7 @@ protected ElasticSearchSystemMetadataService getInstance() {
             components.getIndexConvention(),
             components.getBulkProcessor(),
             components.getNumRetries()),
-        components.getIndexBuilder());
+        components.getIndexBuilder(),
+        elasticIdHashAlgo);
   }
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/IndexConventionFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/IndexConventionFactory.java
index 5b76a3f2cb833f..859c9cfcd58bad 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/IndexConventionFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/IndexConventionFactory.java
@@ -1,8 +1,9 @@
 package com.linkedin.gms.factory.common;
 
+import com.linkedin.gms.factory.config.ConfigurationProvider;
+import com.linkedin.metadata.config.search.ElasticSearchConfiguration;
 import com.linkedin.metadata.utils.elasticsearch.IndexConvention;
 import com.linkedin.metadata.utils.elasticsearch.IndexConventionImpl;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -15,11 +16,20 @@
 public class IndexConventionFactory {
   public static final String INDEX_CONVENTION_BEAN = "searchIndexConvention";
 
-  @Value("${elasticsearch.index.prefix:}")
-  private String indexPrefix;
-
   @Bean(name = INDEX_CONVENTION_BEAN)
-  protected IndexConvention createInstance() {
-    return new IndexConventionImpl(indexPrefix);
+  protected IndexConvention createInstance(final ConfigurationProvider configurationProvider) {
+    ElasticSearchConfiguration elasticSearchConfiguration =
+        configurationProvider.getElasticSearch();
+    return new IndexConventionImpl(
+        IndexConventionImpl.IndexConventionConfig.builder()
+            .prefix(elasticSearchConfiguration.getIndex().getPrefix())
+            .hashIdAlgo(elasticSearchConfiguration.getIdHashAlgo())
+            .schemaFieldDocIdHashEnabled(
+                elasticSearchConfiguration
+                    .getIndex()
+                    .getDocIds()
+                    .getSchemaField()
+                    .isHashIdEnabled())
+            .build());
   }
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/config/ConfigurationProvider.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/config/ConfigurationProvider.java
index 08adbd54730a74..f57829baba6baa 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/config/ConfigurationProvider.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/config/ConfigurationProvider.java
@@ -2,86 +2,30 @@
 
 import com.datahub.authentication.AuthenticationConfiguration;
 import com.datahub.authorization.AuthorizationConfiguration;
-import com.linkedin.datahub.graphql.featureflags.FeatureFlags;
-import com.linkedin.metadata.config.DataHubConfiguration;
-import com.linkedin.metadata.config.EbeanConfiguration;
-import com.linkedin.metadata.config.GraphQLConfiguration;
-import com.linkedin.metadata.config.IngestionConfiguration;
-import com.linkedin.metadata.config.MetadataChangeProposalConfig;
-import com.linkedin.metadata.config.SystemUpdateConfiguration;
-import com.linkedin.metadata.config.TestsConfiguration;
-import com.linkedin.metadata.config.ViewsConfiguration;
-import com.linkedin.metadata.config.VisualConfiguration;
-import com.linkedin.metadata.config.cache.CacheConfiguration;
-import com.linkedin.metadata.config.kafka.KafkaConfiguration;
-import com.linkedin.metadata.config.search.ElasticSearchConfiguration;
-import com.linkedin.metadata.config.telemetry.TelemetryConfiguration;
+import com.linkedin.metadata.config.DataHubAppConfiguration;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Component;
 
+@EqualsAndHashCode(callSuper = true)
 @Component
 // Include extra kafka properties
 @EnableConfigurationProperties(KafkaProperties.class)
 @ConfigurationProperties
 @Data
-public class ConfigurationProvider {
+public class ConfigurationProvider extends DataHubAppConfiguration {
   /** Authentication related configs */
   private AuthenticationConfiguration authentication;
 
   /** Authorizer related configs */
   private AuthorizationConfiguration authorization;
 
-  /** Ingestion related configs */
-  private IngestionConfiguration ingestion;
-
-  /** Telemetry related configs */
-  private TelemetryConfiguration telemetry;
-
-  /** Viz related configs */
-  private VisualConfiguration visualConfig;
-
-  /** Tests related configs */
-  private TestsConfiguration metadataTests;
-
-  /** DataHub top-level server configurations */
-  private DataHubConfiguration datahub;
-
-  /** Views feature related configs */
-  private ViewsConfiguration views;
-
-  /** Feature flags indicating what is turned on vs turned off */
-  private FeatureFlags featureFlags;
-
-  /** Kafka related configs. */
-  private KafkaConfiguration kafka;
-
-  /** ElasticSearch configurations */
-  private ElasticSearchConfiguration elasticSearch;
-
-  /** System Update configurations */
-  private SystemUpdateConfiguration systemUpdate;
-
-  /** The base URL where DataHub is hosted. */
-  private String baseUrl;
-
-  /** Configuration for caching */
-  private CacheConfiguration cache;
-
   /** Configuration for the health check server */
   private HealthCheckConfiguration healthCheck;
 
   /** Structured properties related configurations */
   private StructuredPropertiesConfiguration structuredProperties;
-
-  /** Ebean related configuration */
-  private EbeanConfiguration ebean;
-
-  /** GraphQL Configurations */
-  private GraphQLConfiguration graphQL;
-
-  /** MCP throttling configuration */
-  private MetadataChangeProposalConfig metadataChangeProposal;
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/context/SystemOperationContextFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/context/SystemOperationContextFactory.java
index 6870d10c870016..9d92468ce649f7 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/context/SystemOperationContextFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/context/SystemOperationContextFactory.java
@@ -17,7 +17,6 @@
 import io.datahubproject.metadata.context.ServicesRegistryContext;
 import io.datahubproject.metadata.services.RestrictedService;
 import javax.annotation.Nonnull;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -26,10 +25,6 @@
 @Configuration
 public class SystemOperationContextFactory {
 
-  @Autowired
-  @Qualifier("baseElasticSearchComponents")
-  private BaseElasticSearchComponentsFactory.BaseElasticSearchComponents components;
-
   /**
    * Used inside GMS
    *
@@ -45,7 +40,9 @@ protected OperationContext javaSystemOperationContext(
       @Nonnull final EntityService<?> entityService,
       @Nonnull final RestrictedService restrictedService,
       @Nonnull final GraphRetriever graphRetriever,
-      @Nonnull final SearchService searchService) {
+      @Nonnull final SearchService searchService,
+      @Qualifier("baseElasticSearchComponents")
+          BaseElasticSearchComponentsFactory.BaseElasticSearchComponents components) {
 
     EntityServiceAspectRetriever entityServiceAspectRetriever =
         EntityServiceAspectRetriever.builder()
@@ -91,7 +88,9 @@ protected OperationContext restliSystemOperationContext(
       @Nonnull final OperationContextConfig operationContextConfig,
       @Nonnull final RestrictedService restrictedService,
       @Nonnull final GraphRetriever graphRetriever,
-      @Nonnull final SearchService searchService) {
+      @Nonnull final SearchService searchService,
+      @Qualifier("baseElasticSearchComponents")
+          BaseElasticSearchComponentsFactory.BaseElasticSearchComponents components) {
 
     EntityClientAspectRetriever entityServiceAspectRetriever =
         EntityClientAspectRetriever.builder().entityClient(systemEntityClient).build();
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/entity/update/indices/UpdateIndicesServiceFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/entity/update/indices/UpdateIndicesServiceFactory.java
index fad9d0eaf3b45c..38a344f8be8e92 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/entity/update/indices/UpdateIndicesServiceFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/entity/update/indices/UpdateIndicesServiceFactory.java
@@ -9,6 +9,7 @@
 import com.linkedin.metadata.service.UpdateIndicesService;
 import com.linkedin.metadata.systemmetadata.SystemMetadataService;
 import com.linkedin.metadata.timeseries.TimeseriesAspectService;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -30,7 +31,8 @@ public UpdateIndicesService searchIndicesServiceNonGMS(
       TimeseriesAspectService timeseriesAspectService,
       SystemMetadataService systemMetadataService,
       SearchDocumentTransformer searchDocumentTransformer,
-      EntityIndexBuilders entityIndexBuilders) {
+      EntityIndexBuilders entityIndexBuilders,
+      @Value("${elasticsearch.idHashAlgo}") final String idHashAlgo) {
 
     return new UpdateIndicesService(
         graphService,
@@ -38,7 +40,8 @@ public UpdateIndicesService searchIndicesServiceNonGMS(
         timeseriesAspectService,
         systemMetadataService,
         searchDocumentTransformer,
-        entityIndexBuilders);
+        entityIndexBuilders,
+        idHashAlgo);
   }
 
   @Bean
@@ -50,7 +53,8 @@ public UpdateIndicesService searchIndicesServiceGMS(
       final SystemMetadataService systemMetadataService,
       final SearchDocumentTransformer searchDocumentTransformer,
       final EntityIndexBuilders entityIndexBuilders,
-      final EntityService<?> entityService) {
+      final EntityService<?> entityService,
+      @Value("${elasticsearch.idHashAlgo}") final String idHashAlgo) {
 
     UpdateIndicesService updateIndicesService =
         new UpdateIndicesService(
@@ -59,7 +63,8 @@ public UpdateIndicesService searchIndicesServiceGMS(
             timeseriesAspectService,
             systemMetadataService,
             searchDocumentTransformer,
-            entityIndexBuilders);
+            entityIndexBuilders,
+            idHashAlgo);
 
     entityService.setUpdateIndicesService(updateIndicesService);
 
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/entityregistry/EntityRegistryFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/entityregistry/EntityRegistryFactory.java
index 2c65eeafe063bc..6ef13716aaac8c 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/entityregistry/EntityRegistryFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/entityregistry/EntityRegistryFactory.java
@@ -1,15 +1,22 @@
 package com.linkedin.gms.factory.entityregistry;
 
+import com.datahub.plugins.metadata.aspect.SpringPluginFactory;
+import com.linkedin.gms.factory.plugins.SpringStandardPluginConfiguration;
+import com.linkedin.metadata.aspect.plugins.PluginFactory;
+import com.linkedin.metadata.aspect.plugins.config.PluginConfiguration;
 import com.linkedin.metadata.models.registry.ConfigEntityRegistry;
 import com.linkedin.metadata.models.registry.EntityRegistry;
 import com.linkedin.metadata.models.registry.EntityRegistryException;
 import com.linkedin.metadata.models.registry.MergedEntityRegistry;
 import com.linkedin.metadata.models.registry.PluginEntityRegistryLoader;
 import com.linkedin.metadata.models.registry.SnapshotEntityRegistry;
+import java.util.List;
+import java.util.function.BiFunction;
 import javax.annotation.Nonnull;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -27,13 +34,20 @@ public class EntityRegistryFactory {
   @Qualifier("pluginEntityRegistry")
   private PluginEntityRegistryLoader pluginEntityRegistryLoader;
 
+  @Autowired private ApplicationContext applicationContext;
+
   @SneakyThrows
   @Bean("entityRegistry")
   @Primary
   @Nonnull
-  protected EntityRegistry getInstance() throws EntityRegistryException {
+  protected EntityRegistry getInstance(
+      SpringStandardPluginConfiguration springStandardPluginConfiguration)
+      throws EntityRegistryException {
+    BiFunction<PluginConfiguration, List<ClassLoader>, PluginFactory> pluginFactoryProvider =
+        (config, loaders) -> new SpringPluginFactory(applicationContext, config, loaders);
     MergedEntityRegistry baseEntityRegistry =
-        new MergedEntityRegistry(SnapshotEntityRegistry.getInstance()).apply(configEntityRegistry);
+        new MergedEntityRegistry(new SnapshotEntityRegistry(pluginFactoryProvider))
+            .apply(configEntityRegistry);
     pluginEntityRegistryLoader.withBaseRegistry(baseEntityRegistry).start(true);
     return baseEntityRegistry;
   }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/DataHubKafkaProducerFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/DataHubKafkaProducerFactory.java
index 6a2b9f511b79f8..6966a195f11606 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/DataHubKafkaProducerFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/DataHubKafkaProducerFactory.java
@@ -1,7 +1,6 @@
 package com.linkedin.gms.factory.kafka;
 
 import com.linkedin.gms.factory.config.ConfigurationProvider;
-import com.linkedin.gms.factory.kafka.schemaregistry.SchemaRegistryConfig;
 import com.linkedin.metadata.config.kafka.KafkaConfiguration;
 import java.util.Arrays;
 import java.util.Map;
@@ -24,14 +23,15 @@ public class DataHubKafkaProducerFactory {
   protected Producer<String, IndexedRecord> createInstance(
       @Qualifier("configurationProvider") ConfigurationProvider provider,
       final KafkaProperties properties,
-      @Qualifier("schemaRegistryConfig") final SchemaRegistryConfig schemaRegistryConfig) {
+      @Qualifier("schemaRegistryConfig")
+          final KafkaConfiguration.SerDeKeyValueConfig schemaRegistryConfig) {
     KafkaConfiguration kafkaConfiguration = provider.getKafka();
     return new KafkaProducer<>(
         buildProducerProperties(schemaRegistryConfig, kafkaConfiguration, properties));
   }
 
   public static Map<String, Object> buildProducerProperties(
-      SchemaRegistryConfig schemaRegistryConfig,
+      KafkaConfiguration.SerDeKeyValueConfig schemaRegistryConfig,
       KafkaConfiguration kafkaConfiguration,
       KafkaProperties properties) {
     KafkaProperties.Producer producerProps = properties.getProducer();
@@ -45,8 +45,8 @@ public static Map<String, Object> buildProducerProperties(
     } // else we rely on KafkaProperties which defaults to localhost:9092
 
     Map<String, Object> props = properties.buildProducerProperties(null);
-
-    props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, schemaRegistryConfig.getSerializer());
+    props.putAll(
+        kafkaConfiguration.getSerde().getEvent().getProducerProperties(schemaRegistryConfig));
 
     props.put(ProducerConfig.RETRIES_CONFIG, kafkaConfiguration.getProducer().getRetryCount());
     props.put(
@@ -66,9 +66,7 @@ public static Map<String, Object> buildProducerProperties(
         kafkaConfiguration.getProducer().getMaxRequestSize());
 
     // Override KafkaProperties with SchemaRegistryConfig only for non-empty values
-    schemaRegistryConfig.getProperties().entrySet().stream()
-        .filter(entry -> entry.getValue() != null && !entry.getValue().toString().isEmpty())
-        .forEach(entry -> props.put(entry.getKey(), entry.getValue()));
+    props.putAll(kafkaConfiguration.getSerde().getEvent().getProperties(schemaRegistryConfig));
 
     return props;
   }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/KafkaEventConsumerFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/KafkaEventConsumerFactory.java
index 9501b03482d045..750af8ec488df3 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/KafkaEventConsumerFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/KafkaEventConsumerFactory.java
@@ -1,7 +1,6 @@
 package com.linkedin.gms.factory.kafka;
 
 import com.linkedin.gms.factory.config.ConfigurationProvider;
-import com.linkedin.gms.factory.kafka.schemaregistry.SchemaRegistryConfig;
 import com.linkedin.metadata.config.kafka.KafkaConfiguration;
 import java.time.Duration;
 import java.util.Arrays;
@@ -9,7 +8,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.avro.generic.GenericRecord;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.common.serialization.StringDeserializer;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
 import org.springframework.context.annotation.Bean;
@@ -21,7 +19,6 @@
 import org.springframework.kafka.listener.CommonDelegatingErrorHandler;
 import org.springframework.kafka.listener.DefaultErrorHandler;
 import org.springframework.kafka.support.serializer.DeserializationException;
-import org.springframework.kafka.support.serializer.ErrorHandlingDeserializer;
 
 @Slf4j
 @Configuration
@@ -33,7 +30,8 @@ public class KafkaEventConsumerFactory {
   protected DefaultKafkaConsumerFactory<String, GenericRecord> createConsumerFactory(
       @Qualifier("configurationProvider") ConfigurationProvider provider,
       KafkaProperties baseKafkaProperties,
-      @Qualifier("schemaRegistryConfig") SchemaRegistryConfig schemaRegistryConfig) {
+      @Qualifier("schemaRegistryConfig")
+          KafkaConfiguration.SerDeKeyValueConfig schemaRegistryConfig) {
     kafkaEventConsumerConcurrency = provider.getKafka().getListener().getConcurrency();
 
     KafkaConfiguration kafkaConfiguration = provider.getKafka();
@@ -47,7 +45,8 @@ protected DefaultKafkaConsumerFactory<String, GenericRecord> createConsumerFacto
   protected DefaultKafkaConsumerFactory<String, GenericRecord> duheKafkaConsumerFactory(
       @Qualifier("configurationProvider") ConfigurationProvider provider,
       KafkaProperties baseKafkaProperties,
-      @Qualifier("duheSchemaRegistryConfig") SchemaRegistryConfig schemaRegistryConfig) {
+      @Qualifier("duheSchemaRegistryConfig")
+          KafkaConfiguration.SerDeKeyValueConfig schemaRegistryConfig) {
 
     KafkaConfiguration kafkaConfiguration = provider.getKafka();
     Map<String, Object> customizedProperties =
@@ -59,7 +58,7 @@ protected DefaultKafkaConsumerFactory<String, GenericRecord> duheKafkaConsumerFa
   private static Map<String, Object> buildCustomizedProperties(
       KafkaProperties baseKafkaProperties,
       KafkaConfiguration kafkaConfiguration,
-      SchemaRegistryConfig schemaRegistryConfig) {
+      KafkaConfiguration.SerDeKeyValueConfig schemaRegistryConfig) {
     KafkaProperties.Consumer consumerProps = baseKafkaProperties.getConsumer();
 
     // Records will be flushed every 10 seconds.
@@ -74,19 +73,12 @@ private static Map<String, Object> buildCustomizedProperties(
     } // else we rely on KafkaProperties which defaults to localhost:9092
 
     Map<String, Object> customizedProperties = baseKafkaProperties.buildConsumerProperties(null);
-    customizedProperties.put(
-        ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, ErrorHandlingDeserializer.class);
-    customizedProperties.put(
-        ErrorHandlingDeserializer.KEY_DESERIALIZER_CLASS, StringDeserializer.class);
-    customizedProperties.put(
-        ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, ErrorHandlingDeserializer.class);
-    customizedProperties.put(
-        ErrorHandlingDeserializer.VALUE_DESERIALIZER_CLASS, schemaRegistryConfig.getDeserializer());
+    customizedProperties.putAll(
+        kafkaConfiguration.getSerde().getEvent().getConsumerProperties(schemaRegistryConfig));
 
     // Override KafkaProperties with SchemaRegistryConfig only for non-empty values
-    schemaRegistryConfig.getProperties().entrySet().stream()
-        .filter(entry -> entry.getValue() != null && !entry.getValue().toString().isEmpty())
-        .forEach(entry -> customizedProperties.put(entry.getKey(), entry.getValue()));
+    customizedProperties.putAll(
+        kafkaConfiguration.getSerde().getEvent().getProperties(schemaRegistryConfig));
 
     customizedProperties.put(
         ConsumerConfig.MAX_PARTITION_FETCH_BYTES_CONFIG,
@@ -96,7 +88,7 @@ private static Map<String, Object> buildCustomizedProperties(
   }
 
   @Bean(name = "kafkaEventConsumer")
-  protected KafkaListenerContainerFactory<?> createInstance(
+  protected KafkaListenerContainerFactory<?> kafkaEventConsumer(
       @Qualifier("kafkaConsumerFactory")
           DefaultKafkaConsumerFactory<String, GenericRecord> kafkaConsumerFactory,
       @Qualifier("configurationProvider") ConfigurationProvider configurationProvider) {
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/AwsGlueSchemaRegistryFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/AwsGlueSchemaRegistryFactory.java
index 91dce49e5b0b59..6bebe77859d67c 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/AwsGlueSchemaRegistryFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/AwsGlueSchemaRegistryFactory.java
@@ -5,6 +5,7 @@
 import com.amazonaws.services.schemaregistry.utils.AWSSchemaRegistryConstants;
 import com.amazonaws.services.schemaregistry.utils.AvroRecordType;
 import com.linkedin.gms.factory.config.ConfigurationProvider;
+import com.linkedin.metadata.config.kafka.KafkaConfiguration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -32,8 +33,9 @@ public class AwsGlueSchemaRegistryFactory {
 
   @Bean("schemaRegistryConfig")
   @Nonnull
-  protected SchemaRegistryConfig getInstance(final ConfigurationProvider configurationProvider) {
-    Map<String, Object> props = new HashMap<>();
+  protected KafkaConfiguration.SerDeKeyValueConfig getInstance(
+      final ConfigurationProvider configurationProvider) {
+    Map<String, String> props = new HashMap<>();
     // FIXME: Properties for this factory should come from ConfigurationProvider object,
     // specifically under the
     // KafkaConfiguration class. See InternalSchemaRegistryFactory as an example.
@@ -43,7 +45,14 @@ protected SchemaRegistryConfig getInstance(final ConfigurationProvider configura
     props.put(AWSSchemaRegistryConstants.AVRO_RECORD_TYPE, AvroRecordType.GENERIC_RECORD.getName());
     registryName.ifPresent(s -> props.put(AWSSchemaRegistryConstants.REGISTRY_NAME, s));
     log.info("Creating AWS Glue registry");
-    return new SchemaRegistryConfig(
-        GlueSchemaRegistryKafkaSerializer.class, GlueSchemaRegistryKafkaDeserializer.class, props);
+    return KafkaConfiguration.SerDeKeyValueConfig.builder()
+        .key(configurationProvider.getKafka().getSerde().getEvent().getKey())
+        .value(
+            KafkaConfiguration.SerDeProperties.builder()
+                .serializer(GlueSchemaRegistryKafkaSerializer.class.getName())
+                .deserializer(GlueSchemaRegistryKafkaDeserializer.class.getName())
+                .build())
+        .properties(props)
+        .build();
   }
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/InternalSchemaRegistryFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/InternalSchemaRegistryFactory.java
index 46b27195ecc675..a3a3989ec1867f 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/InternalSchemaRegistryFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/InternalSchemaRegistryFactory.java
@@ -3,8 +3,6 @@
 import com.linkedin.gms.factory.config.ConfigurationProvider;
 import com.linkedin.metadata.config.kafka.KafkaConfiguration;
 import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig;
-import io.confluent.kafka.serializers.KafkaAvroDeserializer;
-import io.confluent.kafka.serializers.KafkaAvroSerializer;
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Nonnull;
@@ -26,9 +24,9 @@ public class InternalSchemaRegistryFactory {
   /** Configure Kafka Producer/Consumer processes with a custom schema registry. */
   @Bean("schemaRegistryConfig")
   @Nonnull
-  protected SchemaRegistryConfig getInstance(
+  protected KafkaConfiguration.SerDeKeyValueConfig getInstance(
       @Qualifier("configurationProvider") ConfigurationProvider provider) {
-    Map<String, Object> props = new HashMap<>();
+    Map<String, String> props = new HashMap<>();
     KafkaConfiguration kafkaConfiguration = provider.getKafka();
 
     props.put(
@@ -38,6 +36,6 @@ protected SchemaRegistryConfig getInstance(
     log.info(
         "Creating internal registry configuration for url {}",
         kafkaConfiguration.getSchemaRegistry().getUrl());
-    return new SchemaRegistryConfig(KafkaAvroSerializer.class, KafkaAvroDeserializer.class, props);
+    return provider.getKafka().getSerde().getEvent().toBuilder().properties(props).build();
   }
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/KafkaSchemaRegistryFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/KafkaSchemaRegistryFactory.java
index e72fbf97e52c98..01e68f334e97ce 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/KafkaSchemaRegistryFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/KafkaSchemaRegistryFactory.java
@@ -1,10 +1,9 @@
 package com.linkedin.gms.factory.kafka.schemaregistry;
 
 import com.linkedin.gms.factory.config.ConfigurationProvider;
+import com.linkedin.metadata.config.kafka.KafkaConfiguration;
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClientConfig;
 import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig;
-import io.confluent.kafka.serializers.KafkaAvroDeserializer;
-import io.confluent.kafka.serializers.KafkaAvroSerializer;
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Nonnull;
@@ -43,8 +42,9 @@ public class KafkaSchemaRegistryFactory {
 
   @Bean("schemaRegistryConfig")
   @Nonnull
-  protected SchemaRegistryConfig getInstance(ConfigurationProvider configurationProvider) {
-    Map<String, Object> props = new HashMap<>();
+  protected KafkaConfiguration.SerDeKeyValueConfig getInstance(
+      ConfigurationProvider configurationProvider) {
+    Map<String, String> props = new HashMap<>();
     // FIXME: Properties for this factory should come from ConfigurationProvider object,
     // specifically under the
     // KafkaConfiguration class. See InternalSchemaRegistryFactory as an example.
@@ -65,7 +65,9 @@ protected SchemaRegistryConfig getInstance(ConfigurationProvider configurationPr
           sslKeystoreLocation);
     }
 
-    return new SchemaRegistryConfig(KafkaAvroSerializer.class, KafkaAvroDeserializer.class, props);
+    return configurationProvider.getKafka().getSerde().getEvent().toBuilder()
+        .properties(props)
+        .build();
   }
 
   private String withNamespace(String configKey) {
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/SchemaRegistryConfig.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/SchemaRegistryConfig.java
deleted file mode 100644
index 004a7abb884896..00000000000000
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/SchemaRegistryConfig.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.linkedin.gms.factory.kafka.schemaregistry;
-
-import java.util.Map;
-import lombok.Data;
-
-@Data
-public class SchemaRegistryConfig {
-  private final Class<?> serializer;
-  private final Class<?> deserializer;
-  private final Map<String, Object> properties;
-}
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/SystemUpdateSchemaRegistryFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/SystemUpdateSchemaRegistryFactory.java
index d02cdc0e68f529..d1c449e70dc846 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/SystemUpdateSchemaRegistryFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/schemaregistry/SystemUpdateSchemaRegistryFactory.java
@@ -27,6 +27,7 @@ public class SystemUpdateSchemaRegistryFactory {
       SYSTEM_UPDATE_TOPIC_KEY_PREFIX + "duhe";
   public static final String MCL_VERSIONED_SCHEMA_REGISTRY_TOPIC_KEY =
       SYSTEM_UPDATE_TOPIC_KEY_PREFIX + "mcl-versioned";
+  public static final String MCP_SCHEMA_REGISTRY_TOPIC_KEY = SYSTEM_UPDATE_TOPIC_KEY_PREFIX + "mcp";
 
   @Value(TOPIC_NAME)
   private String duheTopicName;
@@ -34,11 +35,14 @@ public class SystemUpdateSchemaRegistryFactory {
   @Value("${METADATA_CHANGE_LOG_VERSIONED_TOPIC_NAME:" + Topics.METADATA_CHANGE_LOG_VERSIONED + "}")
   private String mclTopicName;
 
+  @Value("${METADATA_CHANGE_PROPOSAL_TOPIC_NAME:" + Topics.METADATA_CHANGE_PROPOSAL + "}")
+  private String mcpTopicName;
+
   /** Configure Kafka Producer/Consumer processes with a custom schema registry. */
   @Bean("duheSchemaRegistryConfig")
-  protected SchemaRegistryConfig duheSchemaRegistryConfig(
+  protected KafkaConfiguration.SerDeKeyValueConfig duheSchemaRegistryConfig(
       final ConfigurationProvider provider, final SchemaRegistryService schemaRegistryService) {
-    Map<String, Object> props = new HashMap<>();
+    Map<String, String> props = new HashMap<>();
     KafkaConfiguration kafkaConfiguration = provider.getKafka();
 
     props.put(
@@ -49,18 +53,27 @@ protected SchemaRegistryConfig duheSchemaRegistryConfig(
     props.putAll(
         Map.of(
             DUHE_SCHEMA_REGISTRY_TOPIC_KEY, duheTopicName,
-            MCL_VERSIONED_SCHEMA_REGISTRY_TOPIC_KEY, mclTopicName));
+            MCL_VERSIONED_SCHEMA_REGISTRY_TOPIC_KEY, mclTopicName,
+            MCP_SCHEMA_REGISTRY_TOPIC_KEY, mcpTopicName));
 
     // topic ordinals
     props.putAll(
         Map.of(
             DUHE_SCHEMA_REGISTRY_TOPIC_KEY + SYSTEM_UPDATE_TOPIC_KEY_ID_SUFFIX,
-                schemaRegistryService.getSchemaIdForTopic(duheTopicName).get().toString(),
+            schemaRegistryService.getSchemaIdForTopic(duheTopicName).get().toString(),
             MCL_VERSIONED_SCHEMA_REGISTRY_TOPIC_KEY + SYSTEM_UPDATE_TOPIC_KEY_ID_SUFFIX,
-                schemaRegistryService.getSchemaIdForTopic(mclTopicName).get().toString()));
+            schemaRegistryService.getSchemaIdForTopic(mclTopicName).get().toString(),
+            MCP_SCHEMA_REGISTRY_TOPIC_KEY + SYSTEM_UPDATE_TOPIC_KEY_ID_SUFFIX,
+            schemaRegistryService.getSchemaIdForTopic(mcpTopicName).get().toString()));
 
     log.info("DataHub System Update Registry");
-    return new SchemaRegistryConfig(
-        MockSystemUpdateSerializer.class, MockSystemUpdateDeserializer.class, props);
+    return kafkaConfiguration.getSerde().getEvent().toBuilder()
+        .value(
+            KafkaConfiguration.SerDeProperties.builder()
+                .serializer(MockSystemUpdateSerializer.class.getName())
+                .deserializer(MockSystemUpdateDeserializer.class.getName())
+                .build())
+        .properties(props)
+        .build();
   }
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/plugins/SpringStandardPluginConfiguration.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/plugins/SpringStandardPluginConfiguration.java
index fa4f520dc88c7c..67fe2dd6d605de 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/plugins/SpringStandardPluginConfiguration.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/plugins/SpringStandardPluginConfiguration.java
@@ -1,26 +1,42 @@
 package com.linkedin.gms.factory.plugins;
 
+import static com.linkedin.metadata.Constants.SCHEMA_METADATA_ASPECT_NAME;
+
+import com.linkedin.metadata.Constants;
 import com.linkedin.metadata.aspect.hooks.IgnoreUnknownMutator;
 import com.linkedin.metadata.aspect.plugins.config.AspectPluginConfig;
+import com.linkedin.metadata.aspect.plugins.hooks.MCPSideEffect;
 import com.linkedin.metadata.aspect.plugins.hooks.MutationHook;
+import com.linkedin.metadata.schemafields.sideeffects.SchemaFieldSideEffect;
+import com.linkedin.metadata.timeline.eventgenerator.EntityChangeEventGeneratorRegistry;
+import com.linkedin.metadata.timeline.eventgenerator.SchemaMetadataChangeEventGenerator;
 import java.util.List;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
+@Slf4j
 public class SpringStandardPluginConfiguration {
 
   @Value("${metadataChangeProposal.validation.ignoreUnknown}")
   private boolean ignoreUnknownEnabled;
 
+  @Value("${metadataChangeProposal.validation.extensions.enabled:false}")
+  private boolean extensionsEnabled;
+
   @Bean
+  @ConditionalOnProperty(
+      name = "metadataChangeProposal.validation.extensions.enabled",
+      havingValue = "false")
   public MutationHook ignoreUnknownMutator() {
     return new IgnoreUnknownMutator()
         .setConfig(
             AspectPluginConfig.builder()
                 .className(IgnoreUnknownMutator.class.getName())
-                .enabled(ignoreUnknownEnabled)
+                .enabled(ignoreUnknownEnabled && !extensionsEnabled)
                 .supportedOperations(List.of("CREATE", "CREATE_ENTITY", "UPSERT"))
                 .supportedEntityAspectNames(
                     List.of(
@@ -30,4 +46,38 @@ public MutationHook ignoreUnknownMutator() {
                             .build()))
                 .build());
   }
+
+  @Bean
+  @ConditionalOnProperty(
+      name = "metadataChangeProposal.sideEffects.schemaField.enabled",
+      havingValue = "true")
+  public MCPSideEffect schemaFieldSideEffect() {
+    AspectPluginConfig config =
+        AspectPluginConfig.builder()
+            .enabled(true)
+            .className(SchemaFieldSideEffect.class.getName())
+            .supportedOperations(List.of("CREATE", "CREATE_ENTITY", "UPSERT", "RESTATE", "DELETE"))
+            .supportedEntityAspectNames(
+                List.of(
+                    AspectPluginConfig.EntityAspectName.builder()
+                        .entityName(Constants.DATASET_ENTITY_NAME)
+                        .aspectName(Constants.STATUS_ASPECT_NAME)
+                        .build(),
+                    AspectPluginConfig.EntityAspectName.builder()
+                        .entityName(Constants.DATASET_ENTITY_NAME)
+                        .aspectName(Constants.SCHEMA_METADATA_ASPECT_NAME)
+                        .build()))
+            .build();
+
+    // prevent recursive dependency from using primary bean
+    final EntityChangeEventGeneratorRegistry entityChangeEventGeneratorRegistry =
+        new EntityChangeEventGeneratorRegistry();
+    entityChangeEventGeneratorRegistry.register(
+        SCHEMA_METADATA_ASPECT_NAME, new SchemaMetadataChangeEventGenerator());
+
+    log.info("Initialized {}", SchemaFieldSideEffect.class.getName());
+    return new SchemaFieldSideEffect()
+        .setConfig(config)
+        .setEntityChangeEventGeneratorRegistry(entityChangeEventGeneratorRegistry);
+  }
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/search/LineageSearchServiceFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/search/LineageSearchServiceFactory.java
index a0df92f6f6bb07..253a79a7b05a81 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/search/LineageSearchServiceFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/search/LineageSearchServiceFactory.java
@@ -32,6 +32,6 @@ protected LineageSearchService getInstance(
         graphService,
         cacheEnabled ? cacheManager.getCache(LINEAGE_SEARCH_SERVICE_CACHE_NAME) : null,
         cacheEnabled,
-        configurationProvider.getCache().getSearch().getLineage());
+        configurationProvider);
   }
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/BootstrapStep.java b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/BootstrapStep.java
index 16531466fcddc8..d907f0fe53d06c 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/BootstrapStep.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/BootstrapStep.java
@@ -1,6 +1,9 @@
 package com.linkedin.metadata.boot;
 
 import com.linkedin.common.urn.Urn;
+import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.data.template.SetMode;
+import com.linkedin.data.template.StringMap;
 import com.linkedin.events.metadata.ChangeType;
 import com.linkedin.metadata.Constants;
 import com.linkedin.metadata.entity.EntityService;
@@ -10,8 +13,12 @@
 import com.linkedin.metadata.utils.GenericRecordUtils;
 import com.linkedin.mxe.MetadataChangeProposal;
 import com.linkedin.upgrade.DataHubUpgradeResult;
+import com.linkedin.upgrade.DataHubUpgradeState;
 import io.datahubproject.metadata.context.OperationContext;
+import java.util.Map;
+import java.util.Optional;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /** A single step in the Bootstrap process. */
 public interface BootstrapStep {
@@ -40,10 +47,38 @@ static Urn getUpgradeUrn(String upgradeId) {
         new DataHubUpgradeKey().setId(upgradeId), Constants.DATA_HUB_UPGRADE_ENTITY_NAME);
   }
 
+  static Optional<DataHubUpgradeResult> getUpgradeResult(
+      @Nonnull OperationContext opContext, Urn urn, EntityService<?> entityService) {
+    RecordTemplate recordTemplate =
+        entityService.getLatestAspect(
+            opContext, urn, Constants.DATA_HUB_UPGRADE_RESULT_ASPECT_NAME);
+    return Optional.ofNullable(recordTemplate).map(rt -> new DataHubUpgradeResult(rt.data()));
+  }
+
   static void setUpgradeResult(
       @Nonnull OperationContext opContext, Urn urn, EntityService<?> entityService) {
+    setUpgradeResult(opContext, urn, entityService, null);
+  }
+
+  static void setUpgradeResult(
+      @Nonnull OperationContext opContext,
+      Urn urn,
+      EntityService<?> entityService,
+      @Nullable Map<String, String> result) {
+    setUpgradeResult(opContext, urn, entityService, DataHubUpgradeState.SUCCEEDED, result);
+  }
+
+  static void setUpgradeResult(
+      @Nonnull OperationContext opContext,
+      Urn urn,
+      EntityService<?> entityService,
+      @Nullable DataHubUpgradeState state,
+      @Nullable Map<String, String> result) {
     final DataHubUpgradeResult upgradeResult =
-        new DataHubUpgradeResult().setTimestampMs(System.currentTimeMillis());
+        new DataHubUpgradeResult()
+            .setTimestampMs(System.currentTimeMillis())
+            .setState(state, SetMode.IGNORE_NULL)
+            .setResult(result != null ? new StringMap(result) : null, SetMode.IGNORE_NULL);
 
     // Ingest the upgrade result
     final MetadataChangeProposal upgradeProposal = new MetadataChangeProposal();
diff --git a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/kafka/MockSystemUpdateSerializer.java b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/kafka/MockSystemUpdateSerializer.java
index 8699695fffbb90..ed2b3c817ed384 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/kafka/MockSystemUpdateSerializer.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/kafka/MockSystemUpdateSerializer.java
@@ -2,6 +2,7 @@
 
 import static com.linkedin.gms.factory.kafka.schemaregistry.SystemUpdateSchemaRegistryFactory.DUHE_SCHEMA_REGISTRY_TOPIC_KEY;
 import static com.linkedin.gms.factory.kafka.schemaregistry.SystemUpdateSchemaRegistryFactory.MCL_VERSIONED_SCHEMA_REGISTRY_TOPIC_KEY;
+import static com.linkedin.gms.factory.kafka.schemaregistry.SystemUpdateSchemaRegistryFactory.MCP_SCHEMA_REGISTRY_TOPIC_KEY;
 import static com.linkedin.gms.factory.kafka.schemaregistry.SystemUpdateSchemaRegistryFactory.SYSTEM_UPDATE_TOPIC_KEY_ID_SUFFIX;
 import static com.linkedin.gms.factory.kafka.schemaregistry.SystemUpdateSchemaRegistryFactory.SYSTEM_UPDATE_TOPIC_KEY_PREFIX;
 import static io.datahubproject.openapi.schema.registry.Constants.FIXED_SCHEMA_VERSION;
@@ -27,9 +28,12 @@ public class MockSystemUpdateSerializer extends KafkaAvroSerializer {
 
   private static final Map<String, AvroSchema> AVRO_SCHEMA_MAP =
       Map.of(
-          DUHE_SCHEMA_REGISTRY_TOPIC_KEY, new AvroSchema(EventUtils.ORIGINAL_DUHE_AVRO_SCHEMA),
+          DUHE_SCHEMA_REGISTRY_TOPIC_KEY,
+          new AvroSchema(EventUtils.ORIGINAL_DUHE_AVRO_SCHEMA),
           MCL_VERSIONED_SCHEMA_REGISTRY_TOPIC_KEY,
-              new AvroSchema(EventUtils.RENAMED_MCL_AVRO_SCHEMA));
+          new AvroSchema(EventUtils.RENAMED_MCL_AVRO_SCHEMA),
+          MCP_SCHEMA_REGISTRY_TOPIC_KEY,
+          new AvroSchema(EventUtils.RENAMED_MCP_AVRO_SCHEMA));
 
   private Map<String, Pair<AvroSchema, Integer>> topicNameToAvroSchemaMap;
 
diff --git a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/BackfillBrowsePathsV2Step.java b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/BackfillBrowsePathsV2Step.java
index 6743effd775b1b..668892bb46b7fe 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/BackfillBrowsePathsV2Step.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/BackfillBrowsePathsV2Step.java
@@ -1,6 +1,7 @@
 package com.linkedin.metadata.boot.steps;
 
 import static com.linkedin.metadata.Constants.*;
+import static com.linkedin.metadata.utils.SystemMetadataUtils.createDefaultSystemMetadata;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -23,7 +24,6 @@
 import com.linkedin.metadata.search.SearchService;
 import com.linkedin.metadata.utils.GenericRecordUtils;
 import com.linkedin.mxe.MetadataChangeProposal;
-import com.linkedin.mxe.SystemMetadata;
 import io.datahubproject.metadata.context.OperationContext;
 import java.util.Set;
 import javax.annotation.Nonnull;
@@ -152,8 +152,7 @@ private void ingestBrowsePathsV2(
     proposal.setEntityType(urn.getEntityType());
     proposal.setAspectName(Constants.BROWSE_PATHS_V2_ASPECT_NAME);
     proposal.setChangeType(ChangeType.UPSERT);
-    proposal.setSystemMetadata(
-        new SystemMetadata().setRunId(DEFAULT_RUN_ID).setLastObserved(System.currentTimeMillis()));
+    proposal.setSystemMetadata(createDefaultSystemMetadata());
     proposal.setAspect(GenericRecordUtils.serializeAspect(browsePathsV2));
     entityService.ingestProposal(systemOperationContext, proposal, auditStamp, false);
   }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestDataPlatformInstancesStep.java b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestDataPlatformInstancesStep.java
index 638d1a6fd0c8ac..22ce06a5984ea6 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestDataPlatformInstancesStep.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestDataPlatformInstancesStep.java
@@ -61,7 +61,7 @@ public void execute(@Nonnull OperationContext systemOperationContext) throws Exc
     long numEntities = _migrationsDao.countEntities();
     int start = 0;
 
-    while (start < numEntities) {
+    while (start < (int) numEntities) {
       log.info(
           "Reading urns {} to {} from the aspects table to generate dataplatform instance aspects",
           start,
diff --git a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestPoliciesStep.java b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestPoliciesStep.java
index baced32d3826e2..eb6bfe17ac198e 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestPoliciesStep.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestPoliciesStep.java
@@ -20,7 +20,6 @@
 import com.linkedin.metadata.query.ListUrnsResult;
 import com.linkedin.metadata.search.EntitySearchService;
 import com.linkedin.metadata.search.transformer.SearchDocumentTransformer;
-import com.linkedin.metadata.search.utils.SearchUtils;
 import com.linkedin.metadata.utils.EntityKeyUtils;
 import com.linkedin.metadata.utils.GenericRecordUtils;
 import com.linkedin.mxe.GenericAspect;
@@ -188,14 +187,11 @@ private void insertPolicyDocument(
       return;
     }
 
-    Optional<String> docId = SearchUtils.getDocId(entityResponse.getUrn());
-
-    if (!docId.isPresent()) {
-      return;
-    }
+    final String docId =
+        _entitySearchService.getIndexConvention().getEntityDocumentId(entityResponse.getUrn());
 
     _entitySearchService.upsertDocument(
-        systemOperationContext, Constants.POLICY_ENTITY_NAME, searchDocument.get(), docId.get());
+        systemOperationContext, Constants.POLICY_ENTITY_NAME, searchDocument.get(), docId);
   }
 
   private void ingestPolicy(
diff --git a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/UpgradeDefaultBrowsePathsStep.java b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/UpgradeDefaultBrowsePathsStep.java
index 765ba2f44a54d1..89846476a9875e 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/UpgradeDefaultBrowsePathsStep.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/UpgradeDefaultBrowsePathsStep.java
@@ -1,6 +1,7 @@
 package com.linkedin.metadata.boot.steps;
 
 import static com.linkedin.metadata.Constants.*;
+import static com.linkedin.metadata.utils.SystemMetadataUtils.createDefaultSystemMetadata;
 
 import com.google.common.collect.ImmutableSet;
 import com.linkedin.common.AuditStamp;
@@ -17,7 +18,6 @@
 import com.linkedin.metadata.search.utils.BrowsePathUtils;
 import com.linkedin.metadata.utils.GenericRecordUtils;
 import com.linkedin.mxe.MetadataChangeProposal;
-import com.linkedin.mxe.SystemMetadata;
 import io.datahubproject.metadata.context.OperationContext;
 import java.util.Set;
 import javax.annotation.Nonnull;
@@ -138,8 +138,7 @@ private void migrateBrowsePath(
     proposal.setEntityType(urn.getEntityType());
     proposal.setAspectName(Constants.BROWSE_PATHS_ASPECT_NAME);
     proposal.setChangeType(ChangeType.UPSERT);
-    proposal.setSystemMetadata(
-        new SystemMetadata().setRunId(DEFAULT_RUN_ID).setLastObserved(System.currentTimeMillis()));
+    proposal.setSystemMetadata(createDefaultSystemMetadata());
     proposal.setAspect(GenericRecordUtils.serializeAspect(newPaths));
     entityService.ingestProposal(opContext, proposal, auditStamp, false);
   }
diff --git a/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/GraphQLController.java b/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/GraphQLController.java
index 2f383b1956313d..2f66b30f55844c 100644
--- a/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/GraphQLController.java
+++ b/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/GraphQLController.java
@@ -15,6 +15,7 @@
 import com.linkedin.datahub.graphql.GraphQLEngine;
 import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
 import com.linkedin.datahub.graphql.exception.DataHubGraphQLError;
+import com.linkedin.gms.factory.config.ConfigurationProvider;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import graphql.ExecutionResult;
 import io.datahubproject.metadata.context.OperationContext;
@@ -51,6 +52,8 @@ public GraphQLController() {
 
   @Inject AuthorizerChain _authorizerChain;
 
+  @Inject ConfigurationProvider configurationProvider;
+
   @Nonnull
   @Inject
   @Named("systemOperationContext")
@@ -75,7 +78,7 @@ CompletableFuture<ResponseEntity<String>> postGraphQL(
     try {
       bodyJson = mapper.readTree(jsonStr);
     } catch (JsonProcessingException e) {
-      log.error("Failed to parse json {}", jsonStr);
+      log.error("Failed to parse json ", e);
       return CompletableFuture.completedFuture(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
     }
 
@@ -122,6 +125,7 @@ CompletableFuture<ResponseEntity<String>> postGraphQL(
             authentication,
             _authorizerChain,
             systemOperationContext,
+            configurationProvider,
             request,
             operationName,
             query,
diff --git a/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/SpringQueryContext.java b/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/SpringQueryContext.java
index 8aa22efb785e25..cd8ce56bf36f92 100644
--- a/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/SpringQueryContext.java
+++ b/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/SpringQueryContext.java
@@ -3,6 +3,7 @@
 import com.datahub.authentication.Authentication;
 import com.datahub.plugins.auth.authorization.Authorizer;
 import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.metadata.config.DataHubAppConfiguration;
 import graphql.language.OperationDefinition;
 import graphql.parser.Parser;
 import io.datahubproject.metadata.context.OperationContext;
@@ -21,12 +22,14 @@ public class SpringQueryContext implements QueryContext {
   private final Authorizer authorizer;
   @Getter private final String queryName;
   @Nonnull private final OperationContext operationContext;
+  @Nonnull private final DataHubAppConfiguration dataHubAppConfig;
 
   public SpringQueryContext(
       final boolean isAuthenticated,
       final Authentication authentication,
       final Authorizer authorizer,
       @Nonnull final OperationContext systemOperationContext,
+      @Nonnull final DataHubAppConfiguration dataHubAppConfig,
       @Nonnull final HttpServletRequest request,
       @Nullable final String operationName,
       String jsonQuery,
@@ -57,5 +60,7 @@ public SpringQueryContext(
             authorizer,
             authentication,
             true);
+
+    this.dataHubAppConfig = dataHubAppConfig;
   }
 }
diff --git a/metadata-service/openapi-entity-servlet/src/main/java/io/datahubproject/openapi/v2/delegates/EntityApiDelegateImpl.java b/metadata-service/openapi-entity-servlet/src/main/java/io/datahubproject/openapi/v2/delegates/EntityApiDelegateImpl.java
index 9e671bfb7e01e5..c5f87c3f1dced4 100644
--- a/metadata-service/openapi-entity-servlet/src/main/java/io/datahubproject/openapi/v2/delegates/EntityApiDelegateImpl.java
+++ b/metadata-service/openapi-entity-servlet/src/main/java/io/datahubproject/openapi/v2/delegates/EntityApiDelegateImpl.java
@@ -61,6 +61,7 @@
 import io.datahubproject.openapi.v1.entities.EntitiesController;
 import jakarta.servlet.http.HttpServletRequest;
 import java.net.URISyntaxException;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -628,12 +629,18 @@ public ResponseEntity<S> scroll(
             authentication,
             true);
 
-    // TODO multi-field sort
-    SortCriterion sortCriterion = new SortCriterion();
-    sortCriterion.setField(Optional.ofNullable(sort).map(s -> s.get(0)).orElse("urn"));
-    sortCriterion.setOrder(
-        com.linkedin.metadata.query.filter.SortOrder.valueOf(
-            Optional.ofNullable(sortOrder).map(Enum::name).orElse("ASCENDING")));
+    List<SortCriterion> sortCriteria =
+        Optional.ofNullable(sort).orElse(Collections.singletonList("urn")).stream()
+            .map(
+                sortField -> {
+                  SortCriterion sortCriterion = new SortCriterion();
+                  sortCriterion.setField(sortField);
+                  sortCriterion.setOrder(
+                      com.linkedin.metadata.query.filter.SortOrder.valueOf(
+                          Optional.ofNullable(sortOrder).map(Enum::name).orElse("ASCENDING")));
+                  return sortCriterion;
+                })
+            .collect(Collectors.toList());
 
     ScrollResult result =
         _searchService.scrollAcrossEntities(
@@ -641,7 +648,7 @@ public ResponseEntity<S> scroll(
             List.of(entitySpec.getName()),
             query,
             null,
-            sortCriterion,
+            sortCriteria,
             scrollId,
             null,
             count);
diff --git a/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v3/models/AspectItem.java b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v3/models/AspectItem.java
new file mode 100644
index 00000000000000..ec5dff7817231c
--- /dev/null
+++ b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v3/models/AspectItem.java
@@ -0,0 +1,15 @@
+package io.datahubproject.openapi.v3.models;
+
+import com.linkedin.common.AuditStamp;
+import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.mxe.SystemMetadata;
+import lombok.Builder;
+import lombok.Value;
+
+@Builder(toBuilder = true)
+@Value
+public class AspectItem {
+  RecordTemplate aspect;
+  SystemMetadata systemMetadata;
+  AuditStamp auditStamp;
+}
diff --git a/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v3/models/GenericAspectV3.java b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v3/models/GenericAspectV3.java
index 4db2c3288d1547..70bf2182c29f47 100644
--- a/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v3/models/GenericAspectV3.java
+++ b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v3/models/GenericAspectV3.java
@@ -19,4 +19,5 @@ public class GenericAspectV3 implements GenericAspect {
   @Nonnull Map<String, Object> value;
   @Nullable Map<String, Object> systemMetadata;
   @Nullable Map<String, String> headers;
+  @Nullable Map<String, Object> auditStamp;
 }
diff --git a/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v3/models/GenericEntityV3.java b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v3/models/GenericEntityV3.java
index 3af3b25028fadc..54d6ac2c1736f4 100644
--- a/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v3/models/GenericEntityV3.java
+++ b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v3/models/GenericEntityV3.java
@@ -5,9 +5,6 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.linkedin.common.urn.Urn;
-import com.linkedin.data.template.RecordTemplate;
-import com.linkedin.mxe.SystemMetadata;
-import com.linkedin.util.Pair;
 import io.datahubproject.openapi.models.GenericEntity;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -42,9 +39,7 @@ public Map<String, GenericAspectV3> getAspects() {
   public static class GenericEntityV3Builder {
 
     public GenericEntityV3 build(
-        ObjectMapper objectMapper,
-        @Nonnull Urn urn,
-        Map<String, Pair<RecordTemplate, SystemMetadata>> aspects) {
+        ObjectMapper objectMapper, @Nonnull Urn urn, Map<String, AspectItem> aspects) {
       Map<String, GenericAspectV3> jsonObjectMap =
           aspects.entrySet().stream()
               .map(
@@ -53,13 +48,18 @@ public GenericEntityV3 build(
                       String aspectName = entry.getKey();
                       Map<String, Object> aspectValue =
                           objectMapper.readValue(
-                              RecordUtils.toJsonString(entry.getValue().getFirst())
+                              RecordUtils.toJsonString(entry.getValue().getAspect())
                                   .getBytes(StandardCharsets.UTF_8),
                               new TypeReference<>() {});
                       Map<String, Object> systemMetadata =
-                          entry.getValue().getSecond() != null
+                          entry.getValue().getSystemMetadata() != null
                               ? objectMapper.convertValue(
-                                  entry.getValue().getSecond(), new TypeReference<>() {})
+                                  entry.getValue().getSystemMetadata(), new TypeReference<>() {})
+                              : null;
+                      Map<String, Object> auditStamp =
+                          entry.getValue().getAuditStamp() != null
+                              ? objectMapper.convertValue(
+                                  entry.getValue().getAuditStamp().data(), new TypeReference<>() {})
                               : null;
 
                       return Map.entry(
@@ -67,6 +67,7 @@ public GenericEntityV3 build(
                           GenericAspectV3.builder()
                               .value(aspectValue)
                               .systemMetadata(systemMetadata)
+                              .auditStamp(auditStamp)
                               .build());
                     } catch (IOException ex) {
                       throw new RuntimeException(ex);
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
index 61c641e358f090..622cf20af9ff57 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
@@ -23,7 +23,9 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import javax.annotation.Nonnull;
 import org.springdoc.core.models.GroupedOpenApi;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.format.FormatterRegistry;
@@ -32,6 +34,7 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @OpenAPIDefinition(
@@ -48,6 +51,9 @@ public class SpringWebConfig implements WebMvcConfigurer {
   private static final Set<String> OPENLINEAGE_PACKAGES =
       Set.of("io.datahubproject.openapi.openlineage");
 
+  @Value("${datahub.gms.async.request-timeout-ms}")
+  private long asyncTimeoutMilliseconds;
+
   @Override
   public void configureMessageConverters(List<HttpMessageConverter<?>> messageConverters) {
     messageConverters.add(new StringHttpMessageConverter());
@@ -158,4 +164,10 @@ private <K, V> Map<K, V> concat(Supplier<Map<K, V>> a, Supplier<Map<K, V>> b) {
                         (v1, v2) -> v2,
                         LinkedHashMap::new));
   }
+
+  @Override
+  public void configureAsyncSupport(@Nonnull AsyncSupportConfigurer configurer) {
+    WebMvcConfigurer.super.configureAsyncSupport(configurer);
+    configurer.setDefaultTimeout(asyncTimeoutMilliseconds);
+  }
 }
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/controller/GenericEntitiesController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/controller/GenericEntitiesController.java
index de5d2ae1118d4a..8d89417b292155 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/controller/GenericEntitiesController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/controller/GenericEntitiesController.java
@@ -13,14 +13,11 @@
 import com.datahub.authorization.AuthorizerChain;
 import com.datahub.util.RecordUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableSet;
 import com.linkedin.common.urn.Urn;
-import com.linkedin.data.ByteString;
 import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.entity.EnvelopedAspect;
-import com.linkedin.events.metadata.ChangeType;
 import com.linkedin.metadata.aspect.AspectRetriever;
 import com.linkedin.metadata.aspect.batch.AspectsBatch;
 import com.linkedin.metadata.aspect.batch.ChangeMCP;
@@ -41,7 +38,6 @@
 import com.linkedin.metadata.search.SearchEntityArray;
 import com.linkedin.metadata.search.SearchService;
 import com.linkedin.metadata.utils.AuditStampUtils;
-import com.linkedin.metadata.utils.GenericRecordUtils;
 import com.linkedin.metadata.utils.SearchUtil;
 import com.linkedin.mxe.SystemMetadata;
 import com.linkedin.util.Pair;
@@ -57,7 +53,6 @@
 import jakarta.servlet.http.HttpServletRequest;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
@@ -66,6 +61,7 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
@@ -171,6 +167,7 @@ public ResponseEntity<S> getEntities(
       @RequestParam(value = "query", defaultValue = "*") String query,
       @RequestParam(value = "scrollId", required = false) String scrollId,
       @RequestParam(value = "sort", required = false, defaultValue = "urn") String sortField,
+      @RequestParam(value = "sortCriteria", required = false) List<String> sortFields,
       @RequestParam(value = "sortOrder", required = false, defaultValue = "ASCENDING")
           String sortOrder,
       @RequestParam(value = "systemMetadata", required = false, defaultValue = "false")
@@ -199,8 +196,15 @@ public ResponseEntity<S> getEntities(
             authentication,
             true);
 
-    // TODO: support additional and multiple sort params
-    SortCriterion sortCriterion = SearchUtil.sortBy(sortField, SortOrder.valueOf(sortOrder));
+    List<SortCriterion> sortCriteria;
+    if (!CollectionUtils.isEmpty(sortFields)) {
+      sortCriteria = new ArrayList<>();
+      sortFields.forEach(
+          field -> sortCriteria.add(SearchUtil.sortBy(field, SortOrder.valueOf(sortOrder))));
+    } else {
+      sortCriteria =
+          Collections.singletonList(SearchUtil.sortBy(sortField, SortOrder.valueOf(sortOrder)));
+    }
 
     ScrollResult result =
         searchService.scrollAcrossEntities(
@@ -211,7 +215,7 @@ public ResponseEntity<S> getEntities(
             List.of(entitySpec.getName()),
             query,
             null,
-            sortCriterion,
+            sortCriteria,
             scrollId,
             null,
             count);
@@ -726,28 +730,14 @@ protected RecordTemplate toRecordTemplate(
         aspectSpec.getDataTemplateClass(), envelopedAspect.getValue().data());
   }
 
-  protected ChangeMCP toUpsertItem(
+  protected abstract ChangeMCP toUpsertItem(
       @Nonnull AspectRetriever aspectRetriever,
       Urn entityUrn,
       AspectSpec aspectSpec,
       Boolean createIfNotExists,
       String jsonAspect,
       Actor actor)
-      throws JsonProcessingException {
-    JsonNode jsonNode = objectMapper.readTree(jsonAspect);
-    String aspectJson = jsonNode.get("value").toString();
-    return ChangeItemImpl.builder()
-        .urn(entityUrn)
-        .aspectName(aspectSpec.getName())
-        .changeType(Boolean.TRUE.equals(createIfNotExists) ? ChangeType.CREATE : ChangeType.UPSERT)
-        .auditStamp(AuditStampUtils.createAuditStamp(actor.toUrnStr()))
-        .recordTemplate(
-            GenericRecordUtils.deserializeAspect(
-                ByteString.copyString(aspectJson, StandardCharsets.UTF_8),
-                GenericRecordUtils.JSON,
-                aspectSpec))
-        .build(aspectRetriever);
-  }
+      throws URISyntaxException, JsonProcessingException;
 
   protected ChangeMCP toUpsertItem(
       @Nonnull AspectRetriever aspectRetriever,
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/elastic/OperationsController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/elastic/OperationsController.java
index ddbc8004081eb6..ea72bac73edf38 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/elastic/OperationsController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/elastic/OperationsController.java
@@ -20,6 +20,7 @@
 import com.linkedin.metadata.entity.restoreindices.RestoreIndicesResult;
 import com.linkedin.metadata.query.SearchFlags;
 import com.linkedin.metadata.query.filter.Filter;
+import com.linkedin.metadata.query.filter.SortCriterion;
 import com.linkedin.metadata.search.EntitySearchService;
 import com.linkedin.metadata.systemmetadata.SystemMetadataService;
 import com.linkedin.metadata.timeseries.TimeseriesAspectService;
@@ -214,6 +215,13 @@ public ResponseEntity<ExplainResponse> explainSearchQuery(
           @RequestParam(value = "filters", required = false)
           @Nullable
           String filters,
+      @Parameter(
+              name = "sortCriteria",
+              required = false,
+              description = "Criteria to sort results on.")
+          @RequestParam("sortCriteria")
+          @Nullable
+          List<SortCriterion> sortCriteria,
       @Parameter(name = "searchFlags", description = "Optional configuration flags.")
           @RequestParam(value = "searchFlags", required = false)
           @Nullable
@@ -253,7 +261,7 @@ public ResponseEntity<ExplainResponse> explainSearchQuery(
             encodeValue(documentId),
             entityName,
             filters == null ? null : objectMapper.readValue(filters, Filter.class),
-            null,
+            sortCriteria,
             scrollId,
             keepAlive,
             size,
@@ -315,6 +323,13 @@ public ResponseEntity<String> explainSearchQueryDiff(
           @RequestParam(value = "filters", required = false)
           @Nullable
           String filters,
+      @Parameter(
+              name = "sortCriteria",
+              required = false,
+              description = "Criteria to sort results on.")
+          @RequestParam("sortCriteria")
+          @Nullable
+          List<SortCriterion> sortCriteria,
       @Parameter(name = "searchFlags", description = "Optional configuration flags.")
           @RequestParam(value = "searchFlags", required = false)
           @Nullable
@@ -354,7 +369,7 @@ public ResponseEntity<String> explainSearchQueryDiff(
             encodeValue(documentIdA),
             entityName,
             filters == null ? null : objectMapper.readValue(filters, Filter.class),
-            null,
+            sortCriteria,
             scrollId,
             keepAlive,
             size,
@@ -367,7 +382,7 @@ public ResponseEntity<String> explainSearchQueryDiff(
             encodeValue(documentIdB),
             entityName,
             filters == null ? null : objectMapper.readValue(filters, Filter.class),
-            null,
+            sortCriteria,
             scrollId,
             keepAlive,
             size,
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java
index 54a7724cadd345..1207eb331b795e 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java
@@ -13,8 +13,11 @@
 import com.linkedin.data.ByteString;
 import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.entity.EnvelopedAspect;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.aspect.AspectRetriever;
 import com.linkedin.metadata.aspect.batch.AspectsBatch;
 import com.linkedin.metadata.aspect.batch.BatchItem;
+import com.linkedin.metadata.aspect.batch.ChangeMCP;
 import com.linkedin.metadata.entity.EntityApiUtils;
 import com.linkedin.metadata.entity.IngestResult;
 import com.linkedin.metadata.entity.UpdateAspectResult;
@@ -260,4 +263,26 @@ protected List<GenericEntityV2> buildEntityList(
     }
     return responseList;
   }
+
+  @Override
+  protected ChangeMCP toUpsertItem(
+      @Nonnull AspectRetriever aspectRetriever,
+      Urn entityUrn,
+      AspectSpec aspectSpec,
+      Boolean createIfNotExists,
+      String jsonAspect,
+      Actor actor)
+      throws URISyntaxException {
+    return ChangeItemImpl.builder()
+        .urn(entityUrn)
+        .aspectName(aspectSpec.getName())
+        .changeType(Boolean.TRUE.equals(createIfNotExists) ? ChangeType.CREATE : ChangeType.UPSERT)
+        .auditStamp(AuditStampUtils.createAuditStamp(actor.toUrnStr()))
+        .recordTemplate(
+            GenericRecordUtils.deserializeAspect(
+                ByteString.copyString(jsonAspect, StandardCharsets.UTF_8),
+                GenericRecordUtils.JSON,
+                aspectSpec))
+        .build(aspectRetriever);
+  }
 }
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/TimeseriesController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/TimeseriesController.java
index bb10719bacd3fa..4e8c0abcb0c227 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/TimeseriesController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/TimeseriesController.java
@@ -90,7 +90,7 @@ public ResponseEntity<GenericScrollResult<GenericTimeseriesAspect>> getAspects(
       throw new IllegalArgumentException("Only timeseries aspects are supported.");
     }
 
-    List<SortCriterion> sortCriterion =
+    List<SortCriterion> sortCriteria =
         List.of(
             SearchUtil.sortBy("timestampMillis", SortOrder.DESCENDING),
             SearchUtil.sortBy("messageId", SortOrder.DESCENDING));
@@ -101,7 +101,7 @@ public ResponseEntity<GenericScrollResult<GenericTimeseriesAspect>> getAspects(
             entityName,
             aspectName,
             null,
-            sortCriterion,
+            sortCriteria,
             scrollId,
             count,
             startTimeMillis,
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java
index f26ad6821c5833..f6f248be77c670 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java
@@ -40,7 +40,7 @@ public class OpenAPIV3Generator {
   private static final String NAME_QUERY = "query";
   private static final String NAME_PATH = "path";
   private static final String NAME_SYSTEM_METADATA = "systemMetadata";
-  private static final String NAME_ASYNC = "async";
+  private static final String NAME_AUDIT_STAMP = "auditStamp";
   private static final String NAME_VERSION = "version";
   private static final String NAME_SCROLL_ID = "scrollId";
   private static final String NAME_INCLUDE_SOFT_DELETE = "includeSoftDelete";
@@ -77,9 +77,6 @@ public static OpenAPI generateOpenApiSpec(EntityRegistry entityRegistry) {
     // Components
     final Components components = new Components();
     // --> Aspect components
-    // TODO: Correct handling of SystemMetadata and SortOrder
-    components.addSchemas(
-        "SystemMetadata", new Schema().type(TYPE_OBJECT).additionalProperties(true));
     components.addSchemas("SortOrder", new Schema()._enum(List.of("ASCENDING", "DESCENDING")));
     components.addSchemas("AspectPatch", buildAspectPatchSchema());
     components.addSchemas(
@@ -167,6 +164,10 @@ public static OpenAPI generateOpenApiSpec(EntityRegistry entityRegistry) {
                               buildSingleEntityAspectPath(
                                   e, a.getName(), a.getPegasusSchema().getName())));
             });
+    // TODO: Correct handling of SystemMetadata and AuditStamp
+    components.addSchemas(
+        "SystemMetadata", new Schema().type(TYPE_OBJECT).additionalProperties(true));
+    components.addSchemas("AuditStamp", new Schema().type(TYPE_OBJECT).additionalProperties(true));
     return new OpenAPI().openapi("3.0.1").info(info).paths(paths).components(components);
   }
 
@@ -185,7 +186,7 @@ private static PathItem buildSingleEntityPath(final EntitySpec entity) {
                 .schema(new Schema().type(TYPE_STRING)),
             new Parameter()
                 .in(NAME_QUERY)
-                .name("systemMetadata")
+                .name(NAME_SYSTEM_METADATA)
                 .description("Include systemMetadata with response.")
                 .schema(new Schema().type(TYPE_BOOLEAN)._default(false)),
             new Parameter()
@@ -424,7 +425,7 @@ private static PathItem buildBatchGetEntityPath(final EntitySpec entity) {
                 List.of(
                     new Parameter()
                         .in(NAME_QUERY)
-                        .name("systemMetadata")
+                        .name(NAME_SYSTEM_METADATA)
                         .description("Include systemMetadata with response.")
                         .schema(new Schema().type(TYPE_BOOLEAN)._default(false))))
             .requestBody(
@@ -575,12 +576,19 @@ private static Schema buildAspectRefResponseSchema(final String aspectName) {
             .required(List.of(PROPERTY_VALUE))
             .addProperty(PROPERTY_VALUE, new Schema<>().$ref(PATH_DEFINITIONS + aspectName));
     result.addProperty(
-        "systemMetadata",
+        NAME_SYSTEM_METADATA,
         new Schema<>()
             .type(TYPE_OBJECT)
             .anyOf(List.of(new Schema().$ref(PATH_DEFINITIONS + "SystemMetadata")))
             .description("System metadata for the aspect.")
             .nullable(true));
+    result.addProperty(
+        NAME_AUDIT_STAMP,
+        new Schema<>()
+            .type(TYPE_OBJECT)
+            .anyOf(List.of(new Schema().$ref(PATH_DEFINITIONS + "AuditStamp")))
+            .description("Audit stamp for the aspect.")
+            .nullable(true));
     return result;
   }
 
@@ -592,7 +600,7 @@ private static Schema buildAspectRefRequestSchema(final String aspectName) {
             .required(List.of(PROPERTY_VALUE))
             .addProperty(PROPERTY_VALUE, new Schema<>().$ref(PATH_DEFINITIONS + aspectName));
     result.addProperty(
-        "systemMetadata",
+        NAME_SYSTEM_METADATA,
         new Schema<>()
             .type(TYPE_OBJECT)
             .anyOf(List.of(new Schema().$ref(PATH_DEFINITIONS + "SystemMetadata")))
@@ -867,7 +875,7 @@ private static PathItem buildSingleEntityAspectPath(
                 List.of(
                     new Parameter()
                         .in(NAME_QUERY)
-                        .name("systemMetadata")
+                        .name(NAME_SYSTEM_METADATA)
                         .description("Include systemMetadata with response.")
                         .schema(new Schema().type(TYPE_BOOLEAN)._default(false))))
             .summary(String.format("Patch aspect %s on %s ", aspect, upperFirstEntity))
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java
index 9ca34934e4c657..fbc9bf2956cfd3 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java
@@ -13,10 +13,12 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.data.ByteString;
-import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.entity.EnvelopedAspect;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.aspect.AspectRetriever;
 import com.linkedin.metadata.aspect.batch.AspectsBatch;
 import com.linkedin.metadata.aspect.batch.BatchItem;
+import com.linkedin.metadata.aspect.batch.ChangeMCP;
 import com.linkedin.metadata.entity.EntityApiUtils;
 import com.linkedin.metadata.entity.IngestResult;
 import com.linkedin.metadata.entity.UpdateAspectResult;
@@ -28,12 +30,12 @@
 import com.linkedin.metadata.utils.AuditStampUtils;
 import com.linkedin.metadata.utils.GenericRecordUtils;
 import com.linkedin.mxe.SystemMetadata;
-import com.linkedin.util.Pair;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.metadata.context.RequestContext;
 import io.datahubproject.openapi.controller.GenericEntitiesController;
 import io.datahubproject.openapi.exception.InvalidUrnException;
 import io.datahubproject.openapi.exception.UnauthorizedException;
+import io.datahubproject.openapi.v3.models.AspectItem;
 import io.datahubproject.openapi.v3.models.GenericAspectV3;
 import io.datahubproject.openapi.v3.models.GenericEntityScrollResultV3;
 import io.datahubproject.openapi.v3.models.GenericEntityV3;
@@ -143,11 +145,27 @@ protected List<GenericEntityV3> buildEntityVersionedAspectList(
           .map(
               u ->
                   GenericEntityV3.builder()
-                      .build(objectMapper, u, toAspectMap(u, aspects.get(u), withSystemMetadata)))
+                      .build(
+                          objectMapper, u, toAspectItemMap(u, aspects.get(u), withSystemMetadata)))
           .collect(Collectors.toList());
     }
   }
 
+  private Map<String, AspectItem> toAspectItemMap(
+      Urn urn, List<EnvelopedAspect> aspects, boolean withSystemMetadata) {
+    return aspects.stream()
+        .map(
+            a ->
+                Map.entry(
+                    a.getName(),
+                    AspectItem.builder()
+                        .aspect(toRecordTemplate(lookupAspectSpec(urn, a.getName()), a))
+                        .systemMetadata(withSystemMetadata ? a.getSystemMetadata() : null)
+                        .auditStamp(withSystemMetadata ? a.getCreated() : null)
+                        .build()))
+        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+  }
+
   @Override
   protected List<GenericEntityV3> buildEntityList(
       Set<IngestResult> ingestResults, boolean withSystemMetadata) {
@@ -156,15 +174,21 @@ protected List<GenericEntityV3> buildEntityList(
     Map<Urn, List<IngestResult>> entityMap =
         ingestResults.stream().collect(Collectors.groupingBy(IngestResult::getUrn));
     for (Map.Entry<Urn, List<IngestResult>> urnAspects : entityMap.entrySet()) {
-      Map<String, Pair<RecordTemplate, SystemMetadata>> aspectsMap =
+      Map<String, AspectItem> aspectsMap =
           urnAspects.getValue().stream()
               .map(
                   ingest ->
                       Map.entry(
                           ingest.getRequest().getAspectName(),
-                          Pair.of(
-                              ingest.getRequest().getRecordTemplate(),
-                              withSystemMetadata ? ingest.getRequest().getSystemMetadata() : null)))
+                          AspectItem.builder()
+                              .aspect(ingest.getRequest().getRecordTemplate())
+                              .systemMetadata(
+                                  withSystemMetadata
+                                      ? ingest.getRequest().getSystemMetadata()
+                                      : null)
+                              .auditStamp(
+                                  withSystemMetadata ? ingest.getRequest().getAuditStamp() : null)
+                              .build()))
               .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
       responseList.add(
           GenericEntityV3.builder().build(objectMapper, urnAspects.getKey(), aspectsMap));
@@ -183,9 +207,12 @@ protected GenericEntityV3 buildGenericEntity(
             updateAspectResult.getUrn(),
             Map.of(
                 aspectName,
-                Pair.of(
-                    updateAspectResult.getNewValue(),
-                    withSystemMetadata ? updateAspectResult.getNewSystemMetadata() : null)));
+                AspectItem.builder()
+                    .aspect(updateAspectResult.getNewValue())
+                    .systemMetadata(
+                        withSystemMetadata ? updateAspectResult.getNewSystemMetadata() : null)
+                    .auditStamp(withSystemMetadata ? updateAspectResult.getAuditStamp() : null)
+                    .build()));
   }
 
   private List<GenericEntityV3> toRecordTemplates(
@@ -324,4 +351,28 @@ protected AspectsBatch toMCPBatch(
         .retrieverContext(opContext.getRetrieverContext().get())
         .build();
   }
+
+  @Override
+  protected ChangeMCP toUpsertItem(
+      @Nonnull AspectRetriever aspectRetriever,
+      Urn entityUrn,
+      AspectSpec aspectSpec,
+      Boolean createIfNotExists,
+      String jsonAspect,
+      Actor actor)
+      throws JsonProcessingException {
+    JsonNode jsonNode = objectMapper.readTree(jsonAspect);
+    String aspectJson = jsonNode.get("value").toString();
+    return ChangeItemImpl.builder()
+        .urn(entityUrn)
+        .aspectName(aspectSpec.getName())
+        .changeType(Boolean.TRUE.equals(createIfNotExists) ? ChangeType.CREATE : ChangeType.UPSERT)
+        .auditStamp(AuditStampUtils.createAuditStamp(actor.toUrnStr()))
+        .recordTemplate(
+            GenericRecordUtils.deserializeAspect(
+                ByteString.copyString(aspectJson, StandardCharsets.UTF_8),
+                GenericRecordUtils.JSON,
+                aspectSpec))
+        .build(aspectRetriever);
+  }
 }
diff --git a/metadata-service/openapi-servlet/src/test/java/entities/EntitiesControllerTest.java b/metadata-service/openapi-servlet/src/test/java/entities/EntitiesControllerTest.java
index 3e352403c88bca..8b530b218532d0 100644
--- a/metadata-service/openapi-servlet/src/test/java/entities/EntitiesControllerTest.java
+++ b/metadata-service/openapi-servlet/src/test/java/entities/EntitiesControllerTest.java
@@ -14,6 +14,7 @@
 import com.linkedin.metadata.aspect.batch.AspectsBatch;
 import com.linkedin.metadata.config.PreProcessHooks;
 import com.linkedin.metadata.entity.AspectDao;
+import com.linkedin.metadata.entity.TransactionContext;
 import com.linkedin.metadata.entity.UpdateAspectResult;
 import com.linkedin.metadata.event.EventProducer;
 import io.datahubproject.metadata.context.OperationContext;
@@ -69,14 +70,14 @@ public void setup()
     OperationContext opContext = TestOperationContexts.systemContextNoSearchAuthorization();
     AspectDao aspectDao = Mockito.mock(AspectDao.class);
     when(aspectDao.runInTransactionWithRetry(
-            ArgumentMatchers.<Function<Transaction, List<UpdateAspectResult>>>any(),
+            ArgumentMatchers.<Function<TransactionContext, List<UpdateAspectResult>>>any(),
             any(AspectsBatch.class),
             anyInt()))
         .thenAnswer(
             i ->
                 List.of(
-                    ((Function<Transaction, List<UpdateAspectResult>>) i.getArgument(0))
-                        .apply(Mockito.mock(Transaction.class))));
+                    ((Function<TransactionContext, List<UpdateAspectResult>>) i.getArgument(0))
+                        .apply(TransactionContext.empty(Mockito.mock(Transaction.class), 0))));
 
     EventProducer mockEntityEventProducer = Mockito.mock(EventProducer.class);
     PreProcessHooks preProcessHooks = new PreProcessHooks();
diff --git a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java
index 3c7e93621f5cce..60425fc7e756ed 100644
--- a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java
+++ b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java
@@ -37,6 +37,7 @@
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.openapi.config.SpringWebConfig;
 import io.datahubproject.test.metadata.context.TestOperationContexts;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -95,7 +96,7 @@ public void testSearchOrderPreserved() throws Exception {
             eq(List.of("dataset")),
             anyString(),
             nullable(Filter.class),
-            eq(SearchUtil.sortBy("urn", SortOrder.valueOf("ASCENDING"))),
+            eq(Collections.singletonList(SearchUtil.sortBy("urn", SortOrder.valueOf("ASCENDING")))),
             nullable(String.class),
             nullable(String.class),
             anyInt()))
@@ -113,7 +114,9 @@ public void testSearchOrderPreserved() throws Exception {
             eq(List.of("dataset")),
             anyString(),
             nullable(Filter.class),
-            eq(SearchUtil.sortBy("urn", SortOrder.valueOf("DESCENDING"))),
+            eq(
+                Collections.singletonList(
+                    SearchUtil.sortBy("urn", SortOrder.valueOf("DESCENDING")))),
             nullable(String.class),
             nullable(String.class),
             anyInt()))
diff --git a/metadata-service/restli-api/src/main/idl/com.linkedin.entity.entities.restspec.json b/metadata-service/restli-api/src/main/idl/com.linkedin.entity.entities.restspec.json
index fe53b43ccd1da8..935a4293839281 100644
--- a/metadata-service/restli-api/src/main/idl/com.linkedin.entity.entities.restspec.json
+++ b/metadata-service/restli-api/src/main/idl/com.linkedin.entity.entities.restspec.json
@@ -199,6 +199,10 @@
         "name" : "sort",
         "type" : "com.linkedin.metadata.query.filter.SortCriterion",
         "optional" : true
+      }, {
+        "name" : "sortCriteria",
+        "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.metadata.query.filter.SortCriterion\" }",
+        "optional" : true
       }, {
         "name" : "start",
         "type" : "int"
@@ -248,6 +252,10 @@
         "name" : "sort",
         "type" : "com.linkedin.metadata.query.filter.SortCriterion",
         "optional" : true
+      }, {
+        "name" : "sortCriteria",
+        "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.metadata.query.filter.SortCriterion\" }",
+        "optional" : true
       }, {
         "name" : "start",
         "type" : "int"
@@ -288,6 +296,10 @@
         "name" : "sort",
         "type" : "com.linkedin.metadata.query.filter.SortCriterion",
         "optional" : true
+      }, {
+        "name" : "sortCriteria",
+        "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.metadata.query.filter.SortCriterion\" }",
+        "optional" : true
       }, {
         "name" : "scrollId",
         "type" : "string",
@@ -333,6 +345,10 @@
         "name" : "sort",
         "type" : "com.linkedin.metadata.query.filter.SortCriterion",
         "optional" : true
+      }, {
+        "name" : "sortCriteria",
+        "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.metadata.query.filter.SortCriterion\" }",
+        "optional" : true
       }, {
         "name" : "scrollId",
         "type" : "string",
@@ -374,6 +390,10 @@
         "name" : "sort",
         "type" : "com.linkedin.metadata.query.filter.SortCriterion",
         "optional" : true
+      }, {
+        "name" : "sortCriteria",
+        "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.metadata.query.filter.SortCriterion\" }",
+        "optional" : true
       }, {
         "name" : "start",
         "type" : "int"
@@ -411,6 +431,10 @@
         "name" : "sort",
         "type" : "com.linkedin.metadata.query.filter.SortCriterion",
         "optional" : true
+      }, {
+        "name" : "sortCriteria",
+        "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.metadata.query.filter.SortCriterion\" }",
+        "optional" : true
       }, {
         "name" : "start",
         "type" : "int"
@@ -452,6 +476,10 @@
         "name" : "sort",
         "type" : "com.linkedin.metadata.query.filter.SortCriterion",
         "optional" : true
+      }, {
+        "name" : "sortCriteria",
+        "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.metadata.query.filter.SortCriterion\" }",
+        "optional" : true
       }, {
         "name" : "start",
         "type" : "int"
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json
index eb92cf75a4d4e2..3688311b1f2345 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json
@@ -902,6 +902,51 @@
             "type" : "string",
             "doc" : "Additional context about the association",
             "optional" : true
+          }, {
+            "name" : "attribution",
+            "type" : {
+              "type" : "record",
+              "name" : "MetadataAttribution",
+              "doc" : "Information about who, why, and how this metadata was applied",
+              "fields" : [ {
+                "name" : "time",
+                "type" : "Time",
+                "doc" : "When this metadata was updated."
+              }, {
+                "name" : "actor",
+                "type" : "Urn",
+                "doc" : "The entity (e.g. a member URN) responsible for applying the assocated metadata. This can\neither be a user (in case of UI edits) or the datahub system for automation."
+              }, {
+                "name" : "source",
+                "type" : "Urn",
+                "doc" : "The DataHub source responsible for applying the associated metadata. This will only be filled out\nwhen a DataHub source is responsible. This includes the specific metadata test urn, the automation urn.",
+                "optional" : true
+              }, {
+                "name" : "sourceDetail",
+                "type" : {
+                  "type" : "map",
+                  "values" : "string"
+                },
+                "doc" : "The details associated with why this metadata was applied. For example, this could include\nthe actual regex rule, sql statement, ingestion pipeline ID, etc.",
+                "default" : { }
+              } ]
+            },
+            "doc" : "Information about who, why, and how this metadata was applied",
+            "optional" : true,
+            "Searchable" : {
+              "/actor" : {
+                "fieldName" : "tagAttributionActors",
+                "fieldType" : "URN"
+              },
+              "/source" : {
+                "fieldName" : "tagAttributionSources",
+                "fieldType" : "URN"
+              },
+              "/time" : {
+                "fieldName" : "tagAttributionDates",
+                "fieldType" : "DATETIME"
+              }
+            }
           } ]
         }
       },
@@ -1010,6 +1055,25 @@
       "type" : "string",
       "doc" : "Additional context about the association",
       "optional" : true
+    }, {
+      "name" : "attribution",
+      "type" : "MetadataAttribution",
+      "doc" : "Information about who, why, and how this metadata was applied",
+      "optional" : true,
+      "Searchable" : {
+        "/actor" : {
+          "fieldName" : "termAttributionActors",
+          "fieldType" : "URN"
+        },
+        "/source" : {
+          "fieldName" : "termAttributionSources",
+          "fieldType" : "URN"
+        },
+        "/time" : {
+          "fieldName" : "termAttributionDates",
+          "fieldType" : "DATETIME"
+        }
+      }
     } ]
   }, "com.linkedin.common.GlossaryTermUrn", {
     "type" : "record",
@@ -1121,7 +1185,7 @@
         "owningTeam" : "urn:li:internalTeam:datahub"
       }
     }
-  }, {
+  }, "com.linkedin.common.MetadataAttribution", {
     "type" : "record",
     "name" : "Owner",
     "namespace" : "com.linkedin.common",
@@ -3060,6 +3124,18 @@
                 }
               },
               "Searchable" : {
+                "/tags/*/attribution/actor" : {
+                  "fieldName" : "fieldTagAttributionActors",
+                  "fieldType" : "URN"
+                },
+                "/tags/*/attribution/source" : {
+                  "fieldName" : "fieldTagAttributionSources",
+                  "fieldType" : "URN"
+                },
+                "/tags/*/attribution/time" : {
+                  "fieldName" : "fieldTagAttributionDates",
+                  "fieldType" : "DATETIME"
+                },
                 "/tags/*/tag" : {
                   "boostScore" : 0.5,
                   "fieldName" : "fieldTags",
@@ -3078,6 +3154,18 @@
                 }
               },
               "Searchable" : {
+                "/terms/*/attribution/actor" : {
+                  "fieldName" : "fieldTermAttributionActors",
+                  "fieldType" : "URN"
+                },
+                "/terms/*/attribution/source" : {
+                  "fieldName" : "fieldTermAttributionSources",
+                  "fieldType" : "URN"
+                },
+                "/terms/*/attribution/time" : {
+                  "fieldName" : "fieldTermAttributionDates",
+                  "fieldType" : "DATETIME"
+                },
                 "/terms/*/urn" : {
                   "boostScore" : 0.5,
                   "fieldName" : "fieldGlossaryTerms",
@@ -3092,7 +3180,7 @@
             }, {
               "name" : "isPartitioningKey",
               "type" : "boolean",
-              "doc" : "For Datasets which are partitioned, this determines the partitioning key.",
+              "doc" : "For Datasets which are partitioned, this determines the partitioning key.\nNote that multiple columns can be part of a partitioning key, but currently we do not support\nrendering the ordered partitioning key.",
               "optional" : true
             }, {
               "name" : "jsonProps",
@@ -3247,6 +3335,18 @@
                 }
               },
               "Searchable" : {
+                "/tags/*/attribution/actor" : {
+                  "fieldName" : "editedFieldTagAttributionActors",
+                  "fieldType" : "URN"
+                },
+                "/tags/*/attribution/source" : {
+                  "fieldName" : "editedFieldTagAttributionSources",
+                  "fieldType" : "URN"
+                },
+                "/tags/*/attribution/time" : {
+                  "fieldName" : "editedFieldTagAttributionDates",
+                  "fieldType" : "DATETIME"
+                },
                 "/tags/*/tag" : {
                   "boostScore" : 0.5,
                   "fieldName" : "editedFieldTags",
@@ -3265,6 +3365,18 @@
                 }
               },
               "Searchable" : {
+                "/terms/*/attribution/actor" : {
+                  "fieldName" : "editedFieldTermAttributionActors",
+                  "fieldType" : "URN"
+                },
+                "/terms/*/attribution/source" : {
+                  "fieldName" : "editedFieldTermAttributionSources",
+                  "fieldType" : "URN"
+                },
+                "/terms/*/attribution/time" : {
+                  "fieldName" : "editedFieldTermAttributionDates",
+                  "fieldType" : "DATETIME"
+                },
                 "/terms/*/urn" : {
                   "boostScore" : 0.5,
                   "fieldName" : "editedFieldGlossaryTerms",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
index 0c983a021d4e73..59894ed083a2ef 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
@@ -897,6 +897,51 @@
             "type" : "string",
             "doc" : "Additional context about the association",
             "optional" : true
+          }, {
+            "name" : "attribution",
+            "type" : {
+              "type" : "record",
+              "name" : "MetadataAttribution",
+              "doc" : "Information about who, why, and how this metadata was applied",
+              "fields" : [ {
+                "name" : "time",
+                "type" : "Time",
+                "doc" : "When this metadata was updated."
+              }, {
+                "name" : "actor",
+                "type" : "Urn",
+                "doc" : "The entity (e.g. a member URN) responsible for applying the assocated metadata. This can\neither be a user (in case of UI edits) or the datahub system for automation."
+              }, {
+                "name" : "source",
+                "type" : "Urn",
+                "doc" : "The DataHub source responsible for applying the associated metadata. This will only be filled out\nwhen a DataHub source is responsible. This includes the specific metadata test urn, the automation urn.",
+                "optional" : true
+              }, {
+                "name" : "sourceDetail",
+                "type" : {
+                  "type" : "map",
+                  "values" : "string"
+                },
+                "doc" : "The details associated with why this metadata was applied. For example, this could include\nthe actual regex rule, sql statement, ingestion pipeline ID, etc.",
+                "default" : { }
+              } ]
+            },
+            "doc" : "Information about who, why, and how this metadata was applied",
+            "optional" : true,
+            "Searchable" : {
+              "/actor" : {
+                "fieldName" : "tagAttributionActors",
+                "fieldType" : "URN"
+              },
+              "/source" : {
+                "fieldName" : "tagAttributionSources",
+                "fieldType" : "URN"
+              },
+              "/time" : {
+                "fieldName" : "tagAttributionDates",
+                "fieldType" : "DATETIME"
+              }
+            }
           } ]
         }
       },
@@ -1005,6 +1050,25 @@
       "type" : "string",
       "doc" : "Additional context about the association",
       "optional" : true
+    }, {
+      "name" : "attribution",
+      "type" : "MetadataAttribution",
+      "doc" : "Information about who, why, and how this metadata was applied",
+      "optional" : true,
+      "Searchable" : {
+        "/actor" : {
+          "fieldName" : "termAttributionActors",
+          "fieldType" : "URN"
+        },
+        "/source" : {
+          "fieldName" : "termAttributionSources",
+          "fieldType" : "URN"
+        },
+        "/time" : {
+          "fieldName" : "termAttributionDates",
+          "fieldType" : "DATETIME"
+        }
+      }
     } ]
   }, "com.linkedin.common.GlossaryTermUrn", {
     "type" : "record",
@@ -1152,7 +1216,7 @@
         "owningTeam" : "urn:li:internalTeam:datahub"
       }
     }
-  }, {
+  }, "com.linkedin.common.MetadataAttribution", {
     "type" : "record",
     "name" : "Owner",
     "namespace" : "com.linkedin.common",
@@ -2264,6 +2328,15 @@
         "fieldName" : "editedDescription",
         "fieldType" : "TEXT"
       }
+    }, {
+      "name" : "name",
+      "type" : "string",
+      "doc" : "Editable display name of the Dataset",
+      "optional" : true,
+      "Searchable" : {
+        "fieldName" : "editedName",
+        "fieldType" : "TEXT_PARTIAL"
+      }
     } ],
     "Aspect" : {
       "name" : "editableDatasetProperties"
@@ -3443,6 +3516,18 @@
                             }
                           },
                           "Searchable" : {
+                            "/tags/*/attribution/actor" : {
+                              "fieldName" : "fieldTagAttributionActors",
+                              "fieldType" : "URN"
+                            },
+                            "/tags/*/attribution/source" : {
+                              "fieldName" : "fieldTagAttributionSources",
+                              "fieldType" : "URN"
+                            },
+                            "/tags/*/attribution/time" : {
+                              "fieldName" : "fieldTagAttributionDates",
+                              "fieldType" : "DATETIME"
+                            },
                             "/tags/*/tag" : {
                               "boostScore" : 0.5,
                               "fieldName" : "fieldTags",
@@ -3461,6 +3546,18 @@
                             }
                           },
                           "Searchable" : {
+                            "/terms/*/attribution/actor" : {
+                              "fieldName" : "fieldTermAttributionActors",
+                              "fieldType" : "URN"
+                            },
+                            "/terms/*/attribution/source" : {
+                              "fieldName" : "fieldTermAttributionSources",
+                              "fieldType" : "URN"
+                            },
+                            "/terms/*/attribution/time" : {
+                              "fieldName" : "fieldTermAttributionDates",
+                              "fieldType" : "DATETIME"
+                            },
                             "/terms/*/urn" : {
                               "boostScore" : 0.5,
                               "fieldName" : "fieldGlossaryTerms",
@@ -3475,7 +3572,7 @@
                         }, {
                           "name" : "isPartitioningKey",
                           "type" : "boolean",
-                          "doc" : "For Datasets which are partitioned, this determines the partitioning key.",
+                          "doc" : "For Datasets which are partitioned, this determines the partitioning key.\nNote that multiple columns can be part of a partitioning key, but currently we do not support\nrendering the ordered partitioning key.",
                           "optional" : true
                         }, {
                           "name" : "jsonProps",
@@ -3630,6 +3727,18 @@
                             }
                           },
                           "Searchable" : {
+                            "/tags/*/attribution/actor" : {
+                              "fieldName" : "editedFieldTagAttributionActors",
+                              "fieldType" : "URN"
+                            },
+                            "/tags/*/attribution/source" : {
+                              "fieldName" : "editedFieldTagAttributionSources",
+                              "fieldType" : "URN"
+                            },
+                            "/tags/*/attribution/time" : {
+                              "fieldName" : "editedFieldTagAttributionDates",
+                              "fieldType" : "DATETIME"
+                            },
                             "/tags/*/tag" : {
                               "boostScore" : 0.5,
                               "fieldName" : "editedFieldTags",
@@ -3648,6 +3757,18 @@
                             }
                           },
                           "Searchable" : {
+                            "/terms/*/attribution/actor" : {
+                              "fieldName" : "editedFieldTermAttributionActors",
+                              "fieldType" : "URN"
+                            },
+                            "/terms/*/attribution/source" : {
+                              "fieldName" : "editedFieldTermAttributionSources",
+                              "fieldType" : "URN"
+                            },
+                            "/terms/*/attribution/time" : {
+                              "fieldName" : "editedFieldTermAttributionDates",
+                              "fieldType" : "DATETIME"
+                            },
                             "/terms/*/urn" : {
                               "boostScore" : 0.5,
                               "fieldName" : "editedFieldGlossaryTerms",
@@ -6245,6 +6366,14 @@
               },
               "doc" : "A list of the the restricted aspects on the entity.\nIf the key aspect is present, assume ALL aspects should be restricted including the entity's Urn.",
               "optional" : true
+            }, {
+              "name" : "extraFields",
+              "type" : {
+                "type" : "map",
+                "values" : "string"
+              },
+              "doc" : "Extra fields from the search document based on what is requested in the search request",
+              "optional" : true
             } ]
           } ],
           "fields" : [ {
@@ -6699,6 +6828,10 @@
           "name" : "sort",
           "type" : "com.linkedin.metadata.query.filter.SortCriterion",
           "optional" : true
+        }, {
+          "name" : "sortCriteria",
+          "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.metadata.query.filter.SortCriterion\" }",
+          "optional" : true
         }, {
           "name" : "start",
           "type" : "int"
@@ -6748,6 +6881,10 @@
           "name" : "sort",
           "type" : "com.linkedin.metadata.query.filter.SortCriterion",
           "optional" : true
+        }, {
+          "name" : "sortCriteria",
+          "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.metadata.query.filter.SortCriterion\" }",
+          "optional" : true
         }, {
           "name" : "start",
           "type" : "int"
@@ -6788,6 +6925,10 @@
           "name" : "sort",
           "type" : "com.linkedin.metadata.query.filter.SortCriterion",
           "optional" : true
+        }, {
+          "name" : "sortCriteria",
+          "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.metadata.query.filter.SortCriterion\" }",
+          "optional" : true
         }, {
           "name" : "scrollId",
           "type" : "string",
@@ -6833,6 +6974,10 @@
           "name" : "sort",
           "type" : "com.linkedin.metadata.query.filter.SortCriterion",
           "optional" : true
+        }, {
+          "name" : "sortCriteria",
+          "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.metadata.query.filter.SortCriterion\" }",
+          "optional" : true
         }, {
           "name" : "scrollId",
           "type" : "string",
@@ -6874,6 +7019,10 @@
           "name" : "sort",
           "type" : "com.linkedin.metadata.query.filter.SortCriterion",
           "optional" : true
+        }, {
+          "name" : "sortCriteria",
+          "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.metadata.query.filter.SortCriterion\" }",
+          "optional" : true
         }, {
           "name" : "start",
           "type" : "int"
@@ -6911,6 +7060,10 @@
           "name" : "sort",
           "type" : "com.linkedin.metadata.query.filter.SortCriterion",
           "optional" : true
+        }, {
+          "name" : "sortCriteria",
+          "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.metadata.query.filter.SortCriterion\" }",
+          "optional" : true
         }, {
           "name" : "start",
           "type" : "int"
@@ -6952,6 +7105,10 @@
           "name" : "sort",
           "type" : "com.linkedin.metadata.query.filter.SortCriterion",
           "optional" : true
+        }, {
+          "name" : "sortCriteria",
+          "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.metadata.query.filter.SortCriterion\" }",
+          "optional" : true
         }, {
           "name" : "start",
           "type" : "int"
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json
index 4af65cdb48b502..16549757a961fa 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json
@@ -639,6 +639,51 @@
             "type" : "string",
             "doc" : "Additional context about the association",
             "optional" : true
+          }, {
+            "name" : "attribution",
+            "type" : {
+              "type" : "record",
+              "name" : "MetadataAttribution",
+              "doc" : "Information about who, why, and how this metadata was applied",
+              "fields" : [ {
+                "name" : "time",
+                "type" : "Time",
+                "doc" : "When this metadata was updated."
+              }, {
+                "name" : "actor",
+                "type" : "Urn",
+                "doc" : "The entity (e.g. a member URN) responsible for applying the assocated metadata. This can\neither be a user (in case of UI edits) or the datahub system for automation."
+              }, {
+                "name" : "source",
+                "type" : "Urn",
+                "doc" : "The DataHub source responsible for applying the associated metadata. This will only be filled out\nwhen a DataHub source is responsible. This includes the specific metadata test urn, the automation urn.",
+                "optional" : true
+              }, {
+                "name" : "sourceDetail",
+                "type" : {
+                  "type" : "map",
+                  "values" : "string"
+                },
+                "doc" : "The details associated with why this metadata was applied. For example, this could include\nthe actual regex rule, sql statement, ingestion pipeline ID, etc.",
+                "default" : { }
+              } ]
+            },
+            "doc" : "Information about who, why, and how this metadata was applied",
+            "optional" : true,
+            "Searchable" : {
+              "/actor" : {
+                "fieldName" : "tagAttributionActors",
+                "fieldType" : "URN"
+              },
+              "/source" : {
+                "fieldName" : "tagAttributionSources",
+                "fieldType" : "URN"
+              },
+              "/time" : {
+                "fieldName" : "tagAttributionDates",
+                "fieldType" : "DATETIME"
+              }
+            }
           } ]
         }
       },
@@ -747,6 +792,25 @@
       "type" : "string",
       "doc" : "Additional context about the association",
       "optional" : true
+    }, {
+      "name" : "attribution",
+      "type" : "MetadataAttribution",
+      "doc" : "Information about who, why, and how this metadata was applied",
+      "optional" : true,
+      "Searchable" : {
+        "/actor" : {
+          "fieldName" : "termAttributionActors",
+          "fieldType" : "URN"
+        },
+        "/source" : {
+          "fieldName" : "termAttributionSources",
+          "fieldType" : "URN"
+        },
+        "/time" : {
+          "fieldName" : "termAttributionDates",
+          "fieldType" : "DATETIME"
+        }
+      }
     } ]
   }, "com.linkedin.common.GlossaryTermUrn", {
     "type" : "record",
@@ -858,7 +922,7 @@
         "owningTeam" : "urn:li:internalTeam:datahub"
       }
     }
-  }, {
+  }, "com.linkedin.common.MetadataAttribution", {
     "type" : "record",
     "name" : "Owner",
     "namespace" : "com.linkedin.common",
@@ -2788,6 +2852,18 @@
                 }
               },
               "Searchable" : {
+                "/tags/*/attribution/actor" : {
+                  "fieldName" : "fieldTagAttributionActors",
+                  "fieldType" : "URN"
+                },
+                "/tags/*/attribution/source" : {
+                  "fieldName" : "fieldTagAttributionSources",
+                  "fieldType" : "URN"
+                },
+                "/tags/*/attribution/time" : {
+                  "fieldName" : "fieldTagAttributionDates",
+                  "fieldType" : "DATETIME"
+                },
                 "/tags/*/tag" : {
                   "boostScore" : 0.5,
                   "fieldName" : "fieldTags",
@@ -2806,6 +2882,18 @@
                 }
               },
               "Searchable" : {
+                "/terms/*/attribution/actor" : {
+                  "fieldName" : "fieldTermAttributionActors",
+                  "fieldType" : "URN"
+                },
+                "/terms/*/attribution/source" : {
+                  "fieldName" : "fieldTermAttributionSources",
+                  "fieldType" : "URN"
+                },
+                "/terms/*/attribution/time" : {
+                  "fieldName" : "fieldTermAttributionDates",
+                  "fieldType" : "DATETIME"
+                },
                 "/terms/*/urn" : {
                   "boostScore" : 0.5,
                   "fieldName" : "fieldGlossaryTerms",
@@ -2820,7 +2908,7 @@
             }, {
               "name" : "isPartitioningKey",
               "type" : "boolean",
-              "doc" : "For Datasets which are partitioned, this determines the partitioning key.",
+              "doc" : "For Datasets which are partitioned, this determines the partitioning key.\nNote that multiple columns can be part of a partitioning key, but currently we do not support\nrendering the ordered partitioning key.",
               "optional" : true
             }, {
               "name" : "jsonProps",
@@ -2975,6 +3063,18 @@
                 }
               },
               "Searchable" : {
+                "/tags/*/attribution/actor" : {
+                  "fieldName" : "editedFieldTagAttributionActors",
+                  "fieldType" : "URN"
+                },
+                "/tags/*/attribution/source" : {
+                  "fieldName" : "editedFieldTagAttributionSources",
+                  "fieldType" : "URN"
+                },
+                "/tags/*/attribution/time" : {
+                  "fieldName" : "editedFieldTagAttributionDates",
+                  "fieldType" : "DATETIME"
+                },
                 "/tags/*/tag" : {
                   "boostScore" : 0.5,
                   "fieldName" : "editedFieldTags",
@@ -2993,6 +3093,18 @@
                 }
               },
               "Searchable" : {
+                "/terms/*/attribution/actor" : {
+                  "fieldName" : "editedFieldTermAttributionActors",
+                  "fieldType" : "URN"
+                },
+                "/terms/*/attribution/source" : {
+                  "fieldName" : "editedFieldTermAttributionSources",
+                  "fieldType" : "URN"
+                },
+                "/terms/*/attribution/time" : {
+                  "fieldName" : "editedFieldTermAttributionDates",
+                  "fieldType" : "DATETIME"
+                },
                 "/terms/*/urn" : {
                   "boostScore" : 0.5,
                   "fieldName" : "editedFieldGlossaryTerms",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json
index e788c5d28ce71e..95df1d2ce21d93 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json
@@ -639,6 +639,51 @@
             "type" : "string",
             "doc" : "Additional context about the association",
             "optional" : true
+          }, {
+            "name" : "attribution",
+            "type" : {
+              "type" : "record",
+              "name" : "MetadataAttribution",
+              "doc" : "Information about who, why, and how this metadata was applied",
+              "fields" : [ {
+                "name" : "time",
+                "type" : "Time",
+                "doc" : "When this metadata was updated."
+              }, {
+                "name" : "actor",
+                "type" : "Urn",
+                "doc" : "The entity (e.g. a member URN) responsible for applying the assocated metadata. This can\neither be a user (in case of UI edits) or the datahub system for automation."
+              }, {
+                "name" : "source",
+                "type" : "Urn",
+                "doc" : "The DataHub source responsible for applying the associated metadata. This will only be filled out\nwhen a DataHub source is responsible. This includes the specific metadata test urn, the automation urn.",
+                "optional" : true
+              }, {
+                "name" : "sourceDetail",
+                "type" : {
+                  "type" : "map",
+                  "values" : "string"
+                },
+                "doc" : "The details associated with why this metadata was applied. For example, this could include\nthe actual regex rule, sql statement, ingestion pipeline ID, etc.",
+                "default" : { }
+              } ]
+            },
+            "doc" : "Information about who, why, and how this metadata was applied",
+            "optional" : true,
+            "Searchable" : {
+              "/actor" : {
+                "fieldName" : "tagAttributionActors",
+                "fieldType" : "URN"
+              },
+              "/source" : {
+                "fieldName" : "tagAttributionSources",
+                "fieldType" : "URN"
+              },
+              "/time" : {
+                "fieldName" : "tagAttributionDates",
+                "fieldType" : "DATETIME"
+              }
+            }
           } ]
         }
       },
@@ -747,6 +792,25 @@
       "type" : "string",
       "doc" : "Additional context about the association",
       "optional" : true
+    }, {
+      "name" : "attribution",
+      "type" : "MetadataAttribution",
+      "doc" : "Information about who, why, and how this metadata was applied",
+      "optional" : true,
+      "Searchable" : {
+        "/actor" : {
+          "fieldName" : "termAttributionActors",
+          "fieldType" : "URN"
+        },
+        "/source" : {
+          "fieldName" : "termAttributionSources",
+          "fieldType" : "URN"
+        },
+        "/time" : {
+          "fieldName" : "termAttributionDates",
+          "fieldType" : "DATETIME"
+        }
+      }
     } ]
   }, "com.linkedin.common.GlossaryTermUrn", {
     "type" : "record",
@@ -858,7 +922,7 @@
         "owningTeam" : "urn:li:internalTeam:datahub"
       }
     }
-  }, {
+  }, "com.linkedin.common.MetadataAttribution", {
     "type" : "record",
     "name" : "Owner",
     "namespace" : "com.linkedin.common",
@@ -2782,6 +2846,18 @@
                 }
               },
               "Searchable" : {
+                "/tags/*/attribution/actor" : {
+                  "fieldName" : "fieldTagAttributionActors",
+                  "fieldType" : "URN"
+                },
+                "/tags/*/attribution/source" : {
+                  "fieldName" : "fieldTagAttributionSources",
+                  "fieldType" : "URN"
+                },
+                "/tags/*/attribution/time" : {
+                  "fieldName" : "fieldTagAttributionDates",
+                  "fieldType" : "DATETIME"
+                },
                 "/tags/*/tag" : {
                   "boostScore" : 0.5,
                   "fieldName" : "fieldTags",
@@ -2800,6 +2876,18 @@
                 }
               },
               "Searchable" : {
+                "/terms/*/attribution/actor" : {
+                  "fieldName" : "fieldTermAttributionActors",
+                  "fieldType" : "URN"
+                },
+                "/terms/*/attribution/source" : {
+                  "fieldName" : "fieldTermAttributionSources",
+                  "fieldType" : "URN"
+                },
+                "/terms/*/attribution/time" : {
+                  "fieldName" : "fieldTermAttributionDates",
+                  "fieldType" : "DATETIME"
+                },
                 "/terms/*/urn" : {
                   "boostScore" : 0.5,
                   "fieldName" : "fieldGlossaryTerms",
@@ -2814,7 +2902,7 @@
             }, {
               "name" : "isPartitioningKey",
               "type" : "boolean",
-              "doc" : "For Datasets which are partitioned, this determines the partitioning key.",
+              "doc" : "For Datasets which are partitioned, this determines the partitioning key.\nNote that multiple columns can be part of a partitioning key, but currently we do not support\nrendering the ordered partitioning key.",
               "optional" : true
             }, {
               "name" : "jsonProps",
@@ -2969,6 +3057,18 @@
                 }
               },
               "Searchable" : {
+                "/tags/*/attribution/actor" : {
+                  "fieldName" : "editedFieldTagAttributionActors",
+                  "fieldType" : "URN"
+                },
+                "/tags/*/attribution/source" : {
+                  "fieldName" : "editedFieldTagAttributionSources",
+                  "fieldType" : "URN"
+                },
+                "/tags/*/attribution/time" : {
+                  "fieldName" : "editedFieldTagAttributionDates",
+                  "fieldType" : "DATETIME"
+                },
                 "/tags/*/tag" : {
                   "boostScore" : 0.5,
                   "fieldName" : "editedFieldTags",
@@ -2987,6 +3087,18 @@
                 }
               },
               "Searchable" : {
+                "/terms/*/attribution/actor" : {
+                  "fieldName" : "editedFieldTermAttributionActors",
+                  "fieldType" : "URN"
+                },
+                "/terms/*/attribution/source" : {
+                  "fieldName" : "editedFieldTermAttributionSources",
+                  "fieldType" : "URN"
+                },
+                "/terms/*/attribution/time" : {
+                  "fieldName" : "editedFieldTermAttributionDates",
+                  "fieldType" : "DATETIME"
+                },
                 "/terms/*/urn" : {
                   "boostScore" : 0.5,
                   "fieldName" : "editedFieldGlossaryTerms",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
index dbdba0040d4434..3d16550db1e0f1 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
@@ -897,6 +897,51 @@
             "type" : "string",
             "doc" : "Additional context about the association",
             "optional" : true
+          }, {
+            "name" : "attribution",
+            "type" : {
+              "type" : "record",
+              "name" : "MetadataAttribution",
+              "doc" : "Information about who, why, and how this metadata was applied",
+              "fields" : [ {
+                "name" : "time",
+                "type" : "Time",
+                "doc" : "When this metadata was updated."
+              }, {
+                "name" : "actor",
+                "type" : "Urn",
+                "doc" : "The entity (e.g. a member URN) responsible for applying the assocated metadata. This can\neither be a user (in case of UI edits) or the datahub system for automation."
+              }, {
+                "name" : "source",
+                "type" : "Urn",
+                "doc" : "The DataHub source responsible for applying the associated metadata. This will only be filled out\nwhen a DataHub source is responsible. This includes the specific metadata test urn, the automation urn.",
+                "optional" : true
+              }, {
+                "name" : "sourceDetail",
+                "type" : {
+                  "type" : "map",
+                  "values" : "string"
+                },
+                "doc" : "The details associated with why this metadata was applied. For example, this could include\nthe actual regex rule, sql statement, ingestion pipeline ID, etc.",
+                "default" : { }
+              } ]
+            },
+            "doc" : "Information about who, why, and how this metadata was applied",
+            "optional" : true,
+            "Searchable" : {
+              "/actor" : {
+                "fieldName" : "tagAttributionActors",
+                "fieldType" : "URN"
+              },
+              "/source" : {
+                "fieldName" : "tagAttributionSources",
+                "fieldType" : "URN"
+              },
+              "/time" : {
+                "fieldName" : "tagAttributionDates",
+                "fieldType" : "DATETIME"
+              }
+            }
           } ]
         }
       },
@@ -1005,6 +1050,25 @@
       "type" : "string",
       "doc" : "Additional context about the association",
       "optional" : true
+    }, {
+      "name" : "attribution",
+      "type" : "MetadataAttribution",
+      "doc" : "Information about who, why, and how this metadata was applied",
+      "optional" : true,
+      "Searchable" : {
+        "/actor" : {
+          "fieldName" : "termAttributionActors",
+          "fieldType" : "URN"
+        },
+        "/source" : {
+          "fieldName" : "termAttributionSources",
+          "fieldType" : "URN"
+        },
+        "/time" : {
+          "fieldName" : "termAttributionDates",
+          "fieldType" : "DATETIME"
+        }
+      }
     } ]
   }, "com.linkedin.common.GlossaryTermUrn", {
     "type" : "record",
@@ -1152,7 +1216,7 @@
         "owningTeam" : "urn:li:internalTeam:datahub"
       }
     }
-  }, {
+  }, "com.linkedin.common.MetadataAttribution", {
     "type" : "record",
     "name" : "Owner",
     "namespace" : "com.linkedin.common",
@@ -2264,6 +2328,15 @@
         "fieldName" : "editedDescription",
         "fieldType" : "TEXT"
       }
+    }, {
+      "name" : "name",
+      "type" : "string",
+      "doc" : "Editable display name of the Dataset",
+      "optional" : true,
+      "Searchable" : {
+        "fieldName" : "editedName",
+        "fieldType" : "TEXT_PARTIAL"
+      }
     } ],
     "Aspect" : {
       "name" : "editableDatasetProperties"
@@ -3437,6 +3510,18 @@
                             }
                           },
                           "Searchable" : {
+                            "/tags/*/attribution/actor" : {
+                              "fieldName" : "fieldTagAttributionActors",
+                              "fieldType" : "URN"
+                            },
+                            "/tags/*/attribution/source" : {
+                              "fieldName" : "fieldTagAttributionSources",
+                              "fieldType" : "URN"
+                            },
+                            "/tags/*/attribution/time" : {
+                              "fieldName" : "fieldTagAttributionDates",
+                              "fieldType" : "DATETIME"
+                            },
                             "/tags/*/tag" : {
                               "boostScore" : 0.5,
                               "fieldName" : "fieldTags",
@@ -3455,6 +3540,18 @@
                             }
                           },
                           "Searchable" : {
+                            "/terms/*/attribution/actor" : {
+                              "fieldName" : "fieldTermAttributionActors",
+                              "fieldType" : "URN"
+                            },
+                            "/terms/*/attribution/source" : {
+                              "fieldName" : "fieldTermAttributionSources",
+                              "fieldType" : "URN"
+                            },
+                            "/terms/*/attribution/time" : {
+                              "fieldName" : "fieldTermAttributionDates",
+                              "fieldType" : "DATETIME"
+                            },
                             "/terms/*/urn" : {
                               "boostScore" : 0.5,
                               "fieldName" : "fieldGlossaryTerms",
@@ -3469,7 +3566,7 @@
                         }, {
                           "name" : "isPartitioningKey",
                           "type" : "boolean",
-                          "doc" : "For Datasets which are partitioned, this determines the partitioning key.",
+                          "doc" : "For Datasets which are partitioned, this determines the partitioning key.\nNote that multiple columns can be part of a partitioning key, but currently we do not support\nrendering the ordered partitioning key.",
                           "optional" : true
                         }, {
                           "name" : "jsonProps",
@@ -3624,6 +3721,18 @@
                             }
                           },
                           "Searchable" : {
+                            "/tags/*/attribution/actor" : {
+                              "fieldName" : "editedFieldTagAttributionActors",
+                              "fieldType" : "URN"
+                            },
+                            "/tags/*/attribution/source" : {
+                              "fieldName" : "editedFieldTagAttributionSources",
+                              "fieldType" : "URN"
+                            },
+                            "/tags/*/attribution/time" : {
+                              "fieldName" : "editedFieldTagAttributionDates",
+                              "fieldType" : "DATETIME"
+                            },
                             "/tags/*/tag" : {
                               "boostScore" : 0.5,
                               "fieldName" : "editedFieldTags",
@@ -3642,6 +3751,18 @@
                             }
                           },
                           "Searchable" : {
+                            "/terms/*/attribution/actor" : {
+                              "fieldName" : "editedFieldTermAttributionActors",
+                              "fieldType" : "URN"
+                            },
+                            "/terms/*/attribution/source" : {
+                              "fieldName" : "editedFieldTermAttributionSources",
+                              "fieldType" : "URN"
+                            },
+                            "/terms/*/attribution/time" : {
+                              "fieldName" : "editedFieldTermAttributionDates",
+                              "fieldType" : "DATETIME"
+                            },
                             "/terms/*/urn" : {
                               "boostScore" : 0.5,
                               "fieldName" : "editedFieldGlossaryTerms",
diff --git a/metadata-service/restli-client-api/src/main/java/com/linkedin/entity/client/EntityClient.java b/metadata-service/restli-client-api/src/main/java/com/linkedin/entity/client/EntityClient.java
index 8821143cde6cc3..5f086e79a387a8 100644
--- a/metadata-service/restli-client-api/src/main/java/com/linkedin/entity/client/EntityClient.java
+++ b/metadata-service/restli-client-api/src/main/java/com/linkedin/entity/client/EntityClient.java
@@ -38,7 +38,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -236,7 +235,7 @@ ListResult list(
    *
    * @param input search query
    * @param filter search filters
-   * @param sortCriterion sort criterion
+   * @param sortCriteria sort criteria
    * @param start start offset for search results
    * @param count max number of search results requested
    * @return Snapshot key
@@ -247,7 +246,7 @@ SearchResult search(
       @Nonnull String entity,
       @Nonnull String input,
       @Nullable Filter filter,
-      SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int start,
       int count)
       throws RemoteInvocationException;
@@ -271,7 +270,7 @@ SearchResult searchAcrossEntities(
       @Nullable Filter filter,
       int start,
       int count,
-      @Nullable SortCriterion sortCriterion)
+      List<SortCriterion> sortCriteria)
       throws RemoteInvocationException;
 
   /**
@@ -293,7 +292,7 @@ SearchResult searchAcrossEntities(
       @Nullable Filter filter,
       int start,
       int count,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       List<String> facets)
       throws RemoteInvocationException;
 
@@ -329,7 +328,7 @@ ScrollResult scrollAcrossEntities(
    * @param input the search input text
    * @param maxHops the max number of hops away to search for. If null, searches all hops.
    * @param filter the request map with fields and values as filters to be applied to search hits
-   * @param sortCriterion {@link SortCriterion} to be applied to search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to search results
    * @param start index to start the search from
    * @param count the number of search hits to return
    * @return a {@link SearchResult} that contains a list of matched documents and related search
@@ -343,7 +342,7 @@ LineageSearchResult searchAcrossLineage(
       @Nonnull String input,
       @Nullable Integer maxHops,
       @Nullable Filter filter,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int start,
       int count)
       throws RemoteInvocationException;
@@ -357,7 +356,7 @@ LineageSearchResult searchAcrossLineage(
    * @param input the search input text
    * @param maxHops the max number of hops away to search for. If null, searches all hops.
    * @param filter the request map with fields and values as filters to be applied to search hits
-   * @param sortCriterion {@link SortCriterion} to be applied to search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to search results
    * @param scrollId opaque scroll ID indicating offset
    * @param keepAlive string representation of time to keep point in time alive, ex: 5m
    * @param count the number of search hits to return of roundtrips for UI visualizations.
@@ -373,7 +372,7 @@ LineageScrollResult scrollAcrossLineage(
       @Nonnull String input,
       @Nullable Integer maxHops,
       @Nullable Filter filter,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nonnull String keepAlive,
       int count)
@@ -427,7 +426,7 @@ void deleteEntityReferences(@Nonnull OperationContext opContext, @Nonnull final
    *
    * @param entity filter entity
    * @param filter search filters
-   * @param sortCriterion sort criterion
+   * @param sortCriteria sort criteria
    * @param start start offset for search results
    * @param count max number of search results requested
    * @return a set of {@link SearchResult}s
@@ -437,7 +436,7 @@ SearchResult filter(
       @Nonnull OperationContext opContext,
       @Nonnull String entity,
       @Nonnull Filter filter,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int start,
       int count)
       throws RemoteInvocationException;
@@ -519,27 +518,17 @@ default String ingestProposal(
     return ingestProposal(opContext, metadataChangeProposal, false);
   }
 
-  String ingestProposal(
+  /**
+   * Ingest a MetadataChangeProposal event.
+   *
+   * @return the urn string ingested
+   */
+  default String ingestProposal(
       @Nonnull OperationContext opContext,
       @Nonnull final MetadataChangeProposal metadataChangeProposal,
       final boolean async)
-      throws RemoteInvocationException;
-
-  @Deprecated
-  default String wrappedIngestProposal(
-      @Nonnull OperationContext opContext, @Nonnull MetadataChangeProposal metadataChangeProposal) {
-    return wrappedIngestProposal(opContext, metadataChangeProposal, false);
-  }
-
-  default String wrappedIngestProposal(
-      @Nonnull OperationContext opContext,
-      @Nonnull MetadataChangeProposal metadataChangeProposal,
-      final boolean async) {
-    try {
-      return ingestProposal(opContext, metadataChangeProposal, async);
-    } catch (RemoteInvocationException e) {
-      throw new RuntimeException(e);
-    }
+      throws RemoteInvocationException {
+    return batchIngestProposals(opContext, List.of(metadataChangeProposal), async).get(0);
   }
 
   @Deprecated
@@ -550,15 +539,20 @@ default List<String> batchIngestProposals(
     return batchIngestProposals(opContext, metadataChangeProposals, false);
   }
 
-  default List<String> batchIngestProposals(
+  /**
+   * Ingest a list of proposals in a batch.
+   *
+   * @param opContext operation context
+   * @param metadataChangeProposals list of proposals
+   * @param async async or sync ingestion path
+   * @return ingested urns
+   */
+  @Nonnull
+  List<String> batchIngestProposals(
       @Nonnull OperationContext opContext,
       @Nonnull final Collection<MetadataChangeProposal> metadataChangeProposals,
       final boolean async)
-      throws RemoteInvocationException {
-    return metadataChangeProposals.stream()
-        .map(proposal -> wrappedIngestProposal(opContext, proposal, async))
-        .collect(Collectors.toList());
-  }
+      throws RemoteInvocationException;
 
   @Deprecated
   <T extends RecordTemplate> Optional<T> getVersionedAspect(
diff --git a/metadata-service/restli-client/src/main/java/com/linkedin/entity/client/RestliEntityClient.java b/metadata-service/restli-client/src/main/java/com/linkedin/entity/client/RestliEntityClient.java
index fe1ca571efea52..bc5b9e439d293e 100644
--- a/metadata-service/restli-client/src/main/java/com/linkedin/entity/client/RestliEntityClient.java
+++ b/metadata-service/restli-client/src/main/java/com/linkedin/entity/client/RestliEntityClient.java
@@ -12,7 +12,7 @@
 import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.data.template.StringArray;
 import com.linkedin.entity.AspectsDoGetTimeseriesAspectValuesRequestBuilder;
-import com.linkedin.entity.AspectsDoIngestProposalRequestBuilder;
+import com.linkedin.entity.AspectsDoIngestProposalBatchRequestBuilder;
 import com.linkedin.entity.AspectsGetRequestBuilder;
 import com.linkedin.entity.AspectsRequestBuilders;
 import com.linkedin.entity.EntitiesBatchGetRequestBuilder;
@@ -50,6 +50,7 @@
 import com.linkedin.metadata.browse.BrowseResult;
 import com.linkedin.metadata.browse.BrowseResultV2;
 import com.linkedin.metadata.graph.LineageDirection;
+import com.linkedin.metadata.models.EntitySpec;
 import com.linkedin.metadata.query.AutoCompleteResult;
 import com.linkedin.metadata.query.LineageFlags;
 import com.linkedin.metadata.query.ListResult;
@@ -62,11 +63,14 @@
 import com.linkedin.metadata.query.filter.CriterionArray;
 import com.linkedin.metadata.query.filter.Filter;
 import com.linkedin.metadata.query.filter.SortCriterion;
+import com.linkedin.metadata.query.filter.SortCriterionArray;
 import com.linkedin.metadata.search.LineageScrollResult;
 import com.linkedin.metadata.search.LineageSearchResult;
 import com.linkedin.metadata.search.ScrollResult;
 import com.linkedin.metadata.search.SearchResult;
+import com.linkedin.metadata.utils.EntityKeyUtils;
 import com.linkedin.mxe.MetadataChangeProposal;
+import com.linkedin.mxe.MetadataChangeProposalArray;
 import com.linkedin.mxe.PlatformEvent;
 import com.linkedin.mxe.SystemMetadata;
 import com.linkedin.parseq.retry.backoff.BackoffPolicy;
@@ -98,6 +102,7 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.NotImplementedException;
+import org.opensearch.core.common.util.CollectionUtils;
 
 @Slf4j
 public class RestliEntityClient extends BaseClient implements EntityClient {
@@ -589,7 +594,7 @@ public ListResult list(
    *
    * @param input search query
    * @param filter search filters
-   * @param sortCriterion sort criterion
+   * @param sortCriteria sort criteria
    * @param start start offset for search results
    * @param count max number of search results requested
    * @return Snapshot key
@@ -602,7 +607,7 @@ public SearchResult search(
       @Nonnull String entity,
       @Nonnull String input,
       @Nullable Filter filter,
-      SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int start,
       int count)
       throws RemoteInvocationException {
@@ -620,8 +625,9 @@ public SearchResult search(
       requestBuilder.filterParam(filter);
     }
 
-    if (sortCriterion != null) {
-      requestBuilder.sortParam(sortCriterion);
+    if (!CollectionUtils.isEmpty(sortCriteria)) {
+      requestBuilder.sortParam(sortCriteria.get(0));
+      requestBuilder.sortCriteriaParam(new SortCriterionArray(sortCriteria));
     }
 
     if (searchFlags != null) {
@@ -643,10 +649,10 @@ public SearchResult searchAcrossEntities(
       @Nullable Filter filter,
       int start,
       int count,
-      @Nullable SortCriterion sortCriterion)
+      List<SortCriterion> sortCriteria)
       throws RemoteInvocationException {
     return searchAcrossEntities(
-        opContext, entities, input, filter, start, count, sortCriterion, null);
+        opContext, entities, input, filter, start, count, sortCriteria, null);
   }
 
   /**
@@ -670,7 +676,7 @@ public SearchResult searchAcrossEntities(
       @Nullable Filter filter,
       int start,
       int count,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable List<String> facets)
       throws RemoteInvocationException {
 
@@ -692,8 +698,9 @@ public SearchResult searchAcrossEntities(
       requestBuilder.searchFlagsParam(searchFlags);
     }
 
-    if (sortCriterion != null) {
-      requestBuilder.sortParam(sortCriterion);
+    if (!CollectionUtils.isEmpty(sortCriteria)) {
+      requestBuilder.sortParam(sortCriteria.get(0));
+      requestBuilder.sortCriteriaParam(new SortCriterionArray(sortCriteria));
     }
 
     return sendClientRequest(requestBuilder, opContext.getAuthentication()).getEntity();
@@ -743,7 +750,7 @@ public LineageSearchResult searchAcrossLineage(
       @Nonnull String input,
       @Nullable Integer maxHops,
       @Nullable Filter filter,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int start,
       int count)
       throws RemoteInvocationException {
@@ -770,6 +777,12 @@ public LineageSearchResult searchAcrossLineage(
     if (lineageFlags.getEndTimeMillis() != null) {
       requestBuilder.endTimeMillisParam(lineageFlags.getEndTimeMillis());
     }
+
+    if (!CollectionUtils.isEmpty(sortCriteria)) {
+      requestBuilder.sortParam(sortCriteria.get(0));
+      requestBuilder.sortCriteriaParam(new SortCriterionArray(sortCriteria));
+    }
+
     requestBuilder.searchFlagsParam(opContext.getSearchContext().getSearchFlags());
 
     return sendClientRequest(requestBuilder, opContext.getAuthentication()).getEntity();
@@ -785,7 +798,7 @@ public LineageScrollResult scrollAcrossLineage(
       @Nonnull String input,
       @Nullable Integer maxHops,
       @Nullable Filter filter,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nonnull String keepAlive,
       int count)
@@ -815,6 +828,12 @@ public LineageScrollResult scrollAcrossLineage(
     if (lineageFlags.getEndTimeMillis() != null) {
       requestBuilder.endTimeMillisParam(lineageFlags.getEndTimeMillis());
     }
+
+    if (!CollectionUtils.isEmpty(sortCriteria)) {
+      requestBuilder.sortParam(sortCriteria.get(0));
+      requestBuilder.sortCriteriaParam(new SortCriterionArray(sortCriteria));
+    }
+
     requestBuilder.searchFlagsParam(opContext.getSearchContext().getSearchFlags());
 
     return sendClientRequest(requestBuilder, opContext.getAuthentication()).getEntity();
@@ -903,7 +922,7 @@ public SearchResult filter(
       @Nonnull OperationContext opContext,
       @Nonnull String entity,
       @Nonnull Filter filter,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int start,
       int count)
       throws RemoteInvocationException {
@@ -914,8 +933,9 @@ public SearchResult filter(
             .filterParam(filter)
             .startParam(start)
             .countParam(count);
-    if (sortCriterion != null) {
-      requestBuilder.sortParam(sortCriterion);
+    if (!CollectionUtils.isEmpty(sortCriteria)) {
+      requestBuilder.sortParam(sortCriteria.get(0));
+      requestBuilder.sortCriteriaParam(new SortCriterionArray(sortCriteria));
     }
     return sendClientRequest(requestBuilder, opContext.getAuthentication()).getEntity();
   }
@@ -1047,23 +1067,36 @@ public List<EnvelopedAspect> getTimeseriesAspectValues(
         .getValues();
   }
 
-  /**
-   * Ingest a MetadataChangeProposal event.
-   *
-   * @return the urn string ingested
-   */
+  @Nonnull
   @Override
-  public String ingestProposal(
+  public List<String> batchIngestProposals(
       @Nonnull OperationContext opContext,
-      @Nonnull final MetadataChangeProposal metadataChangeProposal,
-      final boolean async)
+      @Nonnull Collection<MetadataChangeProposal> metadataChangeProposals,
+      boolean async)
       throws RemoteInvocationException {
-    final AspectsDoIngestProposalRequestBuilder requestBuilder =
+    final AspectsDoIngestProposalBatchRequestBuilder requestBuilder =
         ASPECTS_REQUEST_BUILDERS
-            .actionIngestProposal()
-            .proposalParam(metadataChangeProposal)
+            .actionIngestProposalBatch()
+            .proposalsParam(new MetadataChangeProposalArray(metadataChangeProposals))
             .asyncParam(String.valueOf(async));
-    return sendClientRequest(requestBuilder, opContext.getSessionAuthentication()).getEntity();
+    String result =
+        sendClientRequest(requestBuilder, opContext.getSessionAuthentication()).getEntity();
+    return metadataChangeProposals.stream()
+        .map(
+            proposal -> {
+              if ("success".equals(result)) {
+                if (proposal.getEntityUrn() != null) {
+                  return proposal.getEntityUrn().toString();
+                } else {
+                  EntitySpec entitySpec =
+                      opContext.getEntityRegistry().getEntitySpec(proposal.getEntityType());
+                  return EntityKeyUtils.getUrnFromProposal(proposal, entitySpec.getKeyAspectSpec())
+                      .toString();
+                }
+              }
+              return null;
+            })
+        .collect(Collectors.toList());
   }
 
   @Override
diff --git a/metadata-service/restli-servlet-impl/build.gradle b/metadata-service/restli-servlet-impl/build.gradle
index c1484f00efe595..6b68abfe7fb15c 100644
--- a/metadata-service/restli-servlet-impl/build.gradle
+++ b/metadata-service/restli-servlet-impl/build.gradle
@@ -106,3 +106,6 @@ pegasus.main.idlOptions.addIdlItem([
 ])
 
 ext.apiProject = project(':metadata-service:restli-api')
+
+spotlessJava.dependsOn generateTestDataTemplate
+spotlessJava.dependsOn generateIntegTestDataTemplate
diff --git a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityResource.java b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityResource.java
index e79dda34256822..8a5473da95ba2a 100644
--- a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityResource.java
+++ b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityResource.java
@@ -13,6 +13,7 @@
 import static com.linkedin.metadata.resources.restli.RestliConstants.*;
 import static com.linkedin.metadata.search.utils.SearchUtils.*;
 import static com.linkedin.metadata.utils.PegasusUtils.*;
+import static com.linkedin.metadata.utils.SystemMetadataUtils.generateSystemMetadataIfEmpty;
 
 import com.codahale.metrics.MetricRegistry;
 import com.datahub.authentication.Authentication;
@@ -20,6 +21,7 @@
 import com.datahub.authorization.AuthUtil;
 import com.datahub.authorization.EntitySpec;
 
+import com.linkedin.metadata.utils.SystemMetadataUtils;
 import io.datahubproject.metadata.context.RequestContext;
 import io.datahubproject.metadata.services.RestrictedService;
 import com.linkedin.data.template.SetMode;
@@ -257,19 +259,6 @@ public Task<Map<String, AnyRecord>> batchGet(
         MetricRegistry.name(this.getClass(), "batchGet"));
   }
 
-  private SystemMetadata populateDefaultFieldsIfEmpty(@Nullable SystemMetadata systemMetadata) {
-    SystemMetadata result = systemMetadata;
-    if (result == null) {
-      result = new SystemMetadata();
-    }
-
-    if (result.getLastObserved() == 0) {
-      result.setLastObserved(System.currentTimeMillis());
-    }
-
-    return result;
-  }
-
   @Action(name = ACTION_INGEST)
   @Nonnull
   @WithSpan
@@ -297,7 +286,7 @@ public Task<Void> ingest(
       throw new RestLiServiceException(HttpStatus.S_422_UNPROCESSABLE_ENTITY, e);
     }
 
-    SystemMetadata systemMetadata = populateDefaultFieldsIfEmpty(providedSystemMetadata);
+    SystemMetadata systemMetadata = generateSystemMetadataIfEmpty(providedSystemMetadata);
 
     final AuditStamp auditStamp =
         new AuditStamp().setTime(_clock.millis()).setActor(Urn.createFromString(actorUrnStr));
@@ -358,7 +347,7 @@ public Task<Void> batchIngest(
 
     final List<SystemMetadata> finalSystemMetadataList =
         Arrays.stream(systemMetadataList)
-            .map(systemMetadata -> populateDefaultFieldsIfEmpty(systemMetadata))
+            .map(SystemMetadataUtils::generateSystemMetadataIfEmpty)
             .collect(Collectors.toList());
 
     return RestliUtil.toTask(
@@ -378,6 +367,7 @@ public Task<SearchResult> search(
       @ActionParam(PARAM_INPUT) @Nonnull String input,
       @ActionParam(PARAM_FILTER) @Optional @Nullable Filter filter,
       @ActionParam(PARAM_SORT) @Optional @Nullable SortCriterion sortCriterion,
+      @ActionParam(PARAM_SORT_CRITERIA) @Optional @Nullable SortCriterion[] sortCriteria,
       @ActionParam(PARAM_START) int start,
       @ActionParam(PARAM_COUNT) int count,
       @Optional @Deprecated @Nullable @ActionParam(PARAM_FULLTEXT) Boolean fulltext,
@@ -397,6 +387,8 @@ public Task<SearchResult> search(
                     RequestContext.builder().buildRestli(auth.getActor().toUrnStr(), getContext(), ACTION_SEARCH, entityName), authorizer, auth, true)
             .withSearchFlags(flags -> searchFlags != null ? searchFlags : new SearchFlags().setFulltext(Boolean.TRUE.equals(fulltext)));
 
+    List<SortCriterion> sortCriterionList = getSortCriteria(sortCriteria, sortCriterion);
+
     log.info("GET SEARCH RESULTS for {} with query {}", entityName, input);
     // TODO - change it to use _searchService once we are confident on it's latency
     return RestliUtil.toTask(
@@ -405,7 +397,7 @@ public Task<SearchResult> search(
           // This API is not used by the frontend for search bars so we default to structured
           result =
               entitySearchService.search(opContext,
-                  List.of(entityName), input, filter, sortCriterion, start, count);
+                  List.of(entityName), input, filter, sortCriterionList, start, count);
 
           if (!isAPIAuthorizedResult(
                   auth,
@@ -428,6 +420,7 @@ public Task<SearchResult> searchAcrossEntities(
       @ActionParam(PARAM_INPUT) @Nonnull String input,
       @ActionParam(PARAM_FILTER) @Optional @Nullable Filter filter,
       @ActionParam(PARAM_SORT) @Optional @Nullable SortCriterion sortCriterion,
+      @ActionParam(PARAM_SORT_CRITERIA) @Optional @Nullable SortCriterion[] sortCriteria,
       @ActionParam(PARAM_START) int start,
       @ActionParam(PARAM_COUNT) int count,
       @ActionParam(PARAM_SEARCH_FLAGS) @Optional SearchFlags searchFlags) {
@@ -447,10 +440,12 @@ public Task<SearchResult> searchAcrossEntities(
               HttpStatus.S_403_FORBIDDEN, "User is unauthorized to search.");
     }
 
+    List<SortCriterion> sortCriterionList = getSortCriteria(sortCriteria, sortCriterion);
+
     log.info("GET SEARCH RESULTS ACROSS ENTITIES for {} with query {}", entityList, input);
     return RestliUtil.toTask(
         () -> {
-          SearchResult result = searchService.searchAcrossEntities(opContext, entityList, input, filter, sortCriterion, start, count);
+          SearchResult result = searchService.searchAcrossEntities(opContext, entityList, input, filter, sortCriterionList, start, count);
           if (!isAPIAuthorizedResult(
                   auth,
                   authorizer,
@@ -463,6 +458,18 @@ public Task<SearchResult> searchAcrossEntities(
         });
   }
 
+  private List<SortCriterion> getSortCriteria(@Nullable SortCriterion[] sortCriteria, @Nullable SortCriterion sortCriterion) {
+    List<SortCriterion> sortCriterionList;
+    if (sortCriteria != null) {
+      sortCriterionList = Arrays.asList(sortCriteria);
+    } else if (sortCriterion != null) {
+      sortCriterionList = Collections.singletonList(sortCriterion);
+    } else {
+      sortCriterionList = Collections.emptyList();
+    }
+    return sortCriterionList;
+  }
+
   @Action(name = ACTION_SCROLL_ACROSS_ENTITIES)
   @Nonnull
   @WithSpan
@@ -471,6 +478,7 @@ public Task<ScrollResult> scrollAcrossEntities(
       @ActionParam(PARAM_INPUT) @Nonnull String input,
       @ActionParam(PARAM_FILTER) @Optional @Nullable Filter filter,
       @ActionParam(PARAM_SORT) @Optional @Nullable SortCriterion sortCriterion,
+      @ActionParam(PARAM_SORT_CRITERIA) @Optional @Nullable SortCriterion[] sortCriteria,
       @ActionParam(PARAM_SCROLL_ID) @Optional @Nullable String scrollId,
       @ActionParam(PARAM_KEEP_ALIVE) String keepAlive,
       @ActionParam(PARAM_COUNT) int count,
@@ -490,6 +498,8 @@ public Task<ScrollResult> scrollAcrossEntities(
               HttpStatus.S_403_FORBIDDEN, "User is unauthorized to search.");
     }
 
+    List<SortCriterion> sortCriterionList = getSortCriteria(sortCriteria, sortCriterion);
+
     log.info(
         "GET SCROLL RESULTS ACROSS ENTITIES for {} with query {} and scroll ID: {}",
         entityList,
@@ -503,7 +513,7 @@ public Task<ScrollResult> scrollAcrossEntities(
                   entityList,
                   input,
                   filter,
-                  sortCriterion,
+                  sortCriterionList,
                   scrollId,
                   keepAlive,
                   count);
@@ -531,6 +541,7 @@ public Task<LineageSearchResult> searchAcrossLineage(
       @ActionParam(PARAM_MAX_HOPS) @Optional @Nullable Integer maxHops,
       @ActionParam(PARAM_FILTER) @Optional @Nullable Filter filter,
       @ActionParam(PARAM_SORT) @Optional @Nullable SortCriterion sortCriterion,
+      @ActionParam(PARAM_SORT_CRITERIA) @Optional @Nullable SortCriterion[] sortCriteria,
       @ActionParam(PARAM_START) int start,
       @ActionParam(PARAM_COUNT) int count,
       @ActionParam(PARAM_START_TIME_MILLIS) @Optional @Nullable Long startTimeMillis,
@@ -546,6 +557,8 @@ public Task<LineageSearchResult> searchAcrossLineage(
               HttpStatus.S_403_FORBIDDEN, "User is unauthorized to search.");
     }
 
+    List<SortCriterion> sortCriterionList = getSortCriteria(sortCriteria, sortCriterion);
+
     OperationContext opContext = OperationContext.asSession(
                     systemOperationContext, RequestContext.builder().buildRestli(auth.getActor().toUrnStr(), getContext(), ACTION_SEARCH_ACROSS_LINEAGE, entities), authorizer, auth, true)
             .withSearchFlags(flags -> (searchFlags != null ? searchFlags : new SearchFlags().setFulltext(true))
@@ -570,7 +583,7 @@ public Task<LineageSearchResult> searchAcrossLineage(
                   input,
                   maxHops,
                   filter,
-                  sortCriterion,
+                  sortCriterionList,
                   start,
                   count),
             entityService),
@@ -588,6 +601,7 @@ public Task<LineageScrollResult> scrollAcrossLineage(
       @ActionParam(PARAM_MAX_HOPS) @Optional @Nullable Integer maxHops,
       @ActionParam(PARAM_FILTER) @Optional @Nullable Filter filter,
       @ActionParam(PARAM_SORT) @Optional @Nullable SortCriterion sortCriterion,
+      @ActionParam(PARAM_SORT_CRITERIA) @Optional @Nullable SortCriterion[] sortCriteria,
       @ActionParam(PARAM_SCROLL_ID) @Optional @Nullable String scrollId,
       @ActionParam(PARAM_KEEP_ALIVE) String keepAlive,
       @ActionParam(PARAM_COUNT) int count,
@@ -622,6 +636,8 @@ public Task<LineageScrollResult> scrollAcrossLineage(
         entityList,
         input);
 
+    List<SortCriterion> sortCriterionList = getSortCriteria(sortCriteria, sortCriterion);
+
     return RestliUtil.toTask(
         () ->
             validateLineageScrollResult(opContext,
@@ -633,7 +649,7 @@ public Task<LineageScrollResult> scrollAcrossLineage(
                     input,
                     maxHops,
                     filter,
-                    sortCriterion,
+                    sortCriterionList,
                     scrollId,
                     keepAlive,
                     count),
@@ -648,6 +664,7 @@ public Task<ListResult> list(
       @ActionParam(PARAM_ENTITY) @Nonnull String entityName,
       @ActionParam(PARAM_FILTER) @Optional @Nullable Filter filter,
       @ActionParam(PARAM_SORT) @Optional @Nullable SortCriterion sortCriterion,
+      @ActionParam(PARAM_SORT_CRITERIA) @Optional @Nullable SortCriterion[] sortCriteria,
       @ActionParam(PARAM_START) int start,
       @ActionParam(PARAM_COUNT) int count) {
 
@@ -664,10 +681,12 @@ public Task<ListResult> list(
             systemOperationContext, RequestContext.builder().buildRestli(auth.getActor().toUrnStr(), getContext(), ACTION_LIST, entityName), authorizer, auth, true)
             .withSearchFlags(flags -> new SearchFlags().setFulltext(false));
 
+    List<SortCriterion> sortCriterionList = getSortCriteria(sortCriteria, sortCriterion);
+
     log.info("GET LIST RESULTS for {} with filter {}", entityName, filter);
     return RestliUtil.toTask(
         () -> {
-            SearchResult result = entitySearchService.filter(opContext, entityName, filter, sortCriterion, start, count);
+            SearchResult result = entitySearchService.filter(opContext, entityName, filter, sortCriterionList, start, count);
           if (!AuthUtil.isAPIAuthorizedResult(
                   auth,
                   authorizer,
@@ -1159,6 +1178,7 @@ public Task<SearchResult> filter(
       @ActionParam(PARAM_ENTITY) @Nonnull String entityName,
       @ActionParam(PARAM_FILTER) Filter filter,
       @ActionParam(PARAM_SORT) @Optional @Nullable SortCriterion sortCriterion,
+      @ActionParam(PARAM_SORT_CRITERIA) @Optional @Nullable SortCriterion[] sortCriteria,
       @ActionParam(PARAM_START) int start,
       @ActionParam(PARAM_COUNT) int count) {
 
@@ -1172,10 +1192,12 @@ public Task<SearchResult> filter(
     }
     OperationContext opContext = OperationContext.asSession(
             systemOperationContext, RequestContext.builder().buildRestli(auth.getActor().toUrnStr(), getContext(), ACTION_FILTER, entityName), authorizer, auth, true);
+
+    List<SortCriterion> sortCriterionList = getSortCriteria(sortCriteria, sortCriterion);
     log.info("FILTER RESULTS for {} with filter {}", entityName, filter);
     return RestliUtil.toTask(
         () -> {
-          SearchResult result = entitySearchService.filter(opContext.withSearchFlags(flags -> flags.setFulltext(true)), entityName, filter, sortCriterion, start, count);
+          SearchResult result = entitySearchService.filter(opContext.withSearchFlags(flags -> flags.setFulltext(true)), entityName, filter, sortCriterionList, start, count);
           if (!isAPIAuthorizedResult(
                   auth,
                   authorizer,
diff --git a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/restli/RestliConstants.java b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/restli/RestliConstants.java
index af6efb1ad80939..ef79a404c2145e 100644
--- a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/restli/RestliConstants.java
+++ b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/restli/RestliConstants.java
@@ -24,6 +24,7 @@ private RestliConstants() {}
   public static final String PARAM_FILTER = "filter";
   public static final String PARAM_GROUP = "group";
   public static final String PARAM_SORT = "sort";
+  public static final String PARAM_SORT_CRITERIA = "sortCriteria";
   public static final String PARAM_QUERY = "query";
   public static final String PARAM_FIELD = "field";
   public static final String PARAM_PATH = "path";
diff --git a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/usage/UsageStats.java b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/usage/UsageStats.java
index 518dfecd576808..1b003fec82e8b8 100644
--- a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/usage/UsageStats.java
+++ b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/usage/UsageStats.java
@@ -2,25 +2,20 @@
 
 import static com.datahub.authorization.AuthUtil.isAPIAuthorized;
 import static com.datahub.authorization.AuthUtil.isAPIAuthorizedEntityUrns;
-import static com.linkedin.metadata.Constants.*;
 import static com.linkedin.metadata.authorization.ApiOperation.UPDATE;
 import static com.linkedin.metadata.timeseries.elastic.UsageServiceUtil.USAGE_STATS_ASPECT_NAME;
 import static com.linkedin.metadata.timeseries.elastic.UsageServiceUtil.USAGE_STATS_ENTITY_NAME;
 
 import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
 import com.datahub.authentication.Authentication;
 import com.datahub.authentication.AuthenticationContext;
 import com.datahub.authorization.EntitySpec;
 import com.datahub.plugins.auth.authorization.Authorizer;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.linkedin.common.WindowDuration;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.common.urn.UrnUtils;
-import com.linkedin.data.template.StringArray;
 import com.linkedin.dataset.DatasetFieldUsageCounts;
 import com.linkedin.dataset.DatasetFieldUsageCountsArray;
 import com.linkedin.dataset.DatasetUsageStatistics;
@@ -29,17 +24,10 @@
 import com.linkedin.metadata.authorization.PoliciesConfig;
 import com.linkedin.metadata.models.AspectSpec;
 import com.linkedin.metadata.models.registry.EntityRegistry;
-import com.linkedin.metadata.query.filter.Condition;
-import com.linkedin.metadata.query.filter.ConjunctiveCriterion;
-import com.linkedin.metadata.query.filter.ConjunctiveCriterionArray;
-import com.linkedin.metadata.query.filter.Criterion;
-import com.linkedin.metadata.query.filter.CriterionArray;
-import com.linkedin.metadata.query.filter.Filter;
 import com.linkedin.metadata.restli.RestliUtil;
 import com.linkedin.metadata.timeseries.TimeseriesAspectService;
 import com.linkedin.metadata.timeseries.elastic.UsageServiceUtil;
 import com.linkedin.metadata.timeseries.transformer.TimeseriesAspectTransformer;
-import com.linkedin.metadata.utils.metrics.MetricUtils;
 import com.linkedin.parseq.Task;
 import com.linkedin.restli.common.HttpStatus;
 import com.linkedin.restli.server.RestLiServiceException;
@@ -47,35 +35,20 @@
 import com.linkedin.restli.server.annotations.ActionParam;
 import com.linkedin.restli.server.annotations.RestLiSimpleResource;
 import com.linkedin.restli.server.resources.SimpleResourceTemplate;
-import com.linkedin.timeseries.AggregationSpec;
-import com.linkedin.timeseries.AggregationType;
-import com.linkedin.timeseries.CalendarInterval;
-import com.linkedin.timeseries.GenericTable;
-import com.linkedin.timeseries.GroupingBucket;
-import com.linkedin.timeseries.GroupingBucketType;
 import com.linkedin.timeseries.TimeWindowSize;
 import com.linkedin.usage.FieldUsageCounts;
-import com.linkedin.usage.FieldUsageCountsArray;
 import com.linkedin.usage.UsageAggregation;
-import com.linkedin.usage.UsageAggregationArray;
 import com.linkedin.usage.UsageAggregationMetrics;
 import com.linkedin.usage.UsageQueryResult;
-import com.linkedin.usage.UsageQueryResultAggregations;
 import com.linkedin.usage.UsageTimeRange;
 import com.linkedin.usage.UserUsageCounts;
-import com.linkedin.usage.UserUsageCountsArray;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.metadata.context.RequestContext;
 import io.opentelemetry.extension.annotations.WithSpan;
-import java.net.URISyntaxException;
-import java.time.Instant;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -255,7 +228,8 @@ private void ingest(@Nonnull OperationContext opContext, @Nonnull UsageAggregati
     try {
       documents =
           TimeseriesAspectTransformer.transform(
-              bucket.getResource(), datasetUsageStatistics, getUsageStatsAspectSpec(), null);
+              bucket.getResource(), datasetUsageStatistics, getUsageStatsAspectSpec(), null,
+                  systemOperationContext.getSearchContext().getIndexConvention().getIdHashAlgo());
     } catch (JsonProcessingException e) {
       log.error("Failed to generate timeseries document from aspect: {}", e.toString());
       return;
diff --git a/metadata-service/restli-servlet-impl/src/test/java/mock/MockTimeseriesAspectService.java b/metadata-service/restli-servlet-impl/src/test/java/mock/MockTimeseriesAspectService.java
index aaf90d279e0bda..7ed183e975f3b9 100644
--- a/metadata-service/restli-servlet-impl/src/test/java/mock/MockTimeseriesAspectService.java
+++ b/metadata-service/restli-servlet-impl/src/test/java/mock/MockTimeseriesAspectService.java
@@ -137,7 +137,7 @@ public TimeseriesScrollResult scrollAspects(
       @Nonnull String entityName,
       @Nonnull String aspectName,
       @Nullable Filter filter,
-      @Nonnull List<SortCriterion> sortCriterion,
+      @Nonnull List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       int count,
       @Nullable Long startTimeMillis,
diff --git a/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/SchemaRegistryController.java b/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/SchemaRegistryController.java
index d73b353f38ae78..09043c6dd5e87e 100644
--- a/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/SchemaRegistryController.java
+++ b/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/SchemaRegistryController.java
@@ -307,7 +307,11 @@ public ResponseEntity<RegisterSchemaResponse> register(
             })
         .orElseGet(
             () -> {
-              log.error("Couldn't find topic with name {}.", topicName);
+              if (topicName.matches("^[a-zA-Z0-9._-]+$")) {
+                log.error("Couldn't find topic with name {}.", topicName);
+              } else {
+                log.error("Couldn't find topic (Malformed topic name)");
+              }
               return new ResponseEntity<>(HttpStatus.NOT_FOUND);
             });
   }
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/entity/DeleteEntityService.java b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/DeleteEntityService.java
index aed9b97411ff68..ed14dec4ed940a 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/entity/DeleteEntityService.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/DeleteEntityService.java
@@ -729,11 +729,11 @@ private MetadataChangeProposal updateFormsAspect(
             .collect(Collectors.toList());
     List<FormAssociation> completedForms =
         formsAspect.getCompletedForms().stream()
-            .filter(completedForm -> completedForm.getUrn() != deletedUrn)
+            .filter(completedForm -> !completedForm.getUrn().equals(deletedUrn))
             .collect(Collectors.toList());
     final List<FormVerificationAssociation> verifications =
         formsAspect.getVerifications().stream()
-            .filter(verification -> verification.getForm() != deletedUrn)
+            .filter(verification -> !verification.getForm().equals(deletedUrn))
             .collect(Collectors.toList());
 
     updatedAspect.get().setIncompleteForms(new FormAssociationArray(incompleteForms));
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/entity/restoreindices/RestoreIndicesArgs.java b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/restoreindices/RestoreIndicesArgs.java
index 89e69174c1502d..cae8c97456c069 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/entity/restoreindices/RestoreIndicesArgs.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/restoreindices/RestoreIndicesArgs.java
@@ -1,6 +1,8 @@
 package com.linkedin.metadata.entity.restoreindices;
 
 import java.time.Instant;
+import java.util.Collections;
+import java.util.List;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -20,6 +22,7 @@ public class RestoreIndicesArgs implements Cloneable {
   public long gePitEpochMs = DEFAULT_GE_PIT_EPOCH_MS;
   public long lePitEpochMs;
   public String aspectName;
+  public List<String> aspectNames = Collections.emptyList();
   public String urn;
   public String urnLike;
   public Boolean urnBasedPagination = false;
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/search/EntitySearchService.java b/metadata-service/services/src/main/java/com/linkedin/metadata/search/EntitySearchService.java
index a3db4b029b68bb..26f2335d0c59fb 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/search/EntitySearchService.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/search/EntitySearchService.java
@@ -6,6 +6,7 @@
 import com.linkedin.metadata.query.AutoCompleteResult;
 import com.linkedin.metadata.query.filter.Filter;
 import com.linkedin.metadata.query.filter.SortCriterion;
+import com.linkedin.metadata.utils.elasticsearch.IndexConvention;
 import io.datahubproject.metadata.context.OperationContext;
 import java.util.List;
 import java.util.Map;
@@ -80,7 +81,7 @@ void appendRunId(
    * @param input the search input text
    * @param postFilters the request map with fields and values as filters to be applied to search
    *     hits
-   * @param sortCriterion {@link SortCriterion} to be applied to search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to search results
    * @param from index to start the search from
    * @param size the number of search hits to return
    * @return a {@link SearchResult} that contains a list of matched documents and related search
@@ -92,7 +93,7 @@ SearchResult search(
       @Nonnull List<String> entityNames,
       @Nonnull String input,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size);
 
@@ -108,7 +109,7 @@ SearchResult search(
    * @param input the search input text
    * @param postFilters the request map with fields and values as filters to be applied to search
    *     hits
-   * @param sortCriterion {@link SortCriterion} to be applied to search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to search results
    * @param from index to start the search from
    * @param size the number of search hits to return
    * @param facets list of facets we want aggregations for
@@ -121,7 +122,7 @@ SearchResult search(
       @Nonnull List<String> entityNames,
       @Nonnull String input,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size,
       @Nullable List<String> facets);
@@ -132,7 +133,7 @@ SearchResult search(
    * @param entityName name of the entity
    * @param filters the request map with fields and values to be applied as filters to the search
    *     query
-   * @param sortCriterion {@link SortCriterion} to be applied to search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to search results
    * @param from index to start the search from
    * @param size number of search hits to return
    * @return a {@link SearchResult} that contains a list of filtered documents and related search
@@ -143,7 +144,7 @@ SearchResult filter(
       @Nonnull OperationContext opContext,
       @Nonnull String entityName,
       @Nullable Filter filters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       int from,
       int size);
 
@@ -265,7 +266,7 @@ List<String> getBrowsePaths(
    * @param input the search input text
    * @param postFilters the request map with fields and values as filters to be applied to search
    *     hits
-   * @param sortCriterion {@link SortCriterion} to be applied to search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to search results
    * @param scrollId opaque scroll identifier to pass to search service
    * @param size the number of search hits to return
    * @return a {@link ScrollResult} that contains a list of matched documents and related search
@@ -277,7 +278,7 @@ ScrollResult fullTextScroll(
       @Nonnull List<String> entities,
       @Nonnull String input,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nullable String keepAlive,
       int size);
@@ -290,7 +291,7 @@ ScrollResult fullTextScroll(
    * @param input the search input text
    * @param postFilters the request map with fields and values as filters to be applied to search
    *     hits
-   * @param sortCriterion {@link SortCriterion} to be applied to search results
+   * @param sortCriteria list of {@link SortCriterion} to be applied to search results
    * @param scrollId opaque scroll identifier to pass to search service
    * @param size the number of search hits to return
    * @return a {@link ScrollResult} that contains a list of matched documents and related search
@@ -302,7 +303,7 @@ ScrollResult structuredScroll(
       @Nonnull List<String> entities,
       @Nonnull String input,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nullable String keepAlive,
       int size);
@@ -316,9 +317,16 @@ ExplainResponse explain(
       @Nonnull String documentId,
       @Nonnull String entityName,
       @Nullable Filter postFilters,
-      @Nullable SortCriterion sortCriterion,
+      List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       @Nullable String keepAlive,
       int size,
       @Nullable List<String> facets);
+
+  /**
+   * Return index convention
+   *
+   * @return convent
+   */
+  IndexConvention getIndexConvention();
 }
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/search/utils/QueryUtils.java b/metadata-service/services/src/main/java/com/linkedin/metadata/search/utils/QueryUtils.java
index a148a45b20e0c7..730a2886ab2bf0 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/search/utils/QueryUtils.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/search/utils/QueryUtils.java
@@ -4,9 +4,11 @@
 
 import com.datahub.util.ModelUtils;
 import com.google.common.collect.ImmutableList;
+import com.linkedin.common.urn.Urn;
 import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.data.template.StringArray;
 import com.linkedin.metadata.aspect.AspectVersion;
+import com.linkedin.metadata.config.DataHubAppConfiguration;
 import com.linkedin.metadata.models.EntitySpec;
 import com.linkedin.metadata.models.SearchableFieldSpec;
 import com.linkedin.metadata.models.annotation.SearchableAnnotation;
@@ -20,14 +22,17 @@
 import com.linkedin.metadata.query.filter.RelationshipDirection;
 import com.linkedin.metadata.query.filter.RelationshipFilter;
 import com.linkedin.util.Pair;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import org.apache.commons.collections.CollectionUtils;
 
 public class QueryUtils {
 
@@ -87,6 +92,25 @@ public static Filter newFilter(@Nonnull Criterion criterion) {
                         .setAnd(new CriterionArray(ImmutableList.of(criterion))))));
   }
 
+  @Nonnull
+  public static Filter newDisjunctiveFilter(@Nonnull Criterion... orCriterion) {
+    return new Filter()
+        .setOr(
+            Arrays.stream(orCriterion)
+                .map(
+                    criterion ->
+                        new ConjunctiveCriterion()
+                            .setAnd(new CriterionArray(ImmutableList.of(criterion))))
+                .collect(Collectors.toCollection(ConjunctiveCriterionArray::new)));
+  }
+
+  @Nonnull
+  public static ConjunctiveCriterion add(
+      @Nonnull ConjunctiveCriterion conjunctiveCriterion, @Nonnull Criterion element) {
+    conjunctiveCriterion.getAnd().add(element);
+    return conjunctiveCriterion;
+  }
+
   @Nonnull
   public static Filter filterOrDefaultEmptyFilter(@Nullable Filter filter) {
     return filter != null ? filter : EMPTY_FILTER;
@@ -195,4 +219,77 @@ public static List<EntitySpec> getQueryByDefaultEntitySpecs(EntityRegistry entit
         .map(Pair::getFirst)
         .collect(Collectors.toList());
   }
+
+  /**
+   * Build a filter with URNs and an optional existing filter
+   *
+   * @param urns urns to limit returns
+   * @param inputFilters optional existing filter
+   * @return filter with additional URN criterion
+   */
+  public static Filter buildFilterWithUrns(
+      @Nonnull DataHubAppConfiguration appConfig,
+      @Nonnull Set<Urn> urns,
+      @Nullable Filter inputFilters) {
+    // Determine which field is used for urn selection based on config
+    boolean schemaFieldEnabled =
+        appConfig.getMetadataChangeProposal().getSideEffects().getSchemaField().isEnabled();
+
+    // Prevent increasing the query size by avoiding querying multiple fields with the
+    // same URNs
+    Criterion urnMatchCriterion =
+        new Criterion()
+            .setField("urn")
+            .setValue("")
+            .setValues(
+                new StringArray(
+                    urns.stream()
+                        .filter(
+                            urn ->
+                                !schemaFieldEnabled
+                                    || !urn.getEntityType().equals(SCHEMA_FIELD_ENTITY_NAME))
+                        .map(Object::toString)
+                        .collect(Collectors.toList())));
+
+    Criterion schemaUrnAliasCriterion =
+        new Criterion()
+            .setField(String.format("%s.keyword", SCHEMA_FIELD_ALIASES_ASPECT))
+            .setValue("")
+            .setValues(
+                new StringArray(
+                    urns.stream()
+                        .filter(
+                            urn ->
+                                schemaFieldEnabled
+                                    && urn.getEntityType().equals(SCHEMA_FIELD_ENTITY_NAME))
+                        .map(Object::toString)
+                        .collect(Collectors.toList())));
+
+    if (inputFilters == null || CollectionUtils.isEmpty(inputFilters.getOr())) {
+      return QueryUtils.newDisjunctiveFilter(urnMatchCriterion, schemaUrnAliasCriterion);
+    }
+
+    // Add urn match criterion to each or clause
+    inputFilters.setOr(
+        inputFilters.getOr().stream()
+            .flatMap(
+                existingCriterion -> {
+                  try {
+                    return Stream.concat(
+                        urnMatchCriterion.getValues().isEmpty()
+                            ? Stream.of()
+                            : Stream.of(
+                                QueryUtils.add(existingCriterion.copy(), urnMatchCriterion)),
+                        schemaUrnAliasCriterion.getValues().isEmpty()
+                            ? Stream.of()
+                            : Stream.of(
+                                QueryUtils.add(existingCriterion.copy(), schemaUrnAliasCriterion)));
+                  } catch (CloneNotSupportedException e) {
+                    throw new RuntimeException(e);
+                  }
+                })
+            .collect(Collectors.toCollection(ConjunctiveCriterionArray::new)));
+
+    return inputFilters;
+  }
 }
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/service/FormService.java b/metadata-service/services/src/main/java/com/linkedin/metadata/service/FormService.java
index 210fba82eb4e20..b702a618404230 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/service/FormService.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/service/FormService.java
@@ -312,7 +312,7 @@ private void ingestSchemaFieldStructuredProperties(
       @Nonnull final PrimitivePropertyValueArray values,
       @Nonnull final String fieldPath)
       throws Exception {
-    Urn schemaFieldUrn = SchemaFieldUtils.generateSchemaFieldUrn(entityUrn.toString(), fieldPath);
+    Urn schemaFieldUrn = SchemaFieldUtils.generateSchemaFieldUrn(entityUrn, fieldPath);
     ingestStructuredProperties(opContext, schemaFieldUrn, structuredPropertyUrn, values);
   }
 
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/service/RollbackService.java b/metadata-service/services/src/main/java/com/linkedin/metadata/service/RollbackService.java
index 01af399c9b1155..403665120c6868 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/service/RollbackService.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/service/RollbackService.java
@@ -173,7 +173,7 @@ public RollbackResponse rollbackIngestion(
     // Rollback timeseries aspects
     DeleteAspectValuesResult timeseriesRollbackResult =
         timeseriesAspectService.rollbackTimeseriesAspects(opContext, runId);
-    rowsDeletedFromEntityDeletion += timeseriesRollbackResult.getNumDocsDeleted();
+    rowsDeletedFromEntityDeletion += timeseriesRollbackResult.getNumDocsDeleted().intValue();
 
     log.info("finished deleting {} rows", deletedRows.size());
     int aspectsReverted = deletedRows.size() + rowsDeletedFromEntityDeletion;
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/timeline/data/ChangeTransaction.java b/metadata-service/services/src/main/java/com/linkedin/metadata/timeline/data/ChangeTransaction.java
index 3e963dba0cdb4c..f34c20e6acd763 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/timeline/data/ChangeTransaction.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/timeline/data/ChangeTransaction.java
@@ -1,8 +1,8 @@
 package com.linkedin.metadata.timeline.data;
 
-import com.github.fge.jsonpatch.JsonPatch;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.json.JsonPatch;
 import java.util.List;
 import lombok.Builder;
 import lombok.Getter;
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/timeseries/TimeseriesAspectService.java b/metadata-service/services/src/main/java/com/linkedin/metadata/timeseries/TimeseriesAspectService.java
index 6b1f484ac0a518..68c82f0ef2e0da 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/timeseries/TimeseriesAspectService.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/timeseries/TimeseriesAspectService.java
@@ -226,7 +226,7 @@ TimeseriesScrollResult scrollAspects(
       @Nonnull final String entityName,
       @Nonnull final String aspectName,
       @Nullable Filter filter,
-      @Nonnull List<SortCriterion> sortCriterion,
+      @Nonnull List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
       int count,
       @Nullable Long startTimeMillis,
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/CommonApplicationConfig.java b/metadata-service/war/src/main/java/com/linkedin/gms/CommonApplicationConfig.java
index bc623c3cc983c2..e47a2b4e278e4e 100644
--- a/metadata-service/war/src/main/java/com/linkedin/gms/CommonApplicationConfig.java
+++ b/metadata-service/war/src/main/java/com/linkedin/gms/CommonApplicationConfig.java
@@ -37,7 +37,10 @@
       "com.linkedin.gms.factory.search",
       "com.linkedin.gms.factory.secret",
       "com.linkedin.gms.factory.timeseries",
-      "com.linkedin.gms.factory.plugins"
+      "com.linkedin.gms.factory.plugins",
+      "com.linkedin.gms.factory.change",
+      "com.datahub.event.hook",
+      "com.linkedin.gms.factory.notifications"
     })
 @PropertySource(value = "classpath:/application.yaml", factory = YamlPropertySourceFactory.class)
 @Configuration
diff --git a/metadata-service/war/src/main/resources/boot/data_platforms.json b/metadata-service/war/src/main/resources/boot/data_platforms.json
index ab040ad2854ddb..0eb6256e3aeee3 100644
--- a/metadata-service/war/src/main/resources/boot/data_platforms.json
+++ b/metadata-service/war/src/main/resources/boot/data_platforms.json
@@ -68,6 +68,16 @@
       "logoUrl": "/assets/platforms/couchbaselogo.png"
     }
   },
+  {
+    "urn": "urn:li:dataPlatform:dagster",
+    "aspect": {
+      "datasetNameDelimiter": "/",
+      "name": "dagster",
+      "displayName": "Dagster",
+      "type": "OTHERS",
+      "logoUrl": "/assets/platforms/dagsterlogo.png"
+    }
+  },
   {
     "urn": "urn:li:dataPlatform:external",
     "aspect": {
@@ -247,6 +257,26 @@
       "logoUrl": "/assets/platforms/postgreslogo.png"
     }
   },
+  {
+    "urn": "urn:li:dataPlatform:prefect",
+    "aspect": {
+      "datasetNameDelimiter": ".",
+      "name": "prefect",
+      "displayName": "Prefect",
+      "type": "OTHERS",
+      "logoUrl": "/assets/platforms/prefectlogo.png"
+    }
+  },
+  {
+    "urn": "urn:li:dataPlatform:presto",
+    "aspect": {
+      "datasetNameDelimiter": ".",
+      "name": "prefect",
+      "displayName": "Prefect",
+      "type": "OTHERS",
+      "logoUrl": "/assets/platforms/prefectlogo.png"
+    }
+  },
   {
     "urn": "urn:li:dataPlatform:presto",
     "aspect": {
@@ -664,5 +694,15 @@
       "type": "OTHERS",
       "logoUrl": "/assets/platforms/sigmalogo.png"
     }
+  },
+  {
+    "urn": "urn:li:dataPlatform:sac",
+    "aspect": {
+      "datasetNameDelimiter": ".",
+      "name": "sac",
+      "displayName": "SAP Analytics Cloud",
+      "type": "OTHERS",
+      "logoUrl": "/assets/platforms/saclogo.svg"
+    }
   }
 ]
diff --git a/metadata-service/war/src/main/resources/boot/global_settings.json b/metadata-service/war/src/main/resources/boot/global_settings.json
index 129783afd6df49..35145b85202a7b 100644
--- a/metadata-service/war/src/main/resources/boot/global_settings.json
+++ b/metadata-service/war/src/main/resources/boot/global_settings.json
@@ -1,4 +1,8 @@
 {
   "views": {
+  },
+  "docPropagation": {
+    "enabled": true,
+    "columnPropagationEnabled": true
   }
 }
\ No newline at end of file
diff --git a/metadata-service/war/src/main/resources/boot/policies.json b/metadata-service/war/src/main/resources/boot/policies.json
index 53c773d130f32b..e62d0a33e7cd05 100644
--- a/metadata-service/war/src/main/resources/boot/policies.json
+++ b/metadata-service/war/src/main/resources/boot/policies.json
@@ -2,15 +2,15 @@
   {
     "urn": "urn:li:dataHubPolicy:0",
     "info": {
-      "actors":{
-        "resourceOwners":false,
-        "allUsers":false,
-        "allGroups":false,
-        "users":[
+      "actors": {
+        "resourceOwners": false,
+        "allUsers": false,
+        "allGroups": false,
+        "users": [
           "urn:li:corpuser:datahub"
         ]
       },
-      "privileges":[
+      "privileges": [
         "MANAGE_POLICIES",
         "MANAGE_INGESTION",
         "MANAGE_SECRETS",
@@ -36,27 +36,28 @@
         "CREATE_BUSINESS_ATTRIBUTE",
         "MANAGE_BUSINESS_ATTRIBUTE",
         "MANAGE_STRUCTURED_PROPERTIES",
-        "MANAGE_DOCUMENTATION_FORMS"
+        "MANAGE_DOCUMENTATION_FORMS",
+        "MANAGE_FEATURES"
       ],
-      "displayName":"Root User - All Platform Privileges",
-      "description":"Grants all platform privileges to root user.",
-      "state":"ACTIVE",
-      "type":"PLATFORM",
-      "editable":false
+      "displayName": "Root User - All Platform Privileges",
+      "description": "Grants all platform privileges to root user.",
+      "state": "ACTIVE",
+      "type": "PLATFORM",
+      "editable": false
     }
   },
   {
     "urn": "urn:li:dataHubPolicy:1",
     "info": {
-      "actors":{
-        "resourceOwners":false,
-        "allUsers":false,
-        "allGroups":false,
-        "users":[
+      "actors": {
+        "resourceOwners": false,
+        "allUsers": false,
+        "allGroups": false,
+        "users": [
           "urn:li:corpuser:datahub"
         ]
       },
-      "privileges":[
+      "privileges": [
         "EDIT_ENTITY",
         "VIEW_ENTITY_PAGE",
         "EDIT_LINEAGE",
@@ -72,43 +73,43 @@
         "DELETE_ENTITY",
         "ES_EXPLAIN_QUERY_PRIVILEGE"
       ],
-      "displayName":"Root User - Edit and View All Resources",
-      "description":"Grants all edit and view privileges for all resources to root user.",
-      "state":"ACTIVE",
-      "type":"METADATA",
-      "editable":false
+      "displayName": "Root User - Edit and View All Resources",
+      "description": "Grants all edit and view privileges for all resources to root user.",
+      "state": "ACTIVE",
+      "type": "METADATA",
+      "editable": false
     }
   },
   {
     "urn": "urn:li:dataHubPolicy:7",
     "info": {
-      "actors":{
-        "resourceOwners":false,
-        "allUsers":true,
-        "allGroups":false,
-        "users":[]
+      "actors": {
+        "resourceOwners": false,
+        "allUsers": true,
+        "allGroups": false,
+        "users": []
       },
-      "privileges":[
+      "privileges": [
         "VIEW_ANALYTICS",
         "GENERATE_PERSONAL_ACCESS_TOKENS"
       ],
-      "displayName":"All Users - Base Platform Privileges",
-      "description":"Grants base platform privileges to ALL users of DataHub. Change this policy to alter that behavior.",
-      "state":"ACTIVE",
-      "type":"PLATFORM",
-      "editable":true
+      "displayName": "All Users - Base Platform Privileges",
+      "description": "Grants base platform privileges to ALL users of DataHub. Change this policy to alter that behavior.",
+      "state": "ACTIVE",
+      "type": "PLATFORM",
+      "editable": true
     }
   },
   {
     "urn": "urn:li:dataHubPolicy:view-entity-page-all",
     "info": {
-      "actors":{
-        "resourceOwners":false,
-        "allUsers":true,
-        "allGroups":false,
-        "users":[]
+      "actors": {
+        "resourceOwners": false,
+        "allUsers": true,
+        "allGroups": false,
+        "users": []
       },
-      "privileges":[
+      "privileges": [
         "VIEW_ENTITY_PAGE",
         "SEARCH_PRIVILEGE",
         "GET_COUNTS_PRIVILEGE",
@@ -117,47 +118,47 @@
         "GET_TIMELINE_PRIVILEGE",
         "ES_EXPLAIN_QUERY_PRIVILEGE"
       ],
-      "displayName":"All Users - View Entity Page",
-      "description":"Grants entity view to all users",
-      "state":"ACTIVE",
-      "type":"METADATA",
-      "editable":true
+      "displayName": "All Users - View Entity Page",
+      "description": "Grants entity view to all users",
+      "state": "ACTIVE",
+      "type": "METADATA",
+      "editable": true
     }
   },
   {
     "urn": "urn:li:dataHubPolicy:view-dataset-sensitive",
     "info": {
-      "actors":{
-        "resourceOwners":false,
-        "allUsers":true,
-        "allGroups":false,
-        "users":[]
+      "actors": {
+        "resourceOwners": false,
+        "allUsers": true,
+        "allGroups": false,
+        "users": []
       },
-      "privileges":[
+      "privileges": [
         "VIEW_DATASET_USAGE",
         "VIEW_DATASET_PROFILE"
       ],
-      "displayName":"All Users - View Dataset Sensitive Information",
-      "description":"Grants viewing privileges of usage and profile information of all datasets for all users",
-      "state":"ACTIVE",
-      "type":"METADATA",
-      "editable":true
+      "displayName": "All Users - View Dataset Sensitive Information",
+      "description": "Grants viewing privileges of usage and profile information of all datasets for all users",
+      "state": "ACTIVE",
+      "type": "METADATA",
+      "editable": true
     }
   },
   {
     "urn": "urn:li:dataHubPolicy:admin-platform-policy",
     "info": {
-      "actors":{
-        "resourceOwners":false,
-        "allUsers":false,
-        "allGroups":false,
-        "users":[],
-        "groups":[],
-        "roles":[
+      "actors": {
+        "resourceOwners": false,
+        "allUsers": false,
+        "allGroups": false,
+        "users": [],
+        "groups": [],
+        "roles": [
           "urn:li:dataHubRole:Admin"
         ]
       },
-      "privileges":[
+      "privileges": [
         "MANAGE_POLICIES",
         "MANAGE_INGESTION",
         "MANAGE_SECRETS",
@@ -183,29 +184,30 @@
         "CREATE_BUSINESS_ATTRIBUTE",
         "MANAGE_BUSINESS_ATTRIBUTE",
         "MANAGE_STRUCTURED_PROPERTIES",
-        "MANAGE_DOCUMENTATION_FORMS"
+        "MANAGE_DOCUMENTATION_FORMS",
+        "MANAGE_FEATURES"
       ],
-      "displayName":"Admins - Platform Policy",
-      "description":"Admins have all platform privileges.",
-      "state":"ACTIVE",
-      "type":"PLATFORM",
-      "editable":false
+      "displayName": "Admins - Platform Policy",
+      "description": "Admins have all platform privileges.",
+      "state": "ACTIVE",
+      "type": "PLATFORM",
+      "editable": false
     }
   },
   {
     "urn": "urn:li:dataHubPolicy:admin-metadata-policy",
     "info": {
-      "actors":{
-        "resourceOwners":false,
-        "allUsers":false,
-        "allGroups":false,
-        "users":[],
-        "groups":[],
-        "roles":[
+      "actors": {
+        "resourceOwners": false,
+        "allUsers": false,
+        "allGroups": false,
+        "users": [],
+        "groups": [],
+        "roles": [
           "urn:li:dataHubRole:Admin"
         ]
       },
-      "privileges":[
+      "privileges": [
         "VIEW_ENTITY_PAGE",
         "EDIT_ENTITY_TAGS",
         "EDIT_ENTITY_GLOSSARY_TERMS",
@@ -243,27 +245,27 @@
         "ES_EXPLAIN_QUERY_PRIVILEGE",
         "EDIT_ENTITY_PROPERTIES"
       ],
-      "displayName":"Admins - Metadata Policy",
-      "description":"Admins have all metadata privileges.",
-      "state":"ACTIVE",
-      "type":"METADATA",
-      "editable":false
+      "displayName": "Admins - Metadata Policy",
+      "description": "Admins have all metadata privileges.",
+      "state": "ACTIVE",
+      "type": "METADATA",
+      "editable": false
     }
   },
   {
     "urn": "urn:li:dataHubPolicy:editor-platform-policy",
     "info": {
-      "actors":{
-        "resourceOwners":false,
-        "allUsers":false,
-        "allGroups":false,
-        "users":[],
-        "groups":[],
-        "roles":[
+      "actors": {
+        "resourceOwners": false,
+        "allUsers": false,
+        "allGroups": false,
+        "users": [],
+        "groups": [],
+        "roles": [
           "urn:li:dataHubRole:Editor"
         ]
       },
-      "privileges":[
+      "privileges": [
         "GENERATE_PERSONAL_ACCESS_TOKENS",
         "MANAGE_DOMAINS",
         "MANAGE_GLOBAL_ANNOUNCEMENTS",
@@ -271,29 +273,30 @@
         "MANAGE_TAGS",
         "MANAGE_BUSINESS_ATTRIBUTE",
         "MANAGE_STRUCTURED_PROPERTIES",
-        "MANAGE_DOCUMENTATION_FORMS"
+        "MANAGE_DOCUMENTATION_FORMS",
+        "MANAGE_FEATURES"
       ],
-      "displayName":"Editors - Platform Policy",
-      "description":"Editors can manage ingestion and view analytics.",
-      "state":"ACTIVE",
-      "type":"PLATFORM",
-      "editable":false
+      "displayName": "Editors - Platform Policy",
+      "description": "Editors can manage ingestion and view analytics.",
+      "state": "ACTIVE",
+      "type": "PLATFORM",
+      "editable": false
     }
   },
   {
     "urn": "urn:li:dataHubPolicy:editor-metadata-policy",
     "info": {
-      "actors":{
-        "resourceOwners":false,
-        "allUsers":false,
-        "allGroups":false,
-        "users":[],
-        "groups":[],
-        "roles":[
+      "actors": {
+        "resourceOwners": false,
+        "allUsers": false,
+        "allGroups": false,
+        "users": [],
+        "groups": [],
+        "roles": [
           "urn:li:dataHubRole:Editor"
         ]
       },
-      "privileges":[
+      "privileges": [
         "VIEW_ENTITY_PAGE",
         "EDIT_ENTITY_TAGS",
         "EDIT_ENTITY_GLOSSARY_TERMS",
@@ -324,23 +327,23 @@
         "ES_EXPLAIN_QUERY_PRIVILEGE",
         "EDIT_ENTITY_PROPERTIES"
       ],
-      "displayName":"Editors - Metadata Policy",
-      "description":"Editors have all metadata privileges.",
-      "state":"ACTIVE",
-      "type":"METADATA",
-      "editable":false
+      "displayName": "Editors - Metadata Policy",
+      "description": "Editors have all metadata privileges.",
+      "state": "ACTIVE",
+      "type": "METADATA",
+      "editable": false
     }
   },
   {
     "urn": "urn:li:dataHubPolicy:editor-metadata-policy-entities",
     "info": {
-      "actors":{
-        "resourceOwners":false,
-        "allUsers":false,
-        "allGroups":false,
-        "users":[],
-        "groups":[],
-        "roles":[
+      "actors": {
+        "resourceOwners": false,
+        "allUsers": false,
+        "allGroups": false,
+        "users": [],
+        "groups": [],
+        "roles": [
           "urn:li:dataHubRole:Editor"
         ]
       },
@@ -362,58 +365,59 @@
                 "glossaryTerm",
                 "glossaryNode",
                 "notebook",
-                "dataProduct"
+                "dataProduct",
+                "dataProcessInstance"
               ],
               "condition": "EQUALS"
             }
           ]
         }
       },
-      "privileges":[
+      "privileges": [
         "EDIT_ENTITY"
       ],
-      "displayName":"Editors - Edit Metadata Entities",
-      "description":"Editors can edit primary metadata entities.",
-      "state":"ACTIVE",
-      "type":"METADATA",
-      "editable":true
+      "displayName": "Editors - Edit Metadata Entities",
+      "description": "Editors can edit primary metadata entities.",
+      "state": "ACTIVE",
+      "type": "METADATA",
+      "editable": true
     }
   },
   {
     "urn": "urn:li:dataHubPolicy:reader-platform-policy",
     "info": {
-      "actors":{
-        "resourceOwners":false,
-        "allUsers":false,
-        "allGroups":false,
-        "users":[],
-        "groups":[],
-        "roles":[
+      "actors": {
+        "resourceOwners": false,
+        "allUsers": false,
+        "allGroups": false,
+        "users": [],
+        "groups": [],
+        "roles": [
           "urn:li:dataHubRole:Reader"
         ]
       },
-      "privileges":[],
-      "displayName":"Readers - Platform Policy",
-      "description":"Readers can view analytics.",
-      "state":"ACTIVE",
-      "type":"PLATFORM",
-      "editable":false
+      "privileges": [],
+      "displayName": "Readers - Platform Policy",
+      "description": "Readers can view analytics.",
+      "state": "ACTIVE",
+      "type": "PLATFORM",
+      "editable": false
     }
   },
   {
     "urn": "urn:li:dataHubPolicy:reader-metadata-policy",
     "info": {
-      "actors":{
-        "resourceOwners":false,
-        "allUsers":false,
-        "allGroups":false,
-        "users":[],
-        "groups":[],
-        "roles":[
+      "actors": {
+        "resourceOwners": false,
+        "allUsers": false,
+        "allGroups": false,
+        "users": [],
+        "groups": [],
+        "roles": [
           "urn:li:dataHubRole:Reader"
         ]
       },
-      "privileges":[
+      "privileges": [
         "VIEW_ENTITY_PAGE",
         "VIEW_DATASET_USAGE",
         "VIEW_DATASET_PROFILE",
@@ -424,24 +428,24 @@
         "GET_TIMELINE_PRIVILEGE",
         "ES_EXPLAIN_QUERY_PRIVILEGE"
       ],
-      "displayName":"Readers - Metadata Policy",
-      "description":"Readers can view all assets.",
-      "state":"ACTIVE",
-      "type":"METADATA",
-      "editable":false
+      "displayName": "Readers - Metadata Policy",
+      "description": "Readers can view all assets.",
+      "state": "ACTIVE",
+      "type": "METADATA",
+      "editable": false
     }
   },
   {
     "urn": "urn:li:dataHubPolicy:asset-owners-metadata-policy",
     "info": {
-      "actors":{
-        "resourceOwners":true,
-        "allUsers":false,
-        "allGroups":false,
-        "users":[],
-        "groups":[]
+      "actors": {
+        "resourceOwners": true,
+        "allUsers": false,
+        "allGroups": false,
+        "users": [],
+        "groups": []
       },
-      "privileges":[
+      "privileges": [
         "VIEW_ENTITY_PAGE",
         "EDIT_ENTITY_TAGS",
         "EDIT_ENTITY_GLOSSARY_TERMS",
@@ -475,11 +479,11 @@
         "ES_EXPLAIN_QUERY_PRIVILEGE",
         "EDIT_ENTITY_PROPERTIES"
       ],
-      "displayName":"Asset Owners - Metadata Policy",
-      "description":"Asset Owners have all metadata privileges ONLY for assets they own.",
-      "state":"ACTIVE",
-      "type":"METADATA",
-      "editable":true
+      "displayName": "Asset Owners - Metadata Policy",
+      "description": "Asset Owners have all metadata privileges ONLY for assets they own.",
+      "state": "ACTIVE",
+      "type": "METADATA",
+      "editable": true
     }
   }
-]
+]
\ No newline at end of file
diff --git a/metadata-service/war/src/main/resources/boot/retention.yaml b/metadata-service/war/src/main/resources/boot/retention.yaml
index 630d2ce7ad0e67..639d1aa6bfc47e 100644
--- a/metadata-service/war/src/main/resources/boot/retention.yaml
+++ b/metadata-service/war/src/main/resources/boot/retention.yaml
@@ -3,7 +3,7 @@
   config:
     retention:
       version:
-        maxVersions: 5
+        maxVersions: 1
 - entity: "*"
   aspect: "*"
   config:
@@ -17,4 +17,4 @@
 #      version:
 #        maxVersions: 10
 #      time:
-#        maxAgeInSeconds: 2592000 # 30 days
\ No newline at end of file
+#        maxAgeInSeconds: 2592000 # 30 days
diff --git a/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java b/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
index c20b287a47141d..a282c6be673d0e 100644
--- a/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
+++ b/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
@@ -163,6 +163,10 @@ public class PoliciesConfig {
           "Manage Documentation Forms",
           "Manage forms assigned to assets to assist in documentation efforts.");
 
+  public static final Privilege MANAGE_FEATURES_PRIVILEGE =
+      Privilege.of(
+          "MANAGE_FEATURES", "Manage Features", "Umbrella privilege to manage all features.");
+
   public static final List<Privilege> PLATFORM_PRIVILEGES =
       ImmutableList.of(
           MANAGE_POLICIES_PRIVILEGE,
@@ -189,7 +193,8 @@ public class PoliciesConfig {
           MANAGE_BUSINESS_ATTRIBUTE_PRIVILEGE,
           MANAGE_CONNECTIONS_PRIVILEGE,
           MANAGE_STRUCTURED_PROPERTIES_PRIVILEGE,
-          MANAGE_DOCUMENTATION_FORMS_PRIVILEGE);
+          MANAGE_DOCUMENTATION_FORMS_PRIVILEGE,
+          MANAGE_FEATURES_PRIVILEGE);
 
   // Resource Privileges //
 
diff --git a/metadata-utils/src/main/java/com/linkedin/metadata/utils/SchemaFieldUtils.java b/metadata-utils/src/main/java/com/linkedin/metadata/utils/SchemaFieldUtils.java
index edf959d04a37b3..4515008b050a1b 100644
--- a/metadata-utils/src/main/java/com/linkedin/metadata/utils/SchemaFieldUtils.java
+++ b/metadata-utils/src/main/java/com/linkedin/metadata/utils/SchemaFieldUtils.java
@@ -1,22 +1,124 @@
 package com.linkedin.metadata.utils;
 
+import static com.linkedin.metadata.Constants.SCHEMA_FIELD_ENTITY_NAME;
+import static org.apache.commons.codec.digest.DigestUtils.sha256Hex;
+
+import com.google.common.annotations.VisibleForTesting;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.common.urn.UrnUtils;
-import com.linkedin.metadata.Constants;
-import com.linkedin.metadata.key.SchemaFieldKey;
+import com.linkedin.schema.SchemaField;
+import com.linkedin.schema.SchemaMetadata;
+import com.linkedin.util.Pair;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 
 public class SchemaFieldUtils {
+  private static final String FIELD_PATH_V2 = "[version=2.0]";
 
   private SchemaFieldUtils() {}
 
+  /**
+   * Generate schemaFieldUrn from the parent dataset urn from schemaMetadata field
+   *
+   * @param parentUrn the dataset's urn
+   * @param field field from schemaMetadata
+   * @return schemaField URN
+   */
+  public static Urn generateSchemaFieldUrn(Urn parentUrn, SchemaField field) {
+    return generateSchemaFieldUrn(parentUrn, field.getFieldPath());
+  }
+
+  public static String generateDocumentId(Urn schemaFieldUrn) {
+    if (!SCHEMA_FIELD_ENTITY_NAME.equals(schemaFieldUrn.getEntityType())) {
+      throw new IllegalArgumentException(
+          String.format(
+              "Invalid URN, expected entity %s, found %s",
+              SCHEMA_FIELD_ENTITY_NAME, schemaFieldUrn.getEntityType()));
+    }
+
+    return String.format(
+        "urn:li:%s:(%s,%s)",
+        SCHEMA_FIELD_ENTITY_NAME,
+        sha256Hex(schemaFieldUrn.getEntityKey().get(0)),
+        sha256Hex(schemaFieldUrn.getEntityKey().get(1)));
+  }
+
+  /**
+   * Handles our url encoding for URN characters.
+   *
+   * @param parentUrn the dataset's urn
+   * @param fieldPath field path
+   * @return schemaField URN
+   */
   public static Urn generateSchemaFieldUrn(
-      @Nonnull final String resourceUrn, @Nonnull final String fieldPath) {
+      @Nonnull final Urn parentUrn, @Nonnull final String fieldPath) {
     // we rely on schemaField fieldPaths to be encoded since we do that on the ingestion side
     final String encodedFieldPath =
         fieldPath.replaceAll("\\(", "%28").replaceAll("\\)", "%29").replaceAll(",", "%2C");
-    final SchemaFieldKey key =
-        new SchemaFieldKey().setParent(UrnUtils.getUrn(resourceUrn)).setFieldPath(encodedFieldPath);
-    return EntityKeyUtils.convertEntityKeyToUrn(key, Constants.SCHEMA_FIELD_ENTITY_NAME);
+    return Urn.createFromTuple(SCHEMA_FIELD_ENTITY_NAME, parentUrn.toString(), encodedFieldPath);
+  }
+
+  /**
+   * Produce schemaField URN aliases v1/v2 variants given a schemeField target URN (either v1/v2),
+   * the parent dataset URN and the parent dataset's schemaMetadata aspect.
+   *
+   * @param datasetUrn parent dataset's urn
+   * @param schemaMetadata parent dataset's schemaMetadata
+   * @param schemaField target schemeField
+   * @return all aliases of the given schemaField URN including itself (if it exists within the
+   *     schemaMetadata)
+   */
+  public static Set<Urn> getSchemaFieldAliases(
+      @Nonnull Urn datasetUrn,
+      @Nonnull SchemaMetadata schemaMetadata,
+      @Nonnull SchemaField schemaField) {
+
+    Urn downgradedUrn =
+        downgradeSchemaFieldUrn(
+            generateSchemaFieldUrn(datasetUrn, downgradeFieldPath(schemaField.getFieldPath())));
+
+    // Find all collisions after v2 -> v1 conversion
+    HashSet<Urn> aliases =
+        schemaMetadata.getFields().stream()
+            .map(
+                field ->
+                    Pair.of(
+                        generateSchemaFieldUrn(
+                            datasetUrn, downgradeFieldPath(field.getFieldPath())),
+                        generateSchemaFieldUrn(datasetUrn, field.getFieldPath())))
+            .filter(pair -> pair.getFirst().equals(downgradedUrn))
+            .map(Pair::getSecond)
+            .collect(Collectors.toCollection(HashSet::new));
+
+    if (!aliases.isEmpty()) {
+      // if v2 -> v1
+      aliases.add(downgradedUrn);
+    }
+
+    return aliases;
+  }
+
+  @VisibleForTesting
+  @Nonnull
+  static Urn downgradeSchemaFieldUrn(@Nonnull Urn schemaFieldUrn) {
+    return generateSchemaFieldUrn(
+        UrnUtils.getUrn(schemaFieldUrn.getId()),
+        downgradeFieldPath(schemaFieldUrn.getEntityKey().get(1)));
+  }
+
+  // https://datahubproject.io/docs/advanced/field-path-spec-v2/#backward-compatibility
+  @Nonnull
+  private static String downgradeFieldPath(@Nonnull String fieldPath) {
+    if (fieldPath.startsWith(FIELD_PATH_V2)) {
+      return Arrays.stream(fieldPath.substring(FIELD_PATH_V2.length()).split("[.]"))
+          .filter(
+              component ->
+                  !component.isEmpty() && !(component.startsWith("[") && component.endsWith("]")))
+          .collect(Collectors.joining("."));
+    }
+    return fieldPath;
   }
 }
diff --git a/metadata-utils/src/main/java/com/linkedin/metadata/utils/SearchUtil.java b/metadata-utils/src/main/java/com/linkedin/metadata/utils/SearchUtil.java
index c3c9cac6280ed2..aa18124c826dac 100644
--- a/metadata-utils/src/main/java/com/linkedin/metadata/utils/SearchUtil.java
+++ b/metadata-utils/src/main/java/com/linkedin/metadata/utils/SearchUtil.java
@@ -54,10 +54,10 @@ public static List<FilterValue> convertToFilters(
 
   public static FilterValue createFilterValue(String value, Long facetCount, Boolean isFilteredOn) {
     // TODO(indy): test this
-    String[] aggregationTokens = value.split(AGGREGATION_SEPARATOR_CHAR);
+    String[] aggregations = value.split(AGGREGATION_SEPARATOR_CHAR);
     FilterValue result =
         new FilterValue().setValue(value).setFacetCount(facetCount).setFiltered(isFilteredOn);
-    String lastValue = aggregationTokens[aggregationTokens.length - 1];
+    String lastValue = aggregations[aggregations.length - 1];
     if (lastValue.startsWith(URN_PREFIX)) {
       try {
         result.setEntity(Urn.createFromString(lastValue));
diff --git a/metadata-utils/src/main/java/com/linkedin/metadata/utils/SystemMetadataUtils.java b/metadata-utils/src/main/java/com/linkedin/metadata/utils/SystemMetadataUtils.java
index 81bfcaab74ddb8..4cc09f83e5f740 100644
--- a/metadata-utils/src/main/java/com/linkedin/metadata/utils/SystemMetadataUtils.java
+++ b/metadata-utils/src/main/java/com/linkedin/metadata/utils/SystemMetadataUtils.java
@@ -1,6 +1,8 @@
 package com.linkedin.metadata.utils;
 
-import com.linkedin.metadata.Constants;
+import static com.linkedin.metadata.Constants.DEFAULT_RUN_ID;
+
+import com.linkedin.data.template.SetMode;
 import com.linkedin.mxe.SystemMetadata;
 import javax.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
@@ -11,13 +13,25 @@ public class SystemMetadataUtils {
   private SystemMetadataUtils() {}
 
   public static SystemMetadata createDefaultSystemMetadata() {
-    return new SystemMetadata()
-        .setRunId(Constants.DEFAULT_RUN_ID)
-        .setLastObserved(System.currentTimeMillis());
+    return generateSystemMetadataIfEmpty(null);
+  }
+
+  public static SystemMetadata createDefaultSystemMetadata(@Nullable String runId) {
+    return generateSystemMetadataIfEmpty(
+        new SystemMetadata()
+            .setRunId(runId, SetMode.REMOVE_IF_NULL)
+            .setLastObserved(System.currentTimeMillis()));
   }
 
   public static SystemMetadata generateSystemMetadataIfEmpty(
       @Nullable SystemMetadata systemMetadata) {
-    return systemMetadata == null ? createDefaultSystemMetadata() : systemMetadata;
+    SystemMetadata result = systemMetadata == null ? new SystemMetadata() : systemMetadata;
+    if (result.getRunId() == null) {
+      result.setRunId(DEFAULT_RUN_ID);
+    }
+    if (!result.hasLastObserved() || result.getLastObserved() == 0) {
+      result.setLastObserved(System.currentTimeMillis());
+    }
+    return result;
   }
 }
diff --git a/metadata-utils/src/main/java/com/linkedin/metadata/utils/elasticsearch/IndexConvention.java b/metadata-utils/src/main/java/com/linkedin/metadata/utils/elasticsearch/IndexConvention.java
index 4a3f78fcef7bd6..b4c95ce106de5f 100644
--- a/metadata-utils/src/main/java/com/linkedin/metadata/utils/elasticsearch/IndexConvention.java
+++ b/metadata-utils/src/main/java/com/linkedin/metadata/utils/elasticsearch/IndexConvention.java
@@ -1,5 +1,6 @@
 package com.linkedin.metadata.utils.elasticsearch;
 
+import com.linkedin.common.urn.Urn;
 import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.metadata.models.EntitySpec;
 import com.linkedin.util.Pair;
@@ -47,4 +48,16 @@ public interface IndexConvention {
    *     if one cannot be extracted
    */
   Optional<Pair<String, String>> getEntityAndAspectName(String timeseriesAspectIndexName);
+
+  @Nonnull
+  String getIdHashAlgo();
+
+  /**
+   * Given the URN generate the document id for entity indices
+   *
+   * @param entityUrn the entity which the document belongs
+   * @return document id
+   */
+  @Nonnull
+  String getEntityDocumentId(Urn entityUrn);
 }
diff --git a/metadata-utils/src/main/java/com/linkedin/metadata/utils/elasticsearch/IndexConventionImpl.java b/metadata-utils/src/main/java/com/linkedin/metadata/utils/elasticsearch/IndexConventionImpl.java
index 47801cd2054fa4..5855715fb7ebab 100644
--- a/metadata-utils/src/main/java/com/linkedin/metadata/utils/elasticsearch/IndexConventionImpl.java
+++ b/metadata-utils/src/main/java/com/linkedin/metadata/utils/elasticsearch/IndexConventionImpl.java
@@ -1,32 +1,48 @@
 package com.linkedin.metadata.utils.elasticsearch;
 
+import static com.linkedin.metadata.Constants.SCHEMA_FIELD_ENTITY_NAME;
+
+import com.linkedin.common.urn.Urn;
 import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.metadata.models.EntitySpec;
+import com.linkedin.metadata.utils.SchemaFieldUtils;
 import com.linkedin.util.Pair;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Value;
 import org.apache.commons.lang3.StringUtils;
 
 // Default implementation of search index naming convention
 public class IndexConventionImpl implements IndexConvention {
-  public static final IndexConvention NO_PREFIX = new IndexConventionImpl(null);
+  public static IndexConvention noPrefix(@Nonnull String idHashAlgo) {
+    return new IndexConventionImpl(IndexConventionConfig.builder().hashIdAlgo(idHashAlgo).build());
+  }
 
   // Map from Entity name -> Index name
   private final Map<String, String> indexNameMapping = new ConcurrentHashMap<>();
   private final Optional<String> _prefix;
   private final String _getAllEntityIndicesPattern;
   private final String _getAllTimeseriesIndicesPattern;
+  @Getter private final IndexConventionConfig indexConventionConfig;
 
   private static final String ENTITY_INDEX_VERSION = "v2";
   private static final String ENTITY_INDEX_SUFFIX = "index";
   private static final String TIMESERIES_INDEX_VERSION = "v1";
   private static final String TIMESERIES_ENTITY_INDEX_SUFFIX = "aspect";
 
-  public IndexConventionImpl(@Nullable String prefix) {
-    _prefix = StringUtils.isEmpty(prefix) ? Optional.empty() : Optional.of(prefix);
+  public IndexConventionImpl(IndexConventionConfig indexConventionConfig) {
+    this.indexConventionConfig = indexConventionConfig;
+    _prefix =
+        StringUtils.isEmpty(indexConventionConfig.getPrefix())
+            ? Optional.empty()
+            : Optional.of(indexConventionConfig.getPrefix());
     _getAllEntityIndicesPattern =
         _prefix.map(p -> p + "_").orElse("")
             + "*"
@@ -41,6 +57,12 @@ public IndexConventionImpl(@Nullable String prefix) {
             + TIMESERIES_INDEX_VERSION;
   }
 
+  @Nonnull
+  @Override
+  public String getIdHashAlgo() {
+    return indexConventionConfig.getHashIdAlgo();
+  }
+
   private String createIndexName(String baseName) {
     return (_prefix.map(prefix -> prefix + "_").orElse("") + baseName).toLowerCase();
   }
@@ -131,4 +153,27 @@ public Optional<Pair<String, String>> getEntityAndAspectName(String timeseriesAs
     }
     return Optional.empty();
   }
+
+  @Nonnull
+  @Override
+  public String getEntityDocumentId(Urn entityUrn) {
+    final String unencodedId;
+    if (indexConventionConfig.schemaFieldDocIdHashEnabled
+        && SCHEMA_FIELD_ENTITY_NAME.equals(entityUrn.getEntityType())) {
+      unencodedId = SchemaFieldUtils.generateDocumentId(entityUrn);
+    } else {
+      unencodedId = entityUrn.toString();
+    }
+
+    return URLEncoder.encode(unencodedId, StandardCharsets.UTF_8);
+  }
+
+  /** Since this is used outside of Spring */
+  @Value
+  @Builder
+  public static class IndexConventionConfig {
+    @Builder.Default String hashIdAlgo = "MD5";
+    @Builder.Default @Nullable String prefix = null;
+    @Builder.Default boolean schemaFieldDocIdHashEnabled = false;
+  }
 }
diff --git a/metadata-utils/src/test/java/com/linkedin/metadata/utils/SchemaFieldUtilsTest.java b/metadata-utils/src/test/java/com/linkedin/metadata/utils/SchemaFieldUtilsTest.java
new file mode 100644
index 00000000000000..53f24f1d99b959
--- /dev/null
+++ b/metadata-utils/src/test/java/com/linkedin/metadata/utils/SchemaFieldUtilsTest.java
@@ -0,0 +1,133 @@
+package com.linkedin.metadata.utils;
+
+import static org.testng.Assert.assertEquals;
+
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.schema.SchemaField;
+import com.linkedin.schema.SchemaFieldArray;
+import com.linkedin.schema.SchemaMetadata;
+import java.util.List;
+import java.util.Set;
+import org.testng.annotations.Test;
+
+/** Tests the capabilities of {@link EntityKeyUtils} */
+public class SchemaFieldUtilsTest {
+  private static final Urn TEST_DATASET_URN =
+      UrnUtils.getUrn(
+          "urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD)");
+
+  @Test
+  public void testGenerateSchemaFieldURN() {
+    assertEquals(
+        SchemaFieldUtils.generateSchemaFieldUrn(TEST_DATASET_URN, "customer_id"),
+        UrnUtils.getUrn(
+            "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),customer_id)"));
+
+    assertEquals(
+        SchemaFieldUtils.generateSchemaFieldUrn(
+            TEST_DATASET_URN,
+            "[version=2.0].[type=ABFooUnion].[type=union].[type=array].[type=array].[type=Foo].a.[type=long].f"),
+        UrnUtils.getUrn(
+            "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),[version=2.0].[type=ABFooUnion].[type=union].[type=array].[type=array].[type=Foo].a.[type=long].f)"));
+  }
+
+  @Test
+  public void testDowngradeSchemaFieldUrn() {
+    assertEquals(
+        SchemaFieldUtils.downgradeSchemaFieldUrn(
+            UrnUtils.getUrn(
+                "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),customer_id)")),
+        UrnUtils.getUrn(
+            "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),customer_id)"),
+        "Expected no change to v1 field path schemaField URN");
+
+    assertEquals(
+        SchemaFieldUtils.downgradeSchemaFieldUrn(
+            UrnUtils.getUrn(
+                "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),[version=2.0].[type=ABFooUnion].[type=union].[type=array].[type=array].[type=Foo].a.[type=long].f)")),
+        UrnUtils.getUrn(
+            "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),a.f)"),
+        "Expected downgrade to v1 field path schemaField URN");
+  }
+
+  @Test
+  public void testSchemaFieldAliases() {
+    SchemaMetadata testSchema = new SchemaMetadata();
+    testSchema.setFields(
+        new SchemaFieldArray(
+            List.of(
+                new SchemaField().setFieldPath("customer_id"),
+                new SchemaField().setFieldPath("[version=2.0].[type=ABFooUnion].[type=union].a"),
+                new SchemaField()
+                    .setFieldPath("[version=2.0].[type=ABFooUnion].[type=union].[type=A].a"),
+                new SchemaField()
+                    .setFieldPath(
+                        "[version=2.0].[type=ABFooUnion].[type=union].[type=A].a.[type=string].f"),
+                new SchemaField()
+                    .setFieldPath("[version=2.0].[type=ABFooUnion].[type=union].[type=B].a"),
+                new SchemaField()
+                    .setFieldPath(
+                        "[version=2.0].[type=ABFooUnion].[type=union].[type=B].a.[type=string].f"),
+                new SchemaField()
+                    .setFieldPath(
+                        "[version=2.0].[type=ABFooUnion].[type=union].[type=array].[type=array].[type=Foo].a"),
+                new SchemaField()
+                    .setFieldPath(
+                        "[version=2.0].[type=ABFooUnion].[type=union].[type=array].[type=array].[type=Foo].a.[type=long].f"))));
+
+    assertEquals(
+        SchemaFieldUtils.getSchemaFieldAliases(
+            TEST_DATASET_URN, testSchema, new SchemaField().setFieldPath("customer_id")),
+        Set.of(
+            UrnUtils.getUrn(
+                "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),customer_id)")),
+        "Expected only the target v1 schemaField and no aliases");
+
+    assertEquals(
+        SchemaFieldUtils.getSchemaFieldAliases(
+            TEST_DATASET_URN,
+            testSchema,
+            new SchemaField().setFieldPath("[version=2.0].[type=ABFooUnion].[type=union].a")),
+        Set.of(
+            UrnUtils.getUrn(
+                "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),[version=2.0].[type=ABFooUnion].[type=union].a)"),
+            UrnUtils.getUrn(
+                "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),a)"),
+            UrnUtils.getUrn(
+                "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),[version=2.0].[type=ABFooUnion].[type=union].[type=A].a)"),
+            UrnUtils.getUrn(
+                "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),[version=2.0].[type=ABFooUnion].[type=union].[type=B].a)"),
+            UrnUtils.getUrn(
+                "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),[version=2.0].[type=ABFooUnion].[type=union].[type=array].[type=array].[type=Foo].a)")),
+        "Expected one v1 alias and 3 collisions. Excluding target");
+
+    assertEquals(
+        SchemaFieldUtils.getSchemaFieldAliases(
+            TEST_DATASET_URN,
+            testSchema,
+            new SchemaField()
+                .setFieldPath(
+                    "[version=2.0].[type=ABFooUnion].[type=union].[type=array].[type=array].[type=Foo].a.[type=long].f")),
+        Set.of(
+            UrnUtils.getUrn(
+                "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),[version=2.0].[type=ABFooUnion].[type=union].[type=array].[type=array].[type=Foo].a.[type=long].f)"),
+            UrnUtils.getUrn(
+                "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),a.f)"),
+            UrnUtils.getUrn(
+                "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),[version=2.0].[type=ABFooUnion].[type=union].[type=A].a.[type=string].f)"),
+            UrnUtils.getUrn(
+                "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD),[version=2.0].[type=ABFooUnion].[type=union].[type=B].a.[type=string].f)")),
+        "Expected one v1 alias and 2 collisions. Excluding target");
+
+    assertEquals(
+        SchemaFieldUtils.getSchemaFieldAliases(
+            TEST_DATASET_URN,
+            testSchema,
+            new SchemaField()
+                .setFieldPath(
+                    "[version=2.0].[type=ABFooUnion].[type=union].[type=array].[type=array].[type=Foo].a.[type=long].z")),
+        Set.of(),
+        "Expected no aliases since target field is not present.");
+  }
+}
diff --git a/metadata-utils/src/test/java/com/linkedin/metadata/utils/elasticsearch/IndexConventionImplTest.java b/metadata-utils/src/test/java/com/linkedin/metadata/utils/elasticsearch/IndexConventionImplTest.java
index 8074f344cd2441..8768c44c70a82d 100644
--- a/metadata-utils/src/test/java/com/linkedin/metadata/utils/elasticsearch/IndexConventionImplTest.java
+++ b/metadata-utils/src/test/java/com/linkedin/metadata/utils/elasticsearch/IndexConventionImplTest.java
@@ -1,8 +1,11 @@
 package com.linkedin.metadata.utils.elasticsearch;
 
+import static org.apache.commons.codec.digest.DigestUtils.sha256Hex;
 import static org.testng.Assert.*;
 
+import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.util.Pair;
+import java.net.URLEncoder;
 import java.util.Optional;
 import org.testng.annotations.Test;
 
@@ -10,7 +13,7 @@ public class IndexConventionImplTest {
 
   @Test
   public void testIndexConventionNoPrefix() {
-    IndexConvention indexConventionNoPrefix = IndexConventionImpl.NO_PREFIX;
+    IndexConvention indexConventionNoPrefix = IndexConventionImpl.noPrefix("MD5");
     String entityName = "dataset";
     String expectedIndexName = "datasetindex_v2";
     assertEquals(indexConventionNoPrefix.getEntityIndexName(entityName), expectedIndexName);
@@ -25,7 +28,12 @@ public void testIndexConventionNoPrefix() {
 
   @Test
   public void testIndexConventionPrefix() {
-    IndexConvention indexConventionPrefix = new IndexConventionImpl("prefix");
+    IndexConvention indexConventionPrefix =
+        new IndexConventionImpl(
+            IndexConventionImpl.IndexConventionConfig.builder()
+                .prefix("prefix")
+                .hashIdAlgo("MD5")
+                .build());
     String entityName = "dataset";
     String expectedIndexName = "prefix_datasetindex_v2";
     assertEquals(indexConventionPrefix.getEntityIndexName(entityName), expectedIndexName);
@@ -42,7 +50,7 @@ public void testIndexConventionPrefix() {
 
   @Test
   public void testTimeseriesIndexConventionNoPrefix() {
-    IndexConvention indexConventionNoPrefix = IndexConventionImpl.NO_PREFIX;
+    IndexConvention indexConventionNoPrefix = IndexConventionImpl.noPrefix("MD5");
     String entityName = "dataset";
     String aspectName = "datasetusagestatistics";
     String expectedIndexName = "dataset_datasetusagestatisticsaspect_v1";
@@ -64,7 +72,12 @@ public void testTimeseriesIndexConventionNoPrefix() {
 
   @Test
   public void testTimeseriesIndexConventionPrefix() {
-    IndexConvention indexConventionPrefix = new IndexConventionImpl("prefix");
+    IndexConvention indexConventionPrefix =
+        new IndexConventionImpl(
+            IndexConventionImpl.IndexConventionConfig.builder()
+                .prefix("prefix")
+                .hashIdAlgo("MD5")
+                .build());
     String entityName = "dataset";
     String aspectName = "datasetusagestatistics";
     String expectedIndexName = "prefix_dataset_datasetusagestatisticsaspect_v1";
@@ -81,4 +94,24 @@ public void testTimeseriesIndexConventionPrefix() {
         indexConventionPrefix.getEntityAndAspectName("prefix_datasetusagestatisticsaspect_v1"),
         Optional.empty());
   }
+
+  @Test
+  public void testSchemaFieldDocumentId() {
+    assertEquals(
+        new IndexConventionImpl(
+                IndexConventionImpl.IndexConventionConfig.builder()
+                    .prefix("")
+                    .hashIdAlgo("")
+                    .schemaFieldDocIdHashEnabled(true)
+                    .build())
+            .getEntityDocumentId(
+                UrnUtils.getUrn(
+                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,economic_data.factor_income,PROD),year)")),
+        URLEncoder.encode(
+            String.format(
+                "urn:li:schemaField:(%s,%s)",
+                sha256Hex(
+                    "urn:li:dataset:(urn:li:dataPlatform:snowflake,economic_data.factor_income,PROD)"),
+                sha256Hex("year"))));
+  }
 }
diff --git a/settings.gradle b/settings.gradle
index b850816ab5e6b7..fa1fdb9f1a67ce 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -61,7 +61,9 @@ include 'metadata-integration:java:openlineage-converter'
 include 'metadata-integration:java:acryl-spark-lineage'
 include 'ingestion-scheduler'
 include 'metadata-ingestion-modules:airflow-plugin'
+include 'metadata-ingestion-modules:gx-plugin'
 include 'metadata-ingestion-modules:dagster-plugin'
+include 'metadata-ingestion-modules:prefect-plugin'
 include 'smoke-test'
 include 'metadata-auth:auth-api'
 include 'metadata-service:schema-registry-api'
diff --git a/smoke-test/build.gradle b/smoke-test/build.gradle
index 9800cf65fc4529..eb9ab7dec8f6cc 100644
--- a/smoke-test/build.gradle
+++ b/smoke-test/build.gradle
@@ -44,12 +44,19 @@ task yarnInstall(type: YarnTask) {
   environment = ['NODE_OPTIONS': '--openssl-legacy-provider']
   args = ['install', '--cwd', "${project.rootDir}/smoke-test/tests/cypress"]
 }
+
 task cypressLint(type: YarnTask, dependsOn: yarnInstall) {
   environment = ['NODE_OPTIONS': '--openssl-legacy-provider']
   // TODO: Run a full lint instead of just format.
   args = ['--cwd', "${project.rootDir}/smoke-test/tests/cypress", 'run', 'format']
 }
 
+task cypressLintFix(type: YarnTask, dependsOn: yarnInstall) {
+  environment = ['NODE_OPTIONS': '--openssl-legacy-provider']
+  // TODO: Run a full lint instead of just format.
+  args = ['--cwd', "${project.rootDir}/smoke-test/tests/cypress", 'run', 'format', '--write']
+}
+
 task installDev(type: Exec) {
     inputs.file file('pyproject.toml')
     inputs.file file('requirements.txt')
@@ -57,7 +64,7 @@ task installDev(type: Exec) {
     commandLine 'bash', '-c',
         "set -x && " +
         "${python_executable} -m venv ${venv_name} && " +
-        "${venv_name}/bin/python -m pip install --upgrade pip uv wheel setuptools && " +
+        "${venv_name}/bin/python -m pip install --upgrade uv && " +
         "set +x && source ${venv_name}/bin/activate && set -x && " +
         "uv pip install -r requirements.txt && " +
         "touch ${venv_name}/.build_install_dev_sentinel"
@@ -86,8 +93,6 @@ task pythonLintFix(type: Exec, dependsOn: installDev) {
  */
 task noCypressSuite0(type: Exec, dependsOn: [installDev, ':metadata-ingestion:installDev']) {
     environment 'RUN_QUICKSTART', 'false'
-    environment 'DATAHUB_KAFKA_SCHEMA_REGISTRY_URL', 'http://localhost:8080/schema-registry/api/'
-    environment 'KAFKA_BROKER_CONTAINER', 'datahub-kafka-broker-1'
     environment 'TEST_STRATEGY', 'no_cypress_suite0'
 
     workingDir = project.projectDir
@@ -98,8 +103,6 @@ task noCypressSuite0(type: Exec, dependsOn: [installDev, ':metadata-ingestion:in
 
 task noCypressSuite1(type: Exec, dependsOn: [installDev, ':metadata-ingestion:installDev']) {
     environment 'RUN_QUICKSTART', 'false'
-    environment 'DATAHUB_KAFKA_SCHEMA_REGISTRY_URL', 'http://localhost:8080/schema-registry/api/'
-    environment 'KAFKA_BROKER_CONTAINER', 'datahub-kafka-broker-1'
     environment 'TEST_STRATEGY', 'no_cypress_suite1'
 
     workingDir = project.projectDir
@@ -110,8 +113,6 @@ task noCypressSuite1(type: Exec, dependsOn: [installDev, ':metadata-ingestion:in
 
 task cypressSuite1(type: Exec, dependsOn: [installDev, ':metadata-ingestion:installDev']) {
     environment 'RUN_QUICKSTART', 'false'
-    environment 'DATAHUB_KAFKA_SCHEMA_REGISTRY_URL', 'http://localhost:8080/schema-registry/api/'
-    environment 'KAFKA_BROKER_CONTAINER', 'datahub-kafka-broker-1'
     environment 'TEST_STRATEGY', 'cypress_suite1'
 
     workingDir = project.projectDir
@@ -122,8 +123,6 @@ task cypressSuite1(type: Exec, dependsOn: [installDev, ':metadata-ingestion:inst
 
 task cypressRest(type: Exec, dependsOn: [installDev, ':metadata-ingestion:installDev']) {
     environment 'RUN_QUICKSTART', 'false'
-    environment 'DATAHUB_KAFKA_SCHEMA_REGISTRY_URL', 'http://localhost:8080/schema-registry/api/'
-    environment 'KAFKA_BROKER_CONTAINER', 'datahub-kafka-broker-1'
     environment 'TEST_STRATEGY', 'cypress_rest'
 
     workingDir = project.projectDir
@@ -137,8 +136,6 @@ task cypressRest(type: Exec, dependsOn: [installDev, ':metadata-ingestion:instal
  */
 task cypressDev(type: Exec, dependsOn: [installDev, ':metadata-ingestion:installDev']) {
     environment 'RUN_QUICKSTART', 'false'
-    environment 'DATAHUB_KAFKA_SCHEMA_REGISTRY_URL', 'http://localhost:8080/schema-registry/api/'
-    environment 'KAFKA_BROKER_CONTAINER', 'datahub-kafka-broker-1'
 
     workingDir = project.projectDir
     commandLine 'bash', '-c',
@@ -151,12 +148,18 @@ task cypressDev(type: Exec, dependsOn: [installDev, ':metadata-ingestion:install
  */
 task cypressData(type: Exec, dependsOn: [installDev, ':metadata-ingestion:installDev']) {
     environment 'RUN_QUICKSTART', 'false'
-    environment 'DATAHUB_KAFKA_SCHEMA_REGISTRY_URL', 'http://localhost:8080/schema-registry/api/'
-    environment 'KAFKA_BROKER_CONTAINER', 'datahub-kafka-broker-1'
     environment 'RUN_UI', 'false'
 
     workingDir = project.projectDir
     commandLine 'bash', '-c',
             "source ${venv_name}/bin/activate && set -x && " +
                     "./cypress-dev.sh"
-}
\ No newline at end of file
+}
+
+task lint {
+    dependsOn pythonLint, cypressLint
+}
+
+task lintFix {
+    dependsOn pythonLintFix
+}
diff --git a/smoke-test/cypress-dev.sh b/smoke-test/cypress-dev.sh
index 2b31c574d05787..bce2d794b18691 100755
--- a/smoke-test/cypress-dev.sh
+++ b/smoke-test/cypress-dev.sh
@@ -10,8 +10,9 @@ fi
 
 source venv/bin/activate
 
-export KAFKA_BROKER_CONTAINER="datahub-kafka-broker-1"
-export KAFKA_BOOTSTRAP_SERVER="broker:9092"
+# set environment variables for the test
+source ./set-test-env-vars.sh
+
 python -c 'from tests.cypress.integration_test import ingest_data; ingest_data()'
 
 cd tests/cypress
diff --git a/smoke-test/requirements.txt b/smoke-test/requirements.txt
index 861c69f354fe5b..c5294d95177cb9 100644
--- a/smoke-test/requirements.txt
+++ b/smoke-test/requirements.txt
@@ -18,3 +18,5 @@ types-requests>=2.28.11.6,<=2.31.0.3
 types-PyYAML
 # https://github.com/docker/docker-py/issues/3256
 requests<=2.31.0
+# Missing numpy requirement in 8.0.0
+deepdiff!=8.0.0
\ No newline at end of file
diff --git a/smoke-test/run-quickstart.sh b/smoke-test/run-quickstart.sh
index 05c321566d54a6..eb0d46b3172442 100755
--- a/smoke-test/run-quickstart.sh
+++ b/smoke-test/run-quickstart.sh
@@ -10,16 +10,17 @@ source venv/bin/activate
 mkdir -p ~/.datahub/plugins/frontend/auth/
 echo "test_user:test_pass" >> ~/.datahub/plugins/frontend/auth/user.props
 
+echo "DATAHUB_VERSION = $DATAHUB_VERSION"
 DATAHUB_SEARCH_IMAGE="${DATAHUB_SEARCH_IMAGE:=opensearchproject/opensearch}"
 DATAHUB_SEARCH_TAG="${DATAHUB_SEARCH_TAG:=2.9.0}"
 XPACK_SECURITY_ENABLED="${XPACK_SECURITY_ENABLED:=plugins.security.disabled=true}"
 ELASTICSEARCH_USE_SSL="${ELASTICSEARCH_USE_SSL:=false}"
 USE_AWS_ELASTICSEARCH="${USE_AWS_ELASTICSEARCH:=true}"
 
-echo "DATAHUB_VERSION = $DATAHUB_VERSION"
 DATAHUB_TELEMETRY_ENABLED=false  \
 DOCKER_COMPOSE_BASE="file://$( dirname "$DIR" )" \
 DATAHUB_SEARCH_IMAGE="$DATAHUB_SEARCH_IMAGE" DATAHUB_SEARCH_TAG="$DATAHUB_SEARCH_TAG" \
 XPACK_SECURITY_ENABLED="$XPACK_SECURITY_ENABLED" ELASTICSEARCH_USE_SSL="$ELASTICSEARCH_USE_SSL" \
 USE_AWS_ELASTICSEARCH="$USE_AWS_ELASTICSEARCH" \
-datahub docker quickstart --version ${DATAHUB_VERSION} --standalone_consumers --dump-logs-on-failure --kafka-setup
+DATAHUB_VERSION=${DATAHUB_VERSION}  \
+docker compose --project-directory ../docker/profiles	--profile quickstart-consumers up -d --quiet-pull --wait --wait-timeout 900
diff --git a/smoke-test/set-cypress-creds.sh b/smoke-test/set-cypress-creds.sh
index 82fe736b0a7e18..fc6e7dd42f5dea 100644
--- a/smoke-test/set-cypress-creds.sh
+++ b/smoke-test/set-cypress-creds.sh
@@ -2,4 +2,4 @@
 
 export CYPRESS_ADMIN_USERNAME=${ADMIN_USERNAME:-datahub}
 export CYPRESS_ADMIN_PASSWORD=${ADMIN_PASSWORD:-datahub}
-export CYPRESS_ADMIN_DISPLAYNAME=${ADMIN_DISPLAYNAME:-DataHub}
\ No newline at end of file
+export CYPRESS_ADMIN_DISPLAYNAME=${ADMIN_DISPLAYNAME:-DataHub}
diff --git a/smoke-test/set-test-env-vars.sh b/smoke-test/set-test-env-vars.sh
new file mode 100644
index 00000000000000..4668721f80de08
--- /dev/null
+++ b/smoke-test/set-test-env-vars.sh
@@ -0,0 +1,2 @@
+export DATAHUB_KAFKA_SCHEMA_REGISTRY_URL=http://localhost:8080/schema-registry/api
+export DATAHUB_GMS_URL=http://localhost:8080
\ No newline at end of file
diff --git a/smoke-test/smoke.sh b/smoke-test/smoke.sh
index db0389be1f4897..888a60f488e1fc 100755
--- a/smoke-test/smoke.sh
+++ b/smoke-test/smoke.sh
@@ -16,14 +16,24 @@ cd "$DIR"
 
 if [ "${RUN_QUICKSTART:-true}" == "true" ]; then
     source ./run-quickstart.sh
+else
+  mkdir -p ~/.datahub/plugins/frontend/auth/
+  echo "test_user:test_pass" >> ~/.datahub/plugins/frontend/auth/user.props
+  echo "datahub:datahub" > ~/.datahub/plugins/frontend/auth/user.props
+
+  python3 -m venv venv
+  source venv/bin/activate
+  python -m pip install --upgrade 'uv>=0.1.10'
+  uv pip install -r requirements.txt
 fi
 
-source venv/bin/activate
-
 (cd ..; ./gradlew :smoke-test:yarnInstall)
 
 source ./set-cypress-creds.sh
 
+# set environment variables for the test
+source ./set-test-env-vars.sh
+
 # no_cypress_suite0, no_cypress_suite1, cypress_suite1, cypress_rest
 if [[ -z "${TEST_STRATEGY}" ]]; then
     pytest -rP --durations=20 -vv --continue-on-collection-errors --junit-xml=junit.smoke.xml
diff --git a/smoke-test/test_e2e.py b/smoke-test/test_e2e.py
index abb4841314c4af..74d64a8193173a 100644
--- a/smoke-test/test_e2e.py
+++ b/smoke-test/test_e2e.py
@@ -21,6 +21,7 @@
     get_frontend_session,
     get_admin_credentials,
     get_root_urn,
+    wait_for_writes_to_sync,
 )
 
 bootstrap_sample_data = "../metadata-ingestion/examples/mce_files/bootstrap_mce.json"
@@ -150,11 +151,13 @@ def _ensure_group_not_present(urn: str, frontend_session) -> Any:
 def test_ingestion_via_rest(wait_for_healthchecks):
     ingest_file_via_rest(bootstrap_sample_data)
     _ensure_user_present(urn=get_root_urn())
+    wait_for_writes_to_sync()
 
 
 @pytest.mark.dependency(depends=["test_healthchecks"])
 def test_ingestion_usage_via_rest(wait_for_healthchecks):
     ingest_file_via_rest(usage_sample_data)
+    wait_for_writes_to_sync()
 
 
 @pytest.mark.dependency(depends=["test_healthchecks"])
@@ -185,6 +188,7 @@ def test_ingestion_via_kafka(wait_for_healthchecks):
     # Since Kafka emission is asynchronous, we must wait a little bit so that
     # the changes are actually processed.
     time.sleep(kafka_post_ingestion_wait_sec)
+    wait_for_writes_to_sync()
 
 
 @pytest.mark.dependency(
@@ -196,6 +200,7 @@ def test_ingestion_via_kafka(wait_for_healthchecks):
 )
 def test_run_ingestion(wait_for_healthchecks):
     # Dummy test so that future ones can just depend on this one.
+    wait_for_writes_to_sync()
     pass
 
 
@@ -1384,7 +1389,9 @@ def test_native_user_endpoints(frontend_session):
     unauthenticated_get_invite_token_response = unauthenticated_session.post(
         f"{get_frontend_url()}/api/v2/graphql", json=get_invite_token_json
     )
-    assert unauthenticated_get_invite_token_response.status_code == HTTPStatus.UNAUTHORIZED
+    assert (
+        unauthenticated_get_invite_token_response.status_code == HTTPStatus.UNAUTHORIZED
+    )
 
     unauthenticated_create_reset_token_json = {
         "query": """mutation createNativeUserResetToken($input: CreateNativeUserResetTokenInput!) {\n
@@ -1399,7 +1406,10 @@ def test_native_user_endpoints(frontend_session):
         f"{get_frontend_url()}/api/v2/graphql",
         json=unauthenticated_create_reset_token_json,
     )
-    assert unauthenticated_create_reset_token_response.status_code == HTTPStatus.UNAUTHORIZED
+    assert (
+        unauthenticated_create_reset_token_response.status_code
+        == HTTPStatus.UNAUTHORIZED
+    )
 
     # cleanup steps
     json = {
diff --git a/smoke-test/tests/cli/delete_cmd/test_timeseries_delete.py b/smoke-test/tests/cli/delete_cmd/test_timeseries_delete.py
index cfbbacea1ed79e..438c063f11fa88 100644
--- a/smoke-test/tests/cli/delete_cmd/test_timeseries_delete.py
+++ b/smoke-test/tests/cli/delete_cmd/test_timeseries_delete.py
@@ -56,16 +56,20 @@ def datahub_get_and_verify_profile(
     sync_elastic()
     get_args: List[str] = ["get", "--urn", test_dataset_urn, "-a", test_aspect_name]
     get_result: Result = runner.invoke(datahub, get_args)
-    assert get_result.exit_code == 0
-    try:
-        get_result_output_obj: Dict = json.loads(get_result.stdout)
-    except JSONDecodeError as e:
-        print("Failed to decode: " + get_result.stdout, file=sys.stderr)
-        raise e
 
     if expected_profile is None:
-        assert not get_result_output_obj
+        assert get_result.exit_code != 0
+        assert (
+            test_dataset_urn in get_result.stderr and "not found" in get_result.stderr
+        ), f"Got stderr of {get_result.stderr} in get_and_verify_profile"
     else:
+        assert get_result.exit_code == 0
+        try:
+            get_result_output_obj: Dict = json.loads(get_result.stdout)
+        except JSONDecodeError as e:
+            print("Failed to decode: " + get_result.stdout, file=sys.stderr)
+            raise e
+
         profile_from_get = DatasetProfileClass.from_obj(
             get_result_output_obj["datasetProfile"]
         )
diff --git a/smoke-test/tests/consistency_utils.py b/smoke-test/tests/consistency_utils.py
index 4335e2a874c1e7..1eddc46bb220b7 100644
--- a/smoke-test/tests/consistency_utils.py
+++ b/smoke-test/tests/consistency_utils.py
@@ -8,14 +8,31 @@
 ELASTICSEARCH_REFRESH_INTERVAL_SECONDS: int = int(
     os.getenv("ELASTICSEARCH_REFRESH_INTERVAL_SECONDS", 5)
 )
-KAFKA_BROKER_CONTAINER: str = str(
-    os.getenv("KAFKA_BROKER_CONTAINER", "datahub-broker-1")
-)
 KAFKA_BOOTSTRAP_SERVER: str = str(os.getenv("KAFKA_BOOTSTRAP_SERVER", "broker:29092"))
 
 logger = logging.getLogger(__name__)
 
 
+def infer_kafka_broker_container() -> str:
+    cmd = "docker ps --format '{{.Names}}' | grep broker"
+    completed_process = subprocess.run(
+        cmd,
+        capture_output=True,
+        shell=True,
+        text=True,
+    )
+    result = str(completed_process.stdout)
+    lines = result.splitlines()
+    if len(lines) == 0:
+        raise ValueError("No Kafka broker containers found")
+    return lines[0]
+
+
+KAFKA_BROKER_CONTAINER: str = str(
+    os.getenv("KAFKA_BROKER_CONTAINER", infer_kafka_broker_container())
+)
+
+
 def wait_for_writes_to_sync(max_timeout_in_sec: int = 120) -> None:
     if USE_STATIC_SLEEP:
         time.sleep(ELASTICSEARCH_REFRESH_INTERVAL_SECONDS)
@@ -44,7 +61,9 @@ def wait_for_writes_to_sync(max_timeout_in_sec: int = 120) -> None:
             if maximum_lag == 0:
                 lag_zero = True
         except ValueError:
-            logger.warning(f"Error reading kafka lag using command: {cmd}")
+            logger.warning(
+                f"Error reading kafka lag using command: {cmd}", exc_info=True
+            )
 
     if not lag_zero:
         logger.warning(
diff --git a/smoke-test/tests/cypress/cypress/e2e/actions/docPropagation.js b/smoke-test/tests/cypress/cypress/e2e/actions/docPropagation.js
new file mode 100644
index 00000000000000..3d7e14195ab64f
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/actions/docPropagation.js
@@ -0,0 +1,27 @@
+const testId = '[data-testid="docPropagationIndicator"]';
+
+describe("docPropagation", () => {
+  it("logs in and navigates to the schema page and checks for docPropagationIndicator", () => {
+    cy.login();
+    cy.visit(
+      "/dataset/urn:li:dataset:(urn:li:dataPlatform:hive,fct_cypress_users_deleted,PROD)/Schema?is_lineage_mode=false&schemaFilter=",
+      "/dataset/urn:li:dataset:(urn:li:dataPlatform:hive,fct_cypress_users_deleted,PROD)/Schema?is_lineage_mode=false&schemaFilter=",
+    );
+
+    // verify that the indicator exists in the table
+    cy.get(testId).should("exist");
+
+    // click on the table row
+    cy.get('[data-row-key="user_id"]').click();
+
+    // verify that the indicator exists in id="entity-profile-sidebar"
+    cy.get('[id="entity-profile-sidebar"]')
+      .then(($sidebar) => {
+        if ($sidebar.find(testId).length) return testId;
+        return null;
+      })
+      .then((selector) => {
+        cy.get(selector).should("exist");
+      });
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/mutations/dataset_health.js b/smoke-test/tests/cypress/cypress/e2e/mutations/dataset_health.js
index 072574e0f57aad..62ffd8a69d1c84 100644
--- a/smoke-test/tests/cypress/cypress/e2e/mutations/dataset_health.js
+++ b/smoke-test/tests/cypress/cypress/e2e/mutations/dataset_health.js
@@ -7,8 +7,8 @@ describe("dataset health test", () => {
     cy.login();
     cy.goToDataset(urn, datasetName);
     // Ensure that the “Health” badge is present and there is an active incident warning
-    cy.get(`[href="/dataset/${urn}/Validation"]`).should("be.visible");
-    cy.get(`[href="/dataset/${urn}/Validation"] span`).trigger("mouseover", {
+    cy.get(`[href="/dataset/${urn}/Quality"]`).should("be.visible");
+    cy.get(`[href="/dataset/${urn}/Quality"] span`).trigger("mouseover", {
       force: true,
     });
     cy.waitTextVisible("This asset may be unhealthy");
diff --git a/smoke-test/tests/cypress/cypress/e2e/mutations/dataset_ownership.js b/smoke-test/tests/cypress/cypress/e2e/mutations/dataset_ownership.js
index 452e2eb3408d31..9c42d8395e543c 100644
--- a/smoke-test/tests/cypress/cypress/e2e/mutations/dataset_ownership.js
+++ b/smoke-test/tests/cypress/cypress/e2e/mutations/dataset_ownership.js
@@ -1,4 +1,4 @@
-const test_id = Math.floor(Math.random() * 100000);
+const test_id = crypto.getRandomValues(new Uint32Array(1))[0];
 const username = `Example Name ${test_id}`;
 const email = `example${test_id}@example.com`;
 const password = "Example password";
diff --git a/smoke-test/tests/cypress/cypress/e2e/mutations/ingestion_source.js b/smoke-test/tests/cypress/cypress/e2e/mutations/ingestion_source.js
index 8707f090acad36..9ed3ccdd26eeef 100644
--- a/smoke-test/tests/cypress/cypress/e2e/mutations/ingestion_source.js
+++ b/smoke-test/tests/cypress/cypress/e2e/mutations/ingestion_source.js
@@ -1,4 +1,4 @@
-const number = Math.floor(Math.random() * 100000);
+const number = crypto.getRandomValues(new Uint32Array(1))[0];
 const accound_id = `account${number}`;
 const warehouse_id = `warehouse${number}`;
 const username = `user${number}`;
@@ -13,7 +13,7 @@ describe("ingestion source creation flow", () => {
     cy.goToIngestionPage();
     cy.clickOptionWithId('[data-node-key="Sources"]');
     cy.clickOptionWithTestId("create-ingestion-source-button");
-    cy.clickOptionWithText("Snowflake");
+    cy.clickOptionWithTextToScrollintoView("Snowflake");
     cy.waitTextVisible("Snowflake Details");
     cy.get("#account_id").type(accound_id);
     cy.get("#warehouse").type(warehouse_id);
diff --git a/smoke-test/tests/cypress/cypress/e2e/mutations/managing_secrets.js b/smoke-test/tests/cypress/cypress/e2e/mutations/managing_secrets.js
index 6953fe04940520..d35ed883f58848 100644
--- a/smoke-test/tests/cypress/cypress/e2e/mutations/managing_secrets.js
+++ b/smoke-test/tests/cypress/cypress/e2e/mutations/managing_secrets.js
@@ -1,4 +1,4 @@
-const number = Math.floor(Math.random() * 100000);
+const number = crypto.getRandomValues(new Uint32Array(1))[0];
 const accound_id = `account${number}`;
 const warehouse_id = `warehouse${number}`;
 const username = `user${number}`;
@@ -11,6 +11,7 @@ describe("managing secrets for ingestion creation", () => {
     // Navigate to the manage ingestion page → secrets
     cy.loginWithCredentials();
     cy.goToIngestionPage();
+    cy.clickOptionWithText("Secrets");
 
     // Create a new secret
     cy.clickOptionWithTestId("create-secret-button");
@@ -29,7 +30,7 @@ describe("managing secrets for ingestion creation", () => {
     cy.goToIngestionPage();
     cy.clickOptionWithId('[data-node-key="Sources"]');
     cy.get("#ingestion-create-source").click();
-    cy.clickOptionWithText("Snowflake");
+    cy.clickOptionWithTextToScrollintoView("Snowflake");
     cy.waitTextVisible("Snowflake Details");
     cy.get("#account_id").type(accound_id);
     cy.get("#warehouse").type(warehouse_id);
@@ -68,7 +69,7 @@ describe("managing secrets for ingestion creation", () => {
 
     // Verify secret is not present during ingestion source creation for password dropdown
     cy.clickOptionWithText("Create new source");
-    cy.clickOptionWithText("Snowflake");
+    cy.clickOptionWithTextToScrollintoView("Snowflake");
     cy.waitTextVisible("Snowflake Details");
     cy.get("#account_id").type(accound_id);
     cy.get("#warehouse").type(warehouse_id);
diff --git a/smoke-test/tests/cypress/cypress/e2e/settings/managing_groups.js b/smoke-test/tests/cypress/cypress/e2e/settings/managing_groups.js
index 247a9c8b9b2739..9a86f7e966e315 100644
--- a/smoke-test/tests/cypress/cypress/e2e/settings/managing_groups.js
+++ b/smoke-test/tests/cypress/cypress/e2e/settings/managing_groups.js
@@ -1,4 +1,4 @@
-const test_id = Math.floor(Math.random() * 100000);
+const test_id = crypto.getRandomValues(new Uint32Array(1))[0];
 const username = `Example Name ${test_id}`;
 const email = `example${test_id}@example.com`;
 const password = "Example password";
diff --git a/smoke-test/tests/cypress/data.json b/smoke-test/tests/cypress/data.json
index 5253b7a33b085f..ce61f7c83a0389 100644
--- a/smoke-test/tests/cypress/data.json
+++ b/smoke-test/tests/cypress/data.json
@@ -96,7 +96,11 @@
                   },
                   "nativeDataType": "varchar(100)",
                   "globalTags": {
-                    "tags": [{ "tag": "urn:li:tag:NeedsDocumentation" }]
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:NeedsDocumentation"
+                      }
+                    ]
                   },
                   "recursive": false
                 },
@@ -137,7 +141,11 @@
           },
           {
             "com.linkedin.pegasus2avro.common.GlobalTags": {
-              "tags": [{ "tag": "urn:li:tag:Cypress" }]
+              "tags": [
+                {
+                  "tag": "urn:li:tag:Cypress"
+                }
+              ]
             }
           }
         ]
@@ -246,7 +254,13 @@
               "editableSchemaFieldInfo": [
                 {
                   "fieldPath": "shipment_info",
-                  "globalTags": { "tags": [{ "tag": "urn:li:tag:Legacy" }] },
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Legacy"
+                      }
+                    ]
+                  },
                   "glossaryTerms": {
                     "terms": [
                       {
@@ -401,8 +415,12 @@
           {
             "com.linkedin.pegasus2avro.common.GlobalTags": {
               "tags": [
-                { "tag": "urn:li:tag:Cypress" },
-                { "tag": "urn:li:tag:Cypress2" }
+                {
+                  "tag": "urn:li:tag:Cypress"
+                },
+                {
+                  "tag": "urn:li:tag:Cypress2"
+                }
               ]
             }
           }
@@ -542,7 +560,11 @@
           },
           {
             "com.linkedin.pegasus2avro.common.GlobalTags": {
-              "tags": [{ "tag": "urn:li:tag:Cypress" }]
+              "tags": [
+                {
+                  "tag": "urn:li:tag:Cypress"
+                }
+              ]
             }
           }
         ]
@@ -718,7 +740,11 @@
           },
           {
             "com.linkedin.pegasus2avro.common.GlobalTags": {
-              "tags": [{ "tag": "urn:li:tag:Cypress" }]
+              "tags": [
+                {
+                  "tag": "urn:li:tag:Cypress"
+                }
+              ]
             }
           }
         ]
@@ -1011,7 +1037,11 @@
           },
           {
             "com.linkedin.pegasus2avro.common.GlobalTags": {
-              "tags": [{ "tag": "urn:li:tag:Cypress" }]
+              "tags": [
+                {
+                  "tag": "urn:li:tag:Cypress"
+                }
+              ]
             }
           }
         ]
@@ -1229,7 +1259,11 @@
           },
           {
             "com.linkedin.pegasus2avro.common.GlobalTags": {
-              "tags": [{ "tag": "urn:li:tag:Cypress" }]
+              "tags": [
+                {
+                  "tag": "urn:li:tag:Cypress"
+                }
+              ]
             }
           }
         ]
@@ -1279,7 +1313,11 @@
           },
           {
             "com.linkedin.pegasus2avro.common.GlobalTags": {
-              "tags": [{ "tag": "urn:li:tag:Cypress" }]
+              "tags": [
+                {
+                  "tag": "urn:li:tag:Cypress"
+                }
+              ]
             }
           }
         ]
@@ -1332,7 +1370,11 @@
           },
           {
             "com.linkedin.pegasus2avro.common.GlobalTags": {
-              "tags": [{ "tag": "urn:li:tag:Cypress" }]
+              "tags": [
+                {
+                  "tag": "urn:li:tag:Cypress"
+                }
+              ]
             }
           }
         ]
@@ -1371,7 +1413,11 @@
           },
           {
             "com.linkedin.pegasus2avro.common.GlobalTags": {
-              "tags": [{ "tag": "urn:li:tag:Cypress" }]
+              "tags": [
+                {
+                  "tag": "urn:li:tag:Cypress"
+                }
+              ]
             }
           }
         ]
@@ -1413,7 +1459,11 @@
           },
           {
             "com.linkedin.pegasus2avro.common.GlobalTags": {
-              "tags": [{ "tag": "urn:li:tag:Cypress" }]
+              "tags": [
+                {
+                  "tag": "urn:li:tag:Cypress"
+                }
+              ]
             }
           }
         ]
@@ -1459,7 +1509,11 @@
           },
           {
             "com.linkedin.pegasus2avro.common.GlobalTags": {
-              "tags": [{ "tag": "urn:li:tag:Cypress" }]
+              "tags": [
+                {
+                  "tag": "urn:li:tag:Cypress"
+                }
+              ]
             }
           }
         ]
@@ -1521,7 +1575,11 @@
           },
           {
             "com.linkedin.pegasus2avro.common.GlobalTags": {
-              "tags": [{ "tag": "urn:li:tag:Cypress" }]
+              "tags": [
+                {
+                  "tag": "urn:li:tag:Cypress"
+                }
+              ]
             }
           }
         ]
@@ -1758,7 +1816,11 @@
           },
           {
             "com.linkedin.pegasus2avro.common.GlobalTags": {
-              "tags": [{ "tag": "urn:li:tag:CypressFeatureTag" }]
+              "tags": [
+                {
+                  "tag": "urn:li:tag:CypressFeatureTag"
+                }
+              ]
             }
           }
         ]
@@ -1785,7 +1847,11 @@
           },
           {
             "com.linkedin.pegasus2avro.common.GlobalTags": {
-              "tags": [{ "tag": "urn:li:tag:CypressPrimaryKeyTag" }]
+              "tags": [
+                {
+                  "tag": "urn:li:tag:CypressPrimaryKeyTag"
+                }
+              ]
             }
           }
         ]
@@ -2137,5 +2203,17 @@
       "contentType": "application/json"
     },
     "systemMetadata": null
+  },
+  {
+    "auditHeader": null,
+    "entityType": "schemaField",
+    "entityUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_cypress_users_deleted,PROD),user_id)",
+    "changeType": "UPSERT",
+    "aspectName": "documentation",
+    "aspect": {
+      "value": "{\"documentations\":[{\"attribution\":{\"actor\":\"urn:li:corpuser:__datahub_system\",\"source\":\"urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_cypress_users_created,PROD),user_id)\",\"sourceDetail\":{\"actor\":\"urn:li:corpuser:shirshanka@acryl.io\",\"origin\":\"urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_cypress_users_created,PROD),user_id)\",\"propagated\":\"true\"},\"time\":1721422917808},\"documentation\":\"Unique identifier of user profile.\"}]}",
+      "contentType": "application/json"
+    },
+    "systemMetadata": null
   }
 ]
diff --git a/smoke-test/tests/openapi/README.md b/smoke-test/tests/openapi/README.md
new file mode 100644
index 00000000000000..68e2a75a6509b9
--- /dev/null
+++ b/smoke-test/tests/openapi/README.md
@@ -0,0 +1,33 @@
+
+# Goal
+
+This test is configuration driven by json files which contain request/response sequences intended to
+detect unexpected regressions between releases.
+
+Files can be executed in parallel but each request within the file is sequential.
+
+## Adding a test
+
+Create a file for a given OpenAPI version which contains a list of request/response pairs in the following
+format.
+
+The request json object is translated into the python request arguments and the response object is the
+expected status code and optional body.
+
+```json
+[
+  {
+    "request": {
+      "urn": "",
+      "description": "",
+      "method": "",
+      "json": {}
+    },
+    "response": {
+      "status_codes": [200],
+      "exclude_regex_paths": [],
+      "json": {}
+    }
+  }
+]
+```
\ No newline at end of file
diff --git a/smoke-test/tests/openapi/__init__.py b/smoke-test/tests/openapi/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/smoke-test/tests/openapi/test_openapi.py b/smoke-test/tests/openapi/test_openapi.py
new file mode 100644
index 00000000000000..20398e0e581685
--- /dev/null
+++ b/smoke-test/tests/openapi/test_openapi.py
@@ -0,0 +1,113 @@
+import concurrent.futures
+import glob
+import json
+import logging
+
+import pytest
+from deepdiff import DeepDiff
+
+import requests_wrapper as requests
+from tests.utils import get_gms_url
+
+logger = logging.getLogger(__name__)
+
+
+@pytest.mark.dependency()
+def test_healthchecks(wait_for_healthchecks):
+    # Call to wait_for_healthchecks fixture will do the actual functionality.
+    pass
+
+
+def load_tests(fixture_glob="tests/openapi/**/*.json"):
+    for test_fixture in glob.glob(fixture_glob):
+        with open(test_fixture) as f:
+            yield (test_fixture, json.load(f))
+
+
+def execute_request(request):
+    session = requests.Session()
+    if "method" in request:
+        method = request.pop("method")
+    else:
+        method = "post"
+
+    url = get_gms_url() + request.pop("url")
+
+    return getattr(session, method)(url, **request)
+
+
+def evaluate_test(test_name, test_data):
+    try:
+        for idx, req_resp in enumerate(test_data):
+            if "description" in req_resp["request"]:
+                description = req_resp["request"].pop("description")
+            else:
+                description = None
+            url = req_resp["request"]["url"]
+            actual_resp = execute_request(req_resp["request"])
+            try:
+                if "response" in req_resp and "status_codes" in req_resp["response"]:
+                    assert (
+                        actual_resp.status_code in req_resp["response"]["status_codes"]
+                    )
+                else:
+                    assert actual_resp.status_code in [200, 202, 204]
+                if "response" in req_resp:
+                    if "json" in req_resp["response"]:
+                        if "exclude_regex_paths" in req_resp["response"]:
+                            exclude_regex_paths = req_resp["response"][
+                                "exclude_regex_paths"
+                            ]
+                        else:
+                            exclude_regex_paths = []
+                        diff = DeepDiff(
+                            actual_resp.json(),
+                            req_resp["response"]["json"],
+                            exclude_regex_paths=exclude_regex_paths,
+                            ignore_order=True,
+                        )
+                        assert not diff
+                    else:
+                        logger.warning("No expected response json found")
+            except Exception as e:
+                logger.error(
+                    f"Error executing step: {idx}, url: {url}, test: {test_name}"
+                )
+                if description:
+                    logger.error(f"Step {idx} Description: {description}")
+                logger.error(f"Response content: {actual_resp.content}")
+                raise e
+    except Exception as e:
+        logger.error(f"Error executing test: {test_name}")
+        raise e
+
+
+def run_tests(fixture_globs, num_workers=3):
+    with concurrent.futures.ThreadPoolExecutor(max_workers=num_workers) as executor:
+        futures = []
+        for fixture_glob in fixture_globs:
+            for test_fixture, test_data in load_tests(fixture_glob=fixture_glob):
+                futures.append(executor.submit(evaluate_test, test_fixture, test_data))
+
+        for future in concurrent.futures.as_completed(futures):
+            logger.info(future.result())
+
+
+@pytest.mark.dependency(depends=["test_healthchecks"])
+def test_openapi_all():
+    run_tests(fixture_globs=["tests/openapi/*/*.json"], num_workers=10)
+
+
+# @pytest.mark.dependency(depends=["test_healthchecks"])
+# def test_openapi_v1():
+#     run_tests(fixture_glob="tests/openapi/v1/*.json", num_workers=4)
+#
+#
+# @pytest.mark.dependency(depends=["test_healthchecks"])
+# def test_openapi_v2():
+#     run_tests(fixture_glob="tests/openapi/v2/*.json", num_workers=4)
+#
+#
+# @pytest.mark.dependency(depends=["test_healthchecks"])
+# def test_openapi_v3():
+#     run_tests(fixture_glob="tests/openapi/v3/*.json", num_workers=4)
diff --git a/smoke-test/tests/openapi/v1/__init__.py b/smoke-test/tests/openapi/v1/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/smoke-test/tests/openapi/v1/timeline.json b/smoke-test/tests/openapi/v1/timeline.json
new file mode 100644
index 00000000000000..36459d1b9e8243
--- /dev/null
+++ b/smoke-test/tests/openapi/v1/timeline.json
@@ -0,0 +1,526 @@
+[
+  {
+    "request": {
+      "url": "/openapi/v2/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetTimelineV1%2CPROD%29",
+      "description": "Remove test dataset",
+      "method": "delete"
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v2/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetTimelineV1%2CPROD%29/schemaMetadata?createIfNotExists=false",
+      "description": "Schema version 1",
+      "json": {
+        "schemaName": "db1.nested_struct_test",
+        "platform": "urn:li:dataPlatform:hive",
+        "version": 0,
+        "created": {
+          "time": 0,
+          "actor": "urn:li:corpuser:unknown",
+          "impersonator": "urn:li:corpuser:jdoe"
+        },
+        "lastModified": {
+          "time": 0,
+          "actor": "urn:li:corpuser:unknown",
+          "impersonator": "urn:li:corpuser:jdoe"
+        },
+        "hash": "",
+        "platformSchema": {
+          "com.linkedin.schema.MySqlDDL": {
+            "tableSchema": ""
+          }
+        },
+        "fields": [
+          {
+            "fieldPath": "property_id",
+            "type": {
+              "type": {
+                "com.linkedin.schema.NumberType": {}
+              }
+            },
+            "nativeDataType": "int",
+            "recursive": false,
+            "isPartOfKey": false
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.RecordType": {}
+              }
+            },
+            "nativeDataType": "struct<type:string,provider:struct<name:varchar(50),id:tinyint>>",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"struct<type:string,provider:struct<name:varchar(50),id:tinyint>>\"}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=string].type",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.StringType": {}
+              }
+            },
+            "nativeDataType": "string",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.RecordType": {}
+              }
+            },
+            "nativeDataType": "struct<name:varchar(50),id:tinyint>",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"struct<name:varchar(50),id:tinyint>\"}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=string].name",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.StringType": {}
+              }
+            },
+            "nativeDataType": "varchar(50)",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"varchar(50)\", \"_nullable\": true}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id",
+            "nullable": true,
+            "description": "Service provider id",
+            "type": {
+              "type": {
+                "com.linkedin.schema.NumberType": {}
+              }
+            },
+            "nativeDataType": "tinyint",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"tinyint\", \"_nullable\": true}"
+          }
+        ]
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v2/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetTimelineV1%2CPROD%29/schemaMetadata?createIfNotExists=false",
+      "description": "Schema version 2",
+      "json": {
+        "schemaName": "db1.nested_struct_test",
+        "platform": "urn:li:dataPlatform:hive",
+        "version": 0,
+        "created": {
+          "time": 0,
+          "actor": "urn:li:corpuser:unknown",
+          "impersonator": "urn:li:corpuser:jdoe"
+        },
+        "lastModified": {
+          "time": 0,
+          "actor": "urn:li:corpuser:unknown",
+          "impersonator": "urn:li:corpuser:jdoe"
+        },
+        "hash": "",
+        "platformSchema": {
+          "com.linkedin.schema.MySqlDDL": {
+            "tableSchema": ""
+          }
+        },
+        "fields": [
+          {
+            "fieldPath": "property_id",
+            "type": {
+              "type": {
+                "com.linkedin.schema.NumberType": {}
+              }
+            },
+            "nativeDataType": "int",
+            "recursive": false,
+            "isPartOfKey": false
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.RecordType": {}
+              }
+            },
+            "nativeDataType": "struct<type:string,provider:struct<name:varchar(50),id:tinyint>>",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"struct<type:string,provider:struct<name:varchar(50),id:tinyint>>\"}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=string].type",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.StringType": {}
+              }
+            },
+            "nativeDataType": "string",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.RecordType": {}
+              }
+            },
+            "nativeDataType": "struct<name:varchar(50),id:tinyint>",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"struct<name:varchar(50),id:tinyint>\"}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id3",
+            "description": "Service provider name",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.NumberType": {}
+              }
+            },
+            "nativeDataType": "tinyint",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"tinyint\", \"_nullable\": true}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id2",
+            "nullable": true,
+            "description": "Service provider id",
+            "type": {
+              "type": {
+                "com.linkedin.schema.NumberType": {}
+              }
+            },
+            "nativeDataType": "tinyint",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"tinyint\", \"_nullable\": true}"
+          }
+        ]
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v2/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetTimelineV1%2CPROD%29/schemaMetadata?createIfNotExists=false",
+      "description": "Schema version 3",
+      "json": {
+        "schemaName": "db1.nested_struct_test",
+        "platform": "urn:li:dataPlatform:hive",
+        "version": 0,
+        "created": {
+          "time": 0,
+          "actor": "urn:li:corpuser:unknown",
+          "impersonator": "urn:li:corpuser:jdoe"
+        },
+        "lastModified": {
+          "time": 0,
+          "actor": "urn:li:corpuser:unknown",
+          "impersonator": "urn:li:corpuser:jdoe"
+        },
+        "hash": "",
+        "platformSchema": {
+          "com.linkedin.schema.MySqlDDL": {
+            "tableSchema": ""
+          }
+        },
+        "fields": [
+          {
+            "fieldPath": "property_id",
+            "type": {
+              "type": {
+                "com.linkedin.schema.NumberType": {}
+              }
+            },
+            "nativeDataType": "int",
+            "recursive": false,
+            "isPartOfKey": false
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.RecordType": {}
+              }
+            },
+            "nativeDataType": "struct<type:string,provider:struct<name:varchar(50),id:tinyint>>",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"struct<type:string,provider:struct<name:varchar(50),id:tinyint>>\"}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=string].type",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.StringType": {}
+              }
+            },
+            "nativeDataType": "string",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.RecordType": {}
+              }
+            },
+            "nativeDataType": "struct<name:varchar(50),id:tinyint>",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"struct<name:varchar(50),id:tinyint>\"}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=string].name",
+            "description": "Service provider name",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.StringType": {}
+              }
+            },
+            "nativeDataType": "varchar(50)",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"varchar(50)\", \"_nullable\": true}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id",
+            "nullable": true,
+            "description": "Service provider id",
+            "type": {
+              "type": {
+                "com.linkedin.schema.NumberType": {}
+              }
+            },
+            "nativeDataType": "tinyint",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"tinyint\", \"_nullable\": true}"
+          }
+        ]
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/timeline/v1/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetTimelineV1%2CPROD%29?startTime=-1&endTime=0&raw=false&categories=TECHNICAL_SCHEMA",
+      "method": "get",
+      "description": "Get timeline response"
+    },
+    "response": {
+      "exclude_regex_paths": [
+        "root\\[.+?\\]\\['timestamp'\\]"
+      ],
+      "json": [
+        {
+          "timestamp": 1723245258298,
+          "actor": "urn:li:corpuser:__datahub_system",
+          "semVer": "0.0.0-computed",
+          "semVerChange": "MINOR",
+          "changeEvents": [
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'service'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.type)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=string].type",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.type)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'service.type'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'service.provider'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.id)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.id)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'service.provider.id'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.name)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=string].name",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.name)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'service.provider.name'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),property_id)",
+              "parameters": {
+                "fieldPath": "property_id",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),property_id)",
+                "nullable": false
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'property_id'."
+            }
+          ],
+          "versionStamp": "browsePathsV2:0;dataPlatformInstance:0;datasetKey:0;schemaMetadata:1"
+        },
+        {
+          "timestamp": 1723245269788,
+          "actor": "urn:li:corpuser:__datahub_system",
+          "semVer": "1.0.0-computed",
+          "semVerChange": "MAJOR",
+          "changeEvents": [
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "MODIFY",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.id)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.id)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to renaming of the field 'service.provider.id to service.provider.id2'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.id3)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id3",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.id3)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'service.provider.id3'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "REMOVE",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.name)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=string].name",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.name)",
+                "nullable": true
+              },
+              "semVerChange": "MAJOR",
+              "description": "A backwards incompatible change due to removal of field: 'service.provider.name'."
+            }
+          ],
+          "versionStamp": "browsePathsV2:0;dataPlatformInstance:0;datasetKey:0;schemaMetadata:2"
+        },
+        {
+          "timestamp": 1723245279320,
+          "actor": "urn:li:corpuser:__datahub_system",
+          "semVer": "2.0.0-computed",
+          "semVerChange": "MAJOR",
+          "changeEvents": [
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "MODIFY",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.id2)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id2",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.id2)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to renaming of the field 'service.provider.id2 to service.provider.id'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "REMOVE",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.id3)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id3",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.id3)",
+                "nullable": true
+              },
+              "semVerChange": "MAJOR",
+              "description": "A backwards incompatible change due to removal of field: 'service.provider.id3'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.name)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=string].name",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV1,PROD),service.provider.name)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'service.provider.name'."
+            }
+          ],
+          "versionStamp": "browsePathsV2:0;dataPlatformInstance:0;datasetKey:0;schemaMetadata:0"
+        }
+      ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/smoke-test/tests/openapi/v2/__init__.py b/smoke-test/tests/openapi/v2/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/smoke-test/tests/openapi/v2/structured_properties.json b/smoke-test/tests/openapi/v2/structured_properties.json
new file mode 100644
index 00000000000000..7eb67ffc8c320c
--- /dev/null
+++ b/smoke-test/tests/openapi/v2/structured_properties.json
@@ -0,0 +1,332 @@
+[
+  {
+    "request": {
+      "url": "/openapi/v2/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetStructPropV2%2CPROD%29",
+      "description": "Remove test dataset",
+      "method": "delete"
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v2/entity/structuredProperty/urn%3Ali%3AstructuredProperty%3Aio.acryl.privacy.v2.retentionTime",
+      "description": "Remove test structured property",
+      "method": "delete"
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v2/entity/structuredProperty/urn%3Ali%3AstructuredProperty%3Aio.acryl.privacy.v2.retentionTime02",
+      "description": "Remove test structured property #2",
+      "method": "delete"
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v2/entity/structuredProperty/urn%3Ali%3AstructuredProperty%3Aio.acryl.privacy.v2.retentionTime/propertyDefinition",
+      "description": "Create structured property definition",
+      "params": {
+        "createIfNotExists": "false"
+      },
+      "json": {
+        "qualifiedName": "io.acryl.privacy.v2.retentionTime",
+        "valueType": "urn:li:dataType:datahub.number",
+        "description": "Retention Time is used to figure out how long to retain records in a dataset",
+        "displayName": "Retention Time",
+        "cardinality": "MULTIPLE",
+        "entityTypes": [
+          "urn:li:entityType:datahub.dataset",
+          "urn:li:entityType:datahub.dataFlow"
+        ],
+        "allowedValues": [
+          {
+            "value": {
+              "double": 30
+            },
+            "description": "30 days, usually reserved for datasets that are ephemeral and contain pii"
+          },
+          {
+            "value": {
+              "double": 60
+            },
+            "description": "Use this for datasets that drive monthly reporting but contain pii"
+          },
+          {
+            "value": {
+              "double": 365
+            },
+            "description": "Use this for non-sensitive data that can be retained for longer"
+          }
+        ]
+      }
+    },
+    "response": {
+      "json": {
+        "urn": "urn:li:structuredProperty:io.acryl.privacy.v2.retentionTime",
+        "aspects": {
+          "propertyDefinition": {
+            "value": {
+              "allowedValues": [
+                {
+                  "value": {
+                    "double": 30.0
+                  },
+                  "description": "30 days, usually reserved for datasets that are ephemeral and contain pii"
+                },
+                {
+                  "value": {
+                    "double": 60.0
+                  },
+                  "description": "Use this for datasets that drive monthly reporting but contain pii"
+                },
+                {
+                  "value": {
+                    "double": 365.0
+                  },
+                  "description": "Use this for non-sensitive data that can be retained for longer"
+                }
+              ],
+              "qualifiedName": "io.acryl.privacy.v2.retentionTime",
+              "displayName": "Retention Time",
+              "valueType": "urn:li:dataType:datahub.number",
+              "description": "Retention Time is used to figure out how long to retain records in a dataset",
+              "entityTypes": [
+                "urn:li:entityType:datahub.dataset",
+                "urn:li:entityType:datahub.dataFlow"
+              ],
+              "cardinality": "MULTIPLE"
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v2/entity/dataset?createIfNotExists=false&createEntityIfNotExists=false",
+      "description": "Create dataset",
+      "json": [
+        {
+          "urn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetStructPropV2,PROD)",
+          "aspects": {
+            "status": {
+              "value": {
+                "removed": false
+              }
+            }
+          }
+        }
+      ]
+    },
+    "response": {
+      "json": [
+        {
+          "urn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetStructPropV2,PROD)"
+        }
+      ]
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v2/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetStructPropV2%2CPROD%29/structuredProperties?createIfNotExists=false",
+      "description": "Add structured property to dataset",
+      "json": {
+        "properties": [
+          {
+            "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.v2.retentionTime",
+            "values": [
+              {
+                "double": 60.0
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "response": {
+      "json": {
+        "urn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetStructPropV2,PROD)",
+        "aspects": {
+          "structuredProperties": {
+            "value": {
+              "properties": [
+                {
+                  "values": [
+                    {
+                      "double": 60.0
+                    }
+                  ],
+                  "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.v2.retentionTime"
+                }
+              ]
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v2/entity/structuredProperty/urn%3Ali%3AstructuredProperty%3Aio.acryl.privacy.v2.retentionTime02/propertyDefinition?createIfNotExists=false",
+      "description": "Create structured property definition #2",
+      "params": {
+        "createIfNotExists": "false"
+      },
+      "json": {
+        "qualifiedName": "io.acryl.privacy.v2.retentionTime02",
+        "displayName": "Retention Time 02",
+        "valueType": "urn:li:dataType:datahub.string",
+        "allowedValues": [
+          {
+            "value": {
+              "string": "foo2"
+            },
+            "description": "test foo2 value"
+          },
+          {
+            "value": {
+              "string": "bar2"
+            },
+            "description": "test bar2 value"
+          }
+        ],
+        "cardinality": "SINGLE",
+        "entityTypes": [
+          "urn:li:entityType:datahub.dataset"
+        ]
+      }
+    },
+    "response": {
+      "json": {
+        "urn": "urn:li:structuredProperty:io.acryl.privacy.v2.retentionTime02",
+        "aspects": {
+          "propertyDefinition": {
+            "value": {
+              "allowedValues": [
+                {
+                  "description": "test foo2 value",
+                  "value": {
+                    "string": "foo2"
+                  }
+                },
+                {
+                  "description": "test bar2 value",
+                  "value": {
+                    "string": "bar2"
+                  }
+                }
+              ],
+              "entityTypes": [
+                "urn:li:entityType:datahub.dataset"
+              ],
+              "cardinality": "SINGLE",
+              "displayName": "Retention Time 02",
+              "qualifiedName": "io.acryl.privacy.v2.retentionTime02",
+              "valueType": "urn:li:dataType:datahub.string"
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v2/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetStructPropV2%2CPROD%29/structuredProperties",
+      "description": "Patch ADD structured property",
+      "method": "patch",
+      "json": {
+        "patch": [
+          {
+            "op": "add",
+            "path": "/properties/urn:li:structuredProperty:io.acryl.privacy.v2.retentionTime02",
+            "value": {
+              "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.v2.retentionTime02",
+              "values": [
+                {
+                  "string": "bar2"
+                }
+              ]
+            }
+          }
+        ],
+        "arrayPrimaryKeys": {
+          "properties": [
+            "propertyUrn"
+          ]
+        }
+      }
+    },
+    "response": {
+      "json": {
+        "urn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetStructPropV2,PROD)",
+        "aspects": {
+          "structuredProperties": {
+            "value": {
+              "properties": [
+                {
+                  "values": [
+                    {
+                      "double": 60.0
+                    }
+                  ],
+                  "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.v2.retentionTime"
+                },
+                {
+                  "values": [
+                    {
+                      "string": "bar2"
+                    }
+                  ],
+                  "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.v2.retentionTime02"
+                }
+              ]
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v2/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetStructPropV2%2CPROD%29/structuredProperties",
+      "description": "Patch REMOVE structured property",
+      "method": "patch",
+      "json": {
+        "patch": [
+          {
+            "op": "remove",
+            "path": "/properties/urn:li:structuredProperty:io.acryl.privacy.v2.retentionTime02",
+            "value": {
+              "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.v2.retentionTime02"
+            }
+          }
+        ],
+        "arrayPrimaryKeys": {
+          "properties": [
+            "propertyUrn"
+          ]
+        }
+      }
+    },
+    "response": {
+      "json": {
+        "urn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetStructPropV2,PROD)",
+        "aspects": {
+          "structuredProperties": {
+            "value": {
+              "properties": [
+                {
+                  "values": [
+                    {
+                      "double": 60.0
+                    }
+                  ],
+                  "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.v2.retentionTime"
+                }
+              ]
+            }
+          }
+        }
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/smoke-test/tests/openapi/v2/timeline.json b/smoke-test/tests/openapi/v2/timeline.json
new file mode 100644
index 00000000000000..ceee67b39a6d0f
--- /dev/null
+++ b/smoke-test/tests/openapi/v2/timeline.json
@@ -0,0 +1,526 @@
+[
+  {
+    "request": {
+      "url": "/openapi/v2/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetTimelineV2%2CPROD%29",
+      "description": "Remove test dataset",
+      "method": "delete"
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v2/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetTimelineV2%2CPROD%29/schemaMetadata?createIfNotExists=false",
+      "description": "Schema version 1",
+      "json": {
+        "schemaName": "db1.nested_struct_test",
+        "platform": "urn:li:dataPlatform:hive",
+        "version": 0,
+        "created": {
+          "time": 0,
+          "actor": "urn:li:corpuser:unknown",
+          "impersonator": "urn:li:corpuser:jdoe"
+        },
+        "lastModified": {
+          "time": 0,
+          "actor": "urn:li:corpuser:unknown",
+          "impersonator": "urn:li:corpuser:jdoe"
+        },
+        "hash": "",
+        "platformSchema": {
+          "com.linkedin.schema.MySqlDDL": {
+            "tableSchema": ""
+          }
+        },
+        "fields": [
+          {
+            "fieldPath": "property_id",
+            "type": {
+              "type": {
+                "com.linkedin.schema.NumberType": {}
+              }
+            },
+            "nativeDataType": "int",
+            "recursive": false,
+            "isPartOfKey": false
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.RecordType": {}
+              }
+            },
+            "nativeDataType": "struct<type:string,provider:struct<name:varchar(50),id:tinyint>>",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"struct<type:string,provider:struct<name:varchar(50),id:tinyint>>\"}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=string].type",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.StringType": {}
+              }
+            },
+            "nativeDataType": "string",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.RecordType": {}
+              }
+            },
+            "nativeDataType": "struct<name:varchar(50),id:tinyint>",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"struct<name:varchar(50),id:tinyint>\"}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=string].name",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.StringType": {}
+              }
+            },
+            "nativeDataType": "varchar(50)",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"varchar(50)\", \"_nullable\": true}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id",
+            "nullable": true,
+            "description": "Service provider id",
+            "type": {
+              "type": {
+                "com.linkedin.schema.NumberType": {}
+              }
+            },
+            "nativeDataType": "tinyint",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"tinyint\", \"_nullable\": true}"
+          }
+        ]
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v2/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetTimelineV2%2CPROD%29/schemaMetadata?createIfNotExists=false",
+      "description": "Schema version 2",
+      "json": {
+        "schemaName": "db1.nested_struct_test",
+        "platform": "urn:li:dataPlatform:hive",
+        "version": 0,
+        "created": {
+          "time": 0,
+          "actor": "urn:li:corpuser:unknown",
+          "impersonator": "urn:li:corpuser:jdoe"
+        },
+        "lastModified": {
+          "time": 0,
+          "actor": "urn:li:corpuser:unknown",
+          "impersonator": "urn:li:corpuser:jdoe"
+        },
+        "hash": "",
+        "platformSchema": {
+          "com.linkedin.schema.MySqlDDL": {
+            "tableSchema": ""
+          }
+        },
+        "fields": [
+          {
+            "fieldPath": "property_id",
+            "type": {
+              "type": {
+                "com.linkedin.schema.NumberType": {}
+              }
+            },
+            "nativeDataType": "int",
+            "recursive": false,
+            "isPartOfKey": false
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.RecordType": {}
+              }
+            },
+            "nativeDataType": "struct<type:string,provider:struct<name:varchar(50),id:tinyint>>",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"struct<type:string,provider:struct<name:varchar(50),id:tinyint>>\"}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=string].type",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.StringType": {}
+              }
+            },
+            "nativeDataType": "string",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.RecordType": {}
+              }
+            },
+            "nativeDataType": "struct<name:varchar(50),id:tinyint>",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"struct<name:varchar(50),id:tinyint>\"}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id3",
+            "description": "Service provider name",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.NumberType": {}
+              }
+            },
+            "nativeDataType": "tinyint",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"tinyint\", \"_nullable\": true}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id2",
+            "nullable": true,
+            "description": "Service provider id",
+            "type": {
+              "type": {
+                "com.linkedin.schema.NumberType": {}
+              }
+            },
+            "nativeDataType": "tinyint",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"tinyint\", \"_nullable\": true}"
+          }
+        ]
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v2/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetTimelineV2%2CPROD%29/schemaMetadata?createIfNotExists=false",
+      "description": "Schema version 3",
+      "json": {
+        "schemaName": "db1.nested_struct_test",
+        "platform": "urn:li:dataPlatform:hive",
+        "version": 0,
+        "created": {
+          "time": 0,
+          "actor": "urn:li:corpuser:unknown",
+          "impersonator": "urn:li:corpuser:jdoe"
+        },
+        "lastModified": {
+          "time": 0,
+          "actor": "urn:li:corpuser:unknown",
+          "impersonator": "urn:li:corpuser:jdoe"
+        },
+        "hash": "",
+        "platformSchema": {
+          "com.linkedin.schema.MySqlDDL": {
+            "tableSchema": ""
+          }
+        },
+        "fields": [
+          {
+            "fieldPath": "property_id",
+            "type": {
+              "type": {
+                "com.linkedin.schema.NumberType": {}
+              }
+            },
+            "nativeDataType": "int",
+            "recursive": false,
+            "isPartOfKey": false
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.RecordType": {}
+              }
+            },
+            "nativeDataType": "struct<type:string,provider:struct<name:varchar(50),id:tinyint>>",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"struct<type:string,provider:struct<name:varchar(50),id:tinyint>>\"}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=string].type",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.StringType": {}
+              }
+            },
+            "nativeDataType": "string",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"string\", \"_nullable\": true}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.RecordType": {}
+              }
+            },
+            "nativeDataType": "struct<name:varchar(50),id:tinyint>",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"struct<name:varchar(50),id:tinyint>\"}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=string].name",
+            "description": "Service provider name",
+            "nullable": true,
+            "type": {
+              "type": {
+                "com.linkedin.schema.StringType": {}
+              }
+            },
+            "nativeDataType": "varchar(50)",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"varchar(50)\", \"_nullable\": true}"
+          },
+          {
+            "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id",
+            "nullable": true,
+            "description": "Service provider id",
+            "type": {
+              "type": {
+                "com.linkedin.schema.NumberType": {}
+              }
+            },
+            "nativeDataType": "tinyint",
+            "recursive": false,
+            "isPartOfKey": false,
+            "jsonProps": "{\"native_data_type\": \"tinyint\", \"_nullable\": true}"
+          }
+        ]
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v2/timeline/v1/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetTimelineV2%2CPROD%29?startTime=-1&endTime=0&raw=false&categories=TECHNICAL_SCHEMA",
+      "method": "get",
+      "description": "Get timeline response"
+    },
+    "response": {
+      "exclude_regex_paths": [
+        "root\\[.+?\\]\\['timestamp'\\]"
+      ],
+      "json": [
+        {
+          "timestamp": 1723245258298,
+          "actor": "urn:li:corpuser:__datahub_system",
+          "semVer": "0.0.0-computed",
+          "semVerChange": "MINOR",
+          "changeEvents": [
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'service'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.type)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=string].type",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.type)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'service.type'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'service.provider'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.id)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.id)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'service.provider.id'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.name)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=string].name",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.name)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'service.provider.name'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),property_id)",
+              "parameters": {
+                "fieldPath": "property_id",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),property_id)",
+                "nullable": false
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'property_id'."
+            }
+          ],
+          "versionStamp": "browsePathsV2:0;dataPlatformInstance:0;datasetKey:0;schemaMetadata:1"
+        },
+        {
+          "timestamp": 1723245269788,
+          "actor": "urn:li:corpuser:__datahub_system",
+          "semVer": "1.0.0-computed",
+          "semVerChange": "MAJOR",
+          "changeEvents": [
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "MODIFY",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.id)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.id)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to renaming of the field 'service.provider.id to service.provider.id2'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.id3)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id3",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.id3)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'service.provider.id3'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "REMOVE",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.name)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=string].name",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.name)",
+                "nullable": true
+              },
+              "semVerChange": "MAJOR",
+              "description": "A backwards incompatible change due to removal of field: 'service.provider.name'."
+            }
+          ],
+          "versionStamp": "browsePathsV2:0;dataPlatformInstance:0;datasetKey:0;schemaMetadata:2"
+        },
+        {
+          "timestamp": 1723245279320,
+          "actor": "urn:li:corpuser:__datahub_system",
+          "semVer": "2.0.0-computed",
+          "semVerChange": "MAJOR",
+          "changeEvents": [
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "MODIFY",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.id2)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id2",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.id2)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to renaming of the field 'service.provider.id2 to service.provider.id'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "REMOVE",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.id3)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=int].id3",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.id3)",
+                "nullable": true
+              },
+              "semVerChange": "MAJOR",
+              "description": "A backwards incompatible change due to removal of field: 'service.provider.id3'."
+            },
+            {
+              "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD)",
+              "category": "TECHNICAL_SCHEMA",
+              "operation": "ADD",
+              "modifier": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.name)",
+              "parameters": {
+                "fieldPath": "[version=2.0].[type=struct].[type=struct].service.[type=struct].provider.[type=string].name",
+                "fieldUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:test,datasetTimelineV2,PROD),service.provider.name)",
+                "nullable": true
+              },
+              "semVerChange": "MINOR",
+              "description": "A forwards & backwards compatible change due to the newly added field 'service.provider.name'."
+            }
+          ],
+          "versionStamp": "browsePathsV2:0;dataPlatformInstance:0;datasetKey:0;schemaMetadata:0"
+        }
+      ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/smoke-test/tests/openapi/v3/__init__.py b/smoke-test/tests/openapi/v3/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/smoke-test/tests/openapi/v3/structured_properties.json b/smoke-test/tests/openapi/v3/structured_properties.json
new file mode 100644
index 00000000000000..b000c5da0a2838
--- /dev/null
+++ b/smoke-test/tests/openapi/v3/structured_properties.json
@@ -0,0 +1,331 @@
+[
+  {
+    "request": {
+      "url": "/openapi/v3/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetStructPropV3%2CPROD%29",
+      "description": "Remove test dataset",
+      "method": "delete"
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v3/entity/structuredProperty/urn%3Ali%3AstructuredProperty%3Aio.acryl.privacy.v3.retentionTime",
+      "description": "Remove test structured property",
+      "method": "delete"
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v3/entity/structuredProperty/urn%3Ali%3AstructuredProperty%3Aio.acryl.privacy.v3.retentionTime02",
+      "description": "Remove test structured property #2",
+      "method": "delete"
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v3/entity/structuredProperty/urn%3Ali%3AstructuredProperty%3Aio.acryl.privacy.v3.retentionTime/propertyDefinition",
+      "description": "Create structured property definition",
+      "params": {
+        "createIfNotExists": "false"
+      },
+      "json": {
+        "value": {
+          "qualifiedName": "io.acryl.privacy.v3.retentionTime",
+          "valueType": "urn:li:dataType:datahub.number",
+          "description": "Retention Time is used to figure out how long to retain records in a dataset",
+          "displayName": "Retention Time",
+          "cardinality": "MULTIPLE",
+          "entityTypes": [
+            "urn:li:entityType:datahub.dataset",
+            "urn:li:entityType:datahub.dataFlow"
+          ],
+          "allowedValues": [
+            {
+              "value": {
+                "double": 30
+              },
+              "description": "30 days, usually reserved for datasets that are ephemeral and contain pii"
+            },
+            {
+              "value": {
+                "double": 60
+              },
+              "description": "Use this for datasets that drive monthly reporting but contain pii"
+            },
+            {
+              "value": {
+                "double": 365
+              },
+              "description": "Use this for non-sensitive data that can be retained for longer"
+            }
+          ]
+        }
+      }
+    },
+    "response": {
+      "json": {
+        "urn": "urn:li:structuredProperty:io.acryl.privacy.v3.retentionTime",
+        "propertyDefinition": {
+          "value": {
+            "allowedValues": [
+              {
+                "value": {
+                  "double": 30.0
+                },
+                "description": "30 days, usually reserved for datasets that are ephemeral and contain pii"
+              },
+              {
+                "value": {
+                  "double": 60.0
+                },
+                "description": "Use this for datasets that drive monthly reporting but contain pii"
+              },
+              {
+                "value": {
+                  "double": 365.0
+                },
+                "description": "Use this for non-sensitive data that can be retained for longer"
+              }
+            ],
+            "qualifiedName": "io.acryl.privacy.v3.retentionTime",
+            "displayName": "Retention Time",
+            "valueType": "urn:li:dataType:datahub.number",
+            "description": "Retention Time is used to figure out how long to retain records in a dataset",
+            "entityTypes": [
+              "urn:li:entityType:datahub.dataset",
+              "urn:li:entityType:datahub.dataFlow"
+            ],
+            "cardinality": "MULTIPLE"
+          }
+        }
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v3/entity/dataset?createIfNotExists=false&createEntityIfNotExists=false",
+      "description": "Create dataset",
+      "json": [
+        {
+          "urn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetStructPropV3,PROD)",
+          "status": {
+            "value": {
+              "removed": false
+            }
+          }
+        }
+      ]
+    },
+    "response": {
+      "json": [
+        {
+          "urn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetStructPropV3,PROD)",
+          "status": {
+            "value": {
+              "removed": false
+            }
+          }
+        }
+      ]
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v3/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetStructPropV3%2CPROD%29/structuredProperties?createIfNotExists=false",
+      "description": "Add structured property to dataset",
+      "json": {
+        "value": {
+          "properties": [
+            {
+              "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.v3.retentionTime",
+              "values": [
+                {
+                  "double": 60.0
+                }
+              ]
+            }
+          ]
+        }
+      }
+    },
+    "response": {
+      "json": {
+        "urn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetStructPropV3,PROD)",
+        "structuredProperties": {
+          "value": {
+            "properties": [
+              {
+                "values": [
+                  {
+                    "double": 60.0
+                  }
+                ],
+                "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.v3.retentionTime"
+              }
+            ]
+          }
+        }
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v3/entity/structuredProperty/urn%3Ali%3AstructuredProperty%3Aio.acryl.privacy.v3.retentionTime02/propertyDefinition?createIfNotExists=false",
+      "description": "Create structured property definition #2",
+      "params": {
+        "createIfNotExists": "false"
+      },
+      "json": {
+        "value": {
+          "qualifiedName": "io.acryl.privacy.v3.retentionTime02",
+          "displayName": "Retention Time 02",
+          "valueType": "urn:li:dataType:datahub.string",
+          "allowedValues": [
+            {
+              "value": {
+                "string": "foo2"
+              },
+              "description": "test foo2 value"
+            },
+            {
+              "value": {
+                "string": "bar2"
+              },
+              "description": "test bar2 value"
+            }
+          ],
+          "cardinality": "SINGLE",
+          "entityTypes": [
+            "urn:li:entityType:datahub.dataset"
+          ]
+        }
+      }
+    },
+    "response": {
+      "json": {
+        "urn": "urn:li:structuredProperty:io.acryl.privacy.v3.retentionTime02",
+        "propertyDefinition": {
+          "value": {
+            "allowedValues": [
+              {
+                "description": "test foo2 value",
+                "value": {
+                  "string": "foo2"
+                }
+              },
+              {
+                "description": "test bar2 value",
+                "value": {
+                  "string": "bar2"
+                }
+              }
+            ],
+            "entityTypes": [
+              "urn:li:entityType:datahub.dataset"
+            ],
+            "cardinality": "SINGLE",
+            "displayName": "Retention Time 02",
+            "qualifiedName": "io.acryl.privacy.v3.retentionTime02",
+            "valueType": "urn:li:dataType:datahub.string"
+          }
+        }
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v3/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetStructPropV3%2CPROD%29/structuredProperties",
+      "description": "Patch ADD structured property",
+      "method": "patch",
+      "json": {
+        "patch": [
+          {
+            "op": "add",
+            "path": "/properties/urn:li:structuredProperty:io.acryl.privacy.v3.retentionTime02",
+            "value": {
+              "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.v3.retentionTime02",
+              "values": [
+                {
+                  "string": "bar2"
+                }
+              ]
+            }
+          }
+        ],
+        "arrayPrimaryKeys": {
+          "properties": [
+            "propertyUrn"
+          ]
+        }
+      }
+    },
+    "response": {
+      "json": {
+        "urn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetStructPropV3,PROD)",
+        "structuredProperties": {
+          "value": {
+            "properties": [
+              {
+                "values": [
+                  {
+                    "double": 60.0
+                  }
+                ],
+                "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.v3.retentionTime"
+              },
+              {
+                "values": [
+                  {
+                    "string": "bar2"
+                  }
+                ],
+                "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.v3.retentionTime02"
+              }
+            ]
+          }
+        }
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v3/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CdatasetStructPropV3%2CPROD%29/structuredProperties",
+      "description": "Patch REMOVE structured property",
+      "method": "patch",
+      "json": {
+        "patch": [
+          {
+            "op": "remove",
+            "path": "/properties/urn:li:structuredProperty:io.acryl.privacy.v3.retentionTime02",
+            "value": {
+              "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.v3.retentionTime02"
+            }
+          }
+        ],
+        "arrayPrimaryKeys": {
+          "properties": [
+            "propertyUrn"
+          ]
+        }
+      }
+    },
+    "response": {
+      "json": {
+        "urn": "urn:li:dataset:(urn:li:dataPlatform:test,datasetStructPropV3,PROD)",
+        "structuredProperties": {
+          "value": {
+            "properties": [
+              {
+                "values": [
+                  {
+                    "double": 60.0
+                  }
+                ],
+                "propertyUrn": "urn:li:structuredProperty:io.acryl.privacy.v3.retentionTime"
+              }
+            ]
+          }
+        }
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/smoke-test/tests/privileges/test_privileges.py b/smoke-test/tests/privileges/test_privileges.py
index c9a0b621593148..bce7b8a238c385 100644
--- a/smoke-test/tests/privileges/test_privileges.py
+++ b/smoke-test/tests/privileges/test_privileges.py
@@ -4,11 +4,13 @@
 from tests.privileges.utils import (
     assign_role,
     assign_user_to_group,
+    clear_polices,
     create_group,
     create_user,
     create_user_policy,
     remove_group,
     remove_policy,
+    remove_secret,
     remove_user,
     set_base_platform_privileges_policy_status,
     set_view_dataset_sensitive_info_policy_status,
@@ -65,6 +67,12 @@ def privileges_and_test_user_setup(admin_session):
     # Remove test user
     remove_user(admin_session, "urn:li:corpuser:user")
 
+    # Remove secret
+    remove_secret(admin_session, "urn:li:dataHubSecret:TestSecretName")
+
+    # Remove test policies
+    clear_polices(admin_session)
+
     # Restore All users privileges
     set_base_platform_privileges_policy_status("ACTIVE", admin_session)
     set_view_dataset_sensitive_info_policy_status("ACTIVE", admin_session)
diff --git a/smoke-test/tests/privileges/utils.py b/smoke-test/tests/privileges/utils.py
index 1e58ec4085b703..72ad94a42a4627 100644
--- a/smoke-test/tests/privileges/utils.py
+++ b/smoke-test/tests/privileges/utils.py
@@ -246,8 +246,8 @@ def create_user_policy(user_urn, privileges, session):
         "variables": {
             "input": {
                 "type": "PLATFORM",
-                "name": "Policy Name",
-                "description": "Policy Description",
+                "name": "Test Policy Name",
+                "description": "Test Policy Description",
                 "state": "ACTIVE",
                 "resources": {"filter": {"criteria": []}},
                 "privileges": privileges,
@@ -288,3 +288,69 @@ def remove_policy(urn, session):
     assert res_data["data"]
     assert res_data["data"]["deletePolicy"]
     assert res_data["data"]["deletePolicy"] == urn
+
+
+def clear_polices(session):
+    list_policy_json = {
+        "query": """query listPolicies($input: ListPoliciesInput!) {
+                      listPolicies(input: $input) {
+                        start
+                        count
+                        total
+                        policies {
+                          urn
+                          editable
+                          name
+                          description
+                          __typename
+                        }
+                        __typename
+                      }
+                    }""",
+        "variables": {
+            "input": {
+                "count": 100,
+                "start": 0,
+                "orFilters": [
+                    {
+                        "and": [
+                            {
+                                "field": "state",
+                                "values": ["ACTIVE"],
+                                "condition": "EQUAL",
+                            },
+                            {
+                                "field": "editable",
+                                "values": ["true"],
+                                "condition": "EQUAL",
+                            },
+                        ]
+                    }
+                ],
+            }
+        },
+    }
+
+    response = session.post(
+        f"{get_frontend_url()}/api/v2/graphql", json=list_policy_json
+    )
+    response.raise_for_status()
+    res_data = response.json()
+
+    assert res_data
+    assert res_data["data"]
+    assert res_data["data"]["listPolicies"]
+    for policy in res_data["data"]["listPolicies"]["policies"]:
+        if "test" in policy["name"].lower() or "test" in policy["description"].lower():
+            remove_policy(policy["urn"], session)
+
+
+def remove_secret(session, urn):
+    remove_secret = {
+        "query": """mutation deleteSecret($urn: String!) {\n
+            deleteSecret(urn: $urn)\n}""",
+        "variables": {"urn": urn},
+    }
+
+    response = session.post(f"{get_frontend_url()}/api/v2/graphql", json=remove_secret)
+    response.raise_for_status()
diff --git a/smoke-test/tests/read_only/test_search.py b/smoke-test/tests/read_only/test_search.py
index 90385c5228bc1a..3b9635f3da2cd5 100644
--- a/smoke-test/tests/read_only/test_search.py
+++ b/smoke-test/tests/read_only/test_search.py
@@ -1,10 +1,13 @@
 import pytest
+import requests
 
 from tests.test_result_msg import add_datahub_stats
-from tests.utils import get_frontend_session, get_frontend_url
+from tests.utils import get_frontend_session, get_frontend_url, get_gms_url
 
-restli_default_headers = {
-    "X-RestLi-Protocol-Version": "2.0.0",
+BASE_URL_V3 = f"{get_gms_url()}/openapi/v3"
+
+default_headers = {
+    "Content-Type": "application/json",
 }
 
 ENTITY_TO_MAP = {
@@ -59,16 +62,8 @@ def _get_search_result(frontend_session, entity: str):
         ("chart", "chart"),
         ("dataset", "dataset"),
         ("dashboard", "dashboard"),
-        (
-            # Task
-            "dataJob",
-            "dataJob",
-        ),
-        (
-            # Pipeline
-            "dataFlow",
-            "dataFlow",
-        ),
+        ("dataJob", "dataJob"),
+        ("dataFlow", "dataFlow"),
         ("container", "container"),
         ("tag", "tag"),
         ("corpUser", "corpUser"),
@@ -78,11 +73,7 @@ def _get_search_result(frontend_session, entity: str):
         ("mlPrimaryKey", "mlPrimaryKey"),
         ("corpGroup", "corpGroup"),
         ("mlFeatureTable", "mlFeatureTable"),
-        (
-            # Term group
-            "glossaryNode",
-            "glossaryNode",
-        ),
+        ("glossaryNode", "glossaryNode"),
         ("mlModel", "mlModel"),
     ],
 )
@@ -112,8 +103,56 @@ def test_search_works(entity_type, api_name):
         """,
         "variables": {"input": first_urn},
     }
+
     response = frontend_session.post(f"{get_frontend_url()}/api/v2/graphql", json=json)
     response.raise_for_status()
     res_data = response.json()
     assert res_data["data"], f"res_data was {res_data}"
     assert res_data["data"][api_name]["urn"] == first_urn, f"res_data was {res_data}"
+
+
+@pytest.mark.read_only
+@pytest.mark.parametrize(
+    "entity_type",
+    [
+        "chart",
+        "dataset",
+        "dashboard",
+        "dataJob",
+        "dataFlow",
+        "container",
+        "tag",
+        "corpUser",
+        "mlFeature",
+        "glossaryTerm",
+        "domain",
+        "mlPrimaryKey",
+        "corpGroup",
+        "mlFeatureTable",
+        "glossaryNode",
+        "mlModel",
+    ],
+)
+def test_openapi_v3_entity(entity_type):
+    frontend_session = get_frontend_session()
+    search_result = _get_search_result(frontend_session, entity_type)
+    num_entities = search_result["total"]
+    if num_entities == 0:
+        print(f"[WARN] No results for {entity_type}")
+        return
+    entities = search_result["searchResults"]
+
+    first_urn = entities[0]["entity"]["urn"]
+
+    session = requests.Session()
+    url = f"{BASE_URL_V3}/entity/{entity_type}/{first_urn}"
+    response = session.get(url, headers=default_headers)
+    response.raise_for_status()
+    actual_data = response.json()
+    print(f"Entity Data for URN {first_urn}: {actual_data}")
+
+    expected_data = {"urn": first_urn}
+
+    assert (
+        actual_data["urn"] == expected_data["urn"]
+    ), f"Mismatch: expected {expected_data}, got {actual_data}"
diff --git a/smoke-test/tests/schema_fields/__init__.py b/smoke-test/tests/schema_fields/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/smoke-test/tests/schema_fields/queries/__init__.py b/smoke-test/tests/schema_fields/queries/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/smoke-test/tests/schema_fields/queries/get_chart_field.gql b/smoke-test/tests/schema_fields/queries/get_chart_field.gql
new file mode 100644
index 00000000000000..424e5ad686ab9c
--- /dev/null
+++ b/smoke-test/tests/schema_fields/queries/get_chart_field.gql
@@ -0,0 +1,20 @@
+query($urn:String!) {
+  chart(urn: $urn) {
+    inputFields {
+      fields {
+        schemaFieldUrn
+        schemaField {
+          schemaFieldEntity {
+            urn
+            fieldPath
+            documentation {
+              documentations {
+                documentation
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/smoke-test/tests/schema_fields/schema_evolution.py b/smoke-test/tests/schema_fields/schema_evolution.py
new file mode 100644
index 00000000000000..256ae3c29ac04d
--- /dev/null
+++ b/smoke-test/tests/schema_fields/schema_evolution.py
@@ -0,0 +1,230 @@
+import time
+from enum import Enum
+
+import datahub.metadata.schema_classes as models
+import pytest
+from datahub.cli.cli_utils import get_aspects_for_entity
+from datahub.emitter.mce_builder import make_dataset_urn, make_schema_field_urn
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.ingestion.graph.client import DataHubGraph, get_default_graph
+from tenacity import retry, stop_after_delay, wait_fixed
+
+from tests.utils import get_datahub_graph, ingest_file_via_rest, wait_for_writes_to_sync
+
+_MAX_DELAY_UNTIL_WRITES_VISIBLE_SECS = 30
+_ATTEMPT_RETRY_INTERVAL_SECS = 1
+large_dataset_urn = "urn:li:dataset:(urn:li:dataPlatform:looker,test-large-schema,PROD)"
+
+
+class FieldPathStyle(Enum):
+    FLAT = "FLAT"
+    NESTED = "NESTED"
+
+
+def _create_schema_with_fields(
+    entity_urn: str,
+    num_fields: int = 1,
+    field_path_style: FieldPathStyle = FieldPathStyle.FLAT,
+) -> models.SchemaMetadataClass:
+    """
+    A simple helper function to create a schema with a given number of fields.
+    The fields are created with the following naming convention:
+    - FLAT: field_0, field_1, field_2, ...
+    - NESTED: [version=2.0].[type=Address].parent_field.[type=string].field_0,
+    [version=2.0].[type=Address].parent_field.[type=string].field_1, ...
+
+    TODO: Add support for more complex field types and descriptions beyond
+    strings.
+    """
+
+    schema = models.SchemaMetadataClass(
+        schemaName="my_schema",
+        platformSchema=models.OtherSchemaClass(rawSchema=""),
+        platform="urn:li:dataPlatform:bigquery",
+        version=0,
+        hash="",
+        fields=[
+            models.SchemaFieldClass(
+                fieldPath=(
+                    f"field_{i}"
+                    if field_path_style == FieldPathStyle.FLAT
+                    else f"[version=2.0].[type=Address].parent_field.[type=string].field_{i}"
+                ),
+                nativeDataType="STRING",
+                type=models.SchemaFieldDataTypeClass(type=models.StringTypeClass()),
+                description="",
+                nullable=True,
+            )
+            for i in range(num_fields)
+        ],
+    )
+    assert schema.validate()
+    return schema
+
+
+@pytest.fixture(autouse=False)
+def test_setup():
+    """Fixture data"""
+    client = get_datahub_graph()
+    session = client._session
+    gms_host = client.config.server
+
+    ingest_file_via_rest(
+        "tests/schema_fields/schema_field_side_effect_data.json"
+    ).config.run_id
+
+    assert "schemaMetadata" in get_aspects_for_entity(
+        session,
+        gms_host,
+        entity_urn=large_dataset_urn,
+        aspects=["schemaMetadata"],
+        typed=False,
+    )
+
+    yield
+    # Deleting takes way too long for CI
+    #
+    # rollback_url = f"{gms_host}/runs?action=rollback"
+    # session.post(
+    #     rollback_url,
+    #     data=json.dumps(
+    #         {"runId": ingested_dataset_run_id, "dryRun": False, "hardDelete": True}
+    #     ),
+    # )
+    #
+    # wait_for_writes_to_sync()
+    #
+    # assert "schemaMetadata" not in get_aspects_for_entity(
+    #     entity_urn=large_dataset_urn, aspects=["schemaMetadata"], typed=False
+    # )
+
+
+@retry(
+    stop=stop_after_delay(_MAX_DELAY_UNTIL_WRITES_VISIBLE_SECS),
+    wait=wait_fixed(_ATTEMPT_RETRY_INTERVAL_SECS),
+    reraise=True,
+)
+def assert_schema_field_exists(graph: DataHubGraph, urn: str, field_path: str):
+    schema_field_urn = make_schema_field_urn(parent_urn=urn, field_path=field_path)
+    assert graph.exists(schema_field_urn)
+    status = graph.get_aspect(schema_field_urn, models.StatusClass)
+    assert status is None or status.removed is False
+
+
+@retry(
+    stop=stop_after_delay(_MAX_DELAY_UNTIL_WRITES_VISIBLE_SECS),
+    wait=wait_fixed(_ATTEMPT_RETRY_INTERVAL_SECS),
+    reraise=True,
+)
+def assert_schema_field_soft_deleted(graph: DataHubGraph, urn: str, field_path: str):
+    schema_field_urn = make_schema_field_urn(parent_urn=urn, field_path=field_path)
+    status = graph.get_aspect(schema_field_urn, models.StatusClass)
+    assert status and status.removed is True
+
+
+@pytest.mark.parametrize(
+    "field_path_style",
+    [
+        FieldPathStyle.NESTED,
+        FieldPathStyle.FLAT,
+    ],
+)
+def test_schema_evolution_field_dropped(field_path_style: FieldPathStyle):
+    """
+    Test that schema evolution works as expected
+    1. Create a schema with 2 fields
+    2. Sleep for 10 seconds
+    3. Update the schema to have 1 field
+    4. Sleep for 10 seconds
+    5. Assert that the field_1 is removed
+    """
+
+    now = int(time.time())
+
+    urn = make_dataset_urn("bigquery", f"my_dataset.my_table.{now}")
+    print(urn)
+    with get_default_graph() as graph:
+        schema_with_2_fields = _create_schema_with_fields(
+            urn, 2, field_path_style=field_path_style
+        )
+        field_names = [field.fieldPath for field in schema_with_2_fields.fields]
+        graph.emit(
+            MetadataChangeProposalWrapper(
+                entityUrn=urn,
+                aspect=schema_with_2_fields,
+            )
+        )
+
+        for field_name in field_names:
+            print("Checking field: ", field_name)
+            assert_schema_field_exists(graph, urn, field_name)
+
+        # Evolve the schema
+        schema_with_1_field = _create_schema_with_fields(
+            urn, 1, field_path_style=field_path_style
+        )
+        new_field_name = schema_with_1_field.fields[0].fieldPath
+
+        field_names.remove(new_field_name)
+        removed_field_name = field_names[0]
+
+        graph.emit(
+            MetadataChangeProposalWrapper(
+                entityUrn=urn,
+                aspect=schema_with_1_field,
+            )
+        )
+
+        assert_schema_field_exists(graph, urn, new_field_name)
+        assert_schema_field_soft_deleted(graph, urn, removed_field_name)
+
+
+def test_soft_deleted_entity():
+    """
+    Test that we if there is a soft deleted dataset, its schema fields are
+    initialized with soft deleted status
+    1. Create a schema with 2 fields
+    """
+
+    now = int(time.time())
+
+    urn = make_dataset_urn("bigquery", f"my_dataset.my_table.{now}")
+    print(urn)
+    with get_default_graph() as graph:
+        schema_with_2_fields = _create_schema_with_fields(urn, 2)
+        field_names = [field.fieldPath for field in schema_with_2_fields.fields]
+        graph.emit(
+            MetadataChangeProposalWrapper(
+                entityUrn=urn,
+                aspect=schema_with_2_fields,
+            )
+        )
+
+        for field_name in field_names:
+            print("Checking field: ", field_name)
+            assert_schema_field_exists(graph, urn, field_name)
+
+        # Soft delete the dataset
+        graph.emit(
+            MetadataChangeProposalWrapper(
+                entityUrn=urn,
+                aspect=models.StatusClass(removed=True),
+            )
+        )
+
+        # Check that the fields are soft deleted
+        for field_name in field_names:
+            assert_schema_field_soft_deleted(graph, urn, field_name)
+
+
+# Note: Does not execute deletes, too slow for CI
+@pytest.mark.dependency()
+def test_large_schema(test_setup):
+    wait_for_writes_to_sync()
+    with get_default_graph() as graph:
+        assert_schema_field_exists(graph, large_dataset_urn, "last_of.6800_cols")
+
+
+if __name__ == "__main__":
+    test_schema_evolution_field_dropped()
+    test_soft_deleted_entity()
diff --git a/smoke-test/tests/schema_fields/schema_field_side_effect_data.json b/smoke-test/tests/schema_fields/schema_field_side_effect_data.json
new file mode 100644
index 00000000000000..8d40a1df1be5dd
--- /dev/null
+++ b/smoke-test/tests/schema_fields/schema_field_side_effect_data.json
@@ -0,0 +1,153085 @@
+[
+  {
+    "auditHeader": null,
+    "proposedSnapshot": {
+      "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+        "urn": "urn:li:dataset:(urn:li:dataPlatform:looker,test-large-schema,PROD)",
+        "aspects": [
+          {
+            "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+              "primaryKeys": [],
+              "platformSchema": {
+                "com.linkedin.schema.OtherSchema": {
+                  "rawSchema": ""
+                }
+              },
+              "created": {
+                "actor": "urn:li:corpuser:unknown",
+                "time": 0
+              },
+              "lastModified": {
+                "actor": "urn:li:corpuser:unknown",
+                "time": 0
+              },
+              "fields": [
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_c_i_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_c_i_c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_c_i_c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_c_i_c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_c_i_c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_c_i_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_i_i_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_i_i_c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_i_i_c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_i_i_c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_i_i_c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_i_i_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_o_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_o_c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_o_c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_o_c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_o_c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_o_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_a_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_q_t_a_c_q_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.h_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.h_a_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.h_a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.h_a_l_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.h_a_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.h_a_w_l_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.h_b_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.h_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.h_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.h_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.h_s_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.h_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_h.e_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_h.c_f_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_a_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_a_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_i_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_i_c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_i_c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_i_c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_i_c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_i_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_i_i_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_i_i_c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_i_i_c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_i_i_c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_i_i_c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_i_i_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_t_a_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_r_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.l_c_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.l_c_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.m_c_w_3_d_o_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.m_d_a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.m_t_a_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.m_t_d_a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.o_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.s_c_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.s_c_i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.v_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.v_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.w_l_c_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.w_l_c_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.a_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.e_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.f_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.f_i_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.f_i_c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.f_i_c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.f_i_c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.f_i_c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.f_i_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.h_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_i_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_i_c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_i_c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_i_c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_i_c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_i_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_a_f.i_c_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_a_f.i_i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.n_o_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.o_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.p_i_z_d_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.p_z_d_c_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.p_z_d_t_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.t_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.t_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_a_f.t_o_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_a_f.c_a_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.c_s_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.e_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.e_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.i_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.i_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.i_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.l_m_i_f_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.m_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.o_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.s_c_i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.t_i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.t_o_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.z_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.a_m_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.a_q_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.c_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.c_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.f_s_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.m_e_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.m_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.u_c_q_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p._r",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.a_D_E_D_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.a_D_E_D_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.a_D_E_D_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.a_D_E_D_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.a_D_E_D_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.a_i_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.a_N",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.a_p_n_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.a_p_n_6",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.a_p_n_9",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.a_S_D",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.a_s_d_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.A_G_o_T",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.A_G_w_1_w_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.A_G_w_2_w_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.A_D_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.A_D_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.A_D_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.A_D_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.A_D_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.C_E_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.C_E_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.C_E_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.C_E_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.C_E_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.C_S_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.C_S_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.C_S_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.C_S_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.C_S_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.C_T",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.C_W",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.D_o_A_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.D_o_A_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.D_o_A_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.D_o_A_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.D_o_A_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.d_n_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.d_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.G_D_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.G_D_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.G_D_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.G_D_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.G_D_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.I_A",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.L",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.L",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.m_n_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_E_D_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_E_D_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_E_D_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_E_D_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_E_D_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_E_D_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_E_D_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_E_D_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_E_D_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_E_D_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_S_D_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_S_D_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_S_D_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_S_D_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_S_D_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.N_w_n_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_N_3_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_N_3_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_N_6_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_N_6_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_N_9_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_N_9_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_N_9_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_N_9_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_N_9_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.t_p_a_n_9",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.t_p_a_n_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.t_p_a_n_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.T_E",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.T_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.V",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.V_A",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.w_n_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.w_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.z_u_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.a_e",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.b",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.C_Q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.c_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.e_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.m_b",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.o_c_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.p_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.s_g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_a_a.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_a_a.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_a_a.a_t_a_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_a_a.a_t_a_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_a_a.a_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_a_a.a_t_a_i_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_a_a.a_t_a_i_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_a_a.a_t_a_i_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_a_a.a_t_a_i_y_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_a_a.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_e_q_d.b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_e_q_d.g_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_e_q_d.g_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_e_q_d.g_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_a_a.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_e_q_d.m_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_e_q_d.o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_e_q_d.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_e_q_d.q_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_e_q_d.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_e_q_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_a_a.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "1_i_a_a.u_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_a_a.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_a_a.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_a_a.a_t_a_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_a_a.a_t_a_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_a_a.a_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_a_a.a_t_a_i_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_a_a.a_t_a_i_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_a_a.a_t_a_i_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_a_a.a_t_a_i_y_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_a_a.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_e_q_d.b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_e_q_d.g_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_e_q_d.g_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_e_q_d.g_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_a_a.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_e_q_d.m_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_e_q_d.o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_e_q_d.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_e_q_d.q_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_e_q_d.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_e_q_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_a_a.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "2_s_a_a.u_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_a_a.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_a_a.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_a_a.a_t_a_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_a_a.a_t_a_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_a_a.a_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_a_a.a_t_a_i_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_a_a.a_t_a_i_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_a_a.a_t_a_i_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_a_a.a_t_a_i_y_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_a_a.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_e_q_d.b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_e_q_d.g_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_e_q_d.g_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_e_q_d.g_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_a_a.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_e_q_d.m_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_e_q_d.o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_e_q_d.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_e_q_d.q_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_e_q_d.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_e_q_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_a_a.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "3_t_a_a.u_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_a_a.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_a_a.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_a_a.a_t_a_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_a_a.a_t_a_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_a_a.a_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_a_a.a_t_a_i_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_a_a.a_t_a_i_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_a_a.a_t_a_i_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_a_a.a_t_a_i_y_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_a_a.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_e_q_d.b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_e_q_d.g_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_e_q_d.g_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_e_q_d.g_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_a_a.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_e_q_d.m_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_e_q_d.o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_e_q_d.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_e_q_d.q_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_e_q_d.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_e_q_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_a_a.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "4_f_a_a.u_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_a_a.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_a_a.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_a_a.a_t_a_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_a_a.a_t_a_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_a_a.a_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_a_a.a_t_a_i_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_a_a.a_t_a_i_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_a_a.a_t_a_i_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_a_a.a_t_a_i_y_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_a_a.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_e_q_d.b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_e_q_d.g_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_e_q_d.g_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_e_q_d.g_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_a_a.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_e_q_d.m_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_e_q_d.o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_e_q_d.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_e_q_d.q_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_e_q_d.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_e_q_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_a_a.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "5_f_a_a.u_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_a_a.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_a_a.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_a_a.a_t_a_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_a_a.a_t_a_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_a_a.a_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_a_a.a_t_a_i_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_a_a.a_t_a_i_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_a_a.a_t_a_i_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_a_a.a_t_a_i_y_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_a_a.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_e_q_d.b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_e_q_d.g_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_e_q_d.g_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_e_q_d.g_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_a_a.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_e_q_d.m_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_e_q_d.o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_e_q_d.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_e_q_d.q_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_e_q_d.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_e_q_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_a_a.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_a_a.u_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_a_a.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_a_a.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_a_a.a_t_a_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_a_a.a_t_a_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_a_a.a_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_a_a.a_t_a_i_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_a_a.a_t_a_i_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_a_a.a_t_a_i_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_a_a.a_t_a_i_y_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_a_a.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_q_d.b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_q_d.g_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_q_d.g_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_q_d.g_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_a_a.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_q_d.m_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_q_d.o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_q_d.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_q_d.q_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_q_d.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_q_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_a_a.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_a_a.u_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_a_a.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_a_a.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_a_a.a_t_a_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_a_a.a_t_a_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_a_a.a_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_a_a.a_t_a_i_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_a_a.a_t_a_i_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_a_a.a_t_a_i_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_a_a.a_t_a_i_y_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_a_a.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_q_d.b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_q_d.g_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_q_d.g_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_q_d.g_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_a_a.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_q_d.m_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_q_d.o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_q_d.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_q_d.q_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_q_d.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_q_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_a_a.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "8_n_e_a_a.u_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "9_p_e_q_d.b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "9_p_e_q_d.g_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "9_p_e_q_d.g_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "9_p_e_q_d.g_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "9_p_e_q_d.m_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "9_p_e_q_d.o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "9_p_e_q_d.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "9_p_e_q_d.q_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "9_p_e_q_d.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "9_p_e_q_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "9_p_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "9_p_e_q_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.g_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.g_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.g_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.m_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.q_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.a_t_a_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.a_t_a_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.a_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.a_t_a_i_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.a_t_a_i_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.a_t_a_i_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.a_t_a_i_y_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d.u_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.i_c_r_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.i_c_r_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_c.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_c.c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_c.c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_c.c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_c.c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_c.c_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_c.c_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_c.r",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_c.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_c.x",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.a_c_w_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.a_f_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.a_l_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m.q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.d_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.d_a_f_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.d_a_l_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.h_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.h_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.l_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.m_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.q_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.q_c_w_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.q_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.q_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.q_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.q_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.q_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.q_w_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.r_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.s_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.s_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.s_o_a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.t_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.t_p_t_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.t_q_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.z_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_o_c_s_i_f.c_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.i_v_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.i_v_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_m_i_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_u_a_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.p_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.p_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.p_s_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.r_s_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_c_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.s_g_s_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_o_c_s_i_f.t_i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_s_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_i_v_q.i_v_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_i_v_q.i_v_q_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_i_v_q.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_m_i.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_m_i.m_i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_m_i.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.f_c_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.f_c_c_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.f_c_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.f_c_c_r_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.f_c_c_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.f_c_c_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.f_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.l_c_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.l_c_c_r_b_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.l_c_c_r_b_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.l_c_c_r_b_c_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.l_c_c_r_b_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.l_c_c_r_b_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.l_c_c_r_b_c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.l_c_c_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.l_c_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.l_c_c_r_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.l_c_c_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.l_c_c_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.l_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.f_c_i_b_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.t_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.b_r_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.c_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.i_a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.i_e_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.i_e_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.i_e_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.i_e_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.i_e_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.i_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.i_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.i_s_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.i_s_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.i_s_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.m_g_c_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.m_g_v_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.m_m_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.m_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.s_e_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.s_e_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.s_e_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.s_e_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.s_e_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.s_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.s_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.s_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.s_s_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.s_s_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.s_s_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.s_s_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_i.a_d_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_i.c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_i.c_c_r_l_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_i.c_c_r_l_2",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_i.c_c_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_i.d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_i.d_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_i.d_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_i.r_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_i.r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_i.c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_i.C_S_L",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_i.s_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_i.z_t_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.a_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.a_p_l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.a_w_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.b_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.b_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.b_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.b_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_w_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_c_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_c_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_c_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_c_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_c_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_c_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.d_f_e_t_s_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.e_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.e_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.e_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.e_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.e_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_f_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_f_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_f_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_f_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_f_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_f_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_f_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_p_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_p_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_p_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_p_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_p_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_p_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_p_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_u_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_u_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_u_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_u_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_u_d_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_u_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_u_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.f_f_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.h_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.h_f_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.h_l_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.p_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.i_c_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.i_c_d_t_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.i_d_a_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.i_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_d_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_d_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_d_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_d_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_s_i_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_s_i_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_s_i_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_s_i_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_s_i_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_s_i_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_s_i_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_u_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_u_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_u_d_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_u_d_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_u_d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_u_d_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.l_u_d_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.m_h_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.m_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.m_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.m_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.m_f_f_u_t_u",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.p_f_o_b_f",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.p_p_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.r_a_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.r_b",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.r_b_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.s_o_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.s_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.s_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.s_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.s_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.t_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.u_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.u_a_m_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.u_a_m_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.u_a_m_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.u_a_m_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.u_a_m_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.u_a_m_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.u_a_m_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.u_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.u_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.u_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.u_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.u_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.u_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.i_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.a_i_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.i_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.i_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.l_c_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.p_i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.q_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_a_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_a_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_a_u_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_q_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_q_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_q_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_q_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_q_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_q_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_q_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_q_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_f_q_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_f_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_a_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_a_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_q_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_q_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_q_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_q_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_q_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_q_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_q_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_q_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t_i_q_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_f.c_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_f.e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_f.r_e_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_f.t_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c._e_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c._e_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c._e_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c._e_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c._l_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c._l_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c._l_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c._l_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.a_m_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.a_m_n_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.a_m_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.c_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.c_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.l_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.r_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.u_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_d_f.c_d_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_d_f.D_c_s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_d_f.D_c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_d_f.f_d_p_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_d_f.f_d_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_d_f.i_c_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_d_f.i_e_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_d_f.l_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_d_f.l_d_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.c_e_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_e_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.c_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.c_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.d_f_r_l_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.d_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.d_i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.d_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.i_a_e",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.i_a_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.i_a_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.m_r_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.m_r_a_c_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_d_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.p_c_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.r_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.r_f",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.r_p_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.r_e",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.s_d_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.s_d_r_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.t_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.t_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e_v_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e_v_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e_v_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e_v_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e_v_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e_v_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e_v_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e_v_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e_v_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e_v_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e_v_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e_v_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e_v_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e_v_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.e_v_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.p_k",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.u_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.v",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.v_o",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.h_c_c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.h_i_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.h_m_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.h_o_d_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.h_s_t_i_5_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.i_c_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_t_t.c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_t_t.c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_t_t.c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_t_t.c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_t_t.c_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_t_t.c_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_t_t.f_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_t_t.r",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.b_c_f_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.c_p_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.c_p_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.c_p_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.c_p_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.c_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.f_m_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.f_m_c_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.i_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.i_t_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.i_n_m_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.i_n_p_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.i_p_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.i_p_c_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.m_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.o_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.p_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.p_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.u_i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_c_r.l_i_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_c_r.l_i_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_c_r.l_i_c_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_c_r.l_i_c_r_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_c_r.l_i_c_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_c_r.l_i_c_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_c_r.l_i_e_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_c_r.t_i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.a_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.c_r_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.c_r_s_s_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.c_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.d_1_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.d_2_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_c_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_c_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_c_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_c_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_c_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_c_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_c_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.f_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.e_o_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.i_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.h_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.r_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.t_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.a_l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.b",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.c_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.c_l_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.c_l_v",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.c_p_s_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.c_s_e",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.c_s_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.c_s_v",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.c_u_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.e",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.e_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.e_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.f_l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_m_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.i_e_t_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.o_t_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.r_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.u_t_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t._f_s_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_d_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_d_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_d_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_d_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_d_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_d_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_d_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_i_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_l_o_l_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_r_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_r_d_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_r_d_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_r_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_r_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_r_d_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_r_d_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_r_d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_r_d_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_r_d_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_r_d_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_o_t_t_s_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_o_t_t_s_d_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_o_t_t_s_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_o_t_t_s_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_o_t_t_s_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_o_t_t_s_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_o_t_t_s_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_o_t_t_s_d_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_o_t_t_s_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_o_t_t_s_d_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_o_t_t_s_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_e_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_i_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_o_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_o_d_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_o_d_g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_o_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_o_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_o_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_o_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_o_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_o_d_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_o_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_o_d_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_o_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_i_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_o_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_t_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_t_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_t_c_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_t_c_a_o_t_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_t_d_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_t_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_t_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_t_p_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_t_p_r_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_t_r_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_f_s_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_f_s_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_f_s_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_f_s_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_f_s_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_f_s_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_f_s_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_f_s_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_f_s_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_f_s_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_f_s_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_n_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_n_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_n_g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_n_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_n_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_n_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_n_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_n_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_n_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_n_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_n_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_n_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_s_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_s_f_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_s_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.E_A_C_T_R_B_m_D_L",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_c_i_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_i_a_d_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_p_r_a_d_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_a_a_c_d_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_a_c_d_s_d_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_a_c_t_s_d_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_a_d_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_a_f_d_d_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_a_s_t_u_l_d_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.e_a_s_t_u_l_e_d_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_l_d_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_d_g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_a_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_a_a_d_g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_a_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_a_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_a_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_a_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_a_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_a_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_a_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_a_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_a_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_a_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.f_r_d_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.h_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.h_t_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.h_t_a_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.h_t_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.h_t_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.h_t_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.h_t_p_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.h_t_p_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.h_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_d_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_d_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_d_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_d_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_d_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_d_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_d_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_d_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_d_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_d_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_d_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_h_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_r_d_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.l_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_e_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_f_f_e_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_f_f_e_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_f_f_e_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_f_f_e_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_f_f_e_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_f_f_e_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_f_f_e_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_f_f_e_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_f_f_e_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_f_f_e_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_f_f_e_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_g_a_c_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_g_c_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_z_p_u",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.m_t_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.o_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_m_f",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_n_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_n_a_d_g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_n_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_n_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_n_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_n_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_n_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_n_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_n_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_n_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_n_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_n_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_d_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_d_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_d_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_d_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_d_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_d_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_d_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_d_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_d_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_d_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_d_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_e_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_e_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_e_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_e_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_e_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_e_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_e_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_e_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_e_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_e_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_e_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_e_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_c_l_d_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_d_a_g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_i_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_i_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_i_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_i_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_i_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_i_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_i_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_i_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_i_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_i_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_i_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_i_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.p_r_a_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.R_B",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_v",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_d_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_d_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_d_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_d_a_g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_d_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_d_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_d_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_d_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_d_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_d_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_d_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_d_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_d_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_b_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.t_t_a_i_h_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.t_t_a_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.u_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.u_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.u_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.u_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.u_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.u_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.u_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.u_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.u_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.u_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.u_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.u_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.v_f_r_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.a_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.a_c_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.a_c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.a_c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.a_c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.a_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.a_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.c_s_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.c_s_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_c_i_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_c_i_c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_c_i_c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_c_i_c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_c_i_c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_c_i_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_i_i_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_i_i_c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_i_i_c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_i_i_c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_i_i_c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_i_i_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_o_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_o_c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_o_c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_o_c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_o_c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_o_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_a_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_q_t_a_c_q_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.h_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.h_a_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.h_a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.h_a_l_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.h_a_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.h_a_w_l_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.h_b_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.h_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.h_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.h_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.h_s_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.h_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_a_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_a_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_i_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_i_c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_i_c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_i_c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_i_c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_i_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_i_i_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_i_i_c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_i_i_c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_i_i_c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_i_i_c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_i_i_c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_t_a_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_r_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.l_c_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.l_c_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.m_c_w_3_d_o_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.m_d_a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.m_t_a_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.m_t_d_a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.o_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.s_c_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.s_c_i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.v_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.v_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.w_l_c_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.w_l_c_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.C_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.c_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.d_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.e_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.e_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.f_s_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.i_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_r_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_a_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_r_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_s_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.v_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.a_b_f_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.a_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.a_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.a_d_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.e_v",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.e_l_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.f_p_s_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.f_i_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.i_a_e",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.i_c_r_e",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.i_f_l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.i_f_l_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_o_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_o_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_o_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_o_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_o_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_o_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_o_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_o_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_o_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_o_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_o_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_o_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_o_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_o_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_o_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_o_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_o_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_o_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_o_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_o_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_o_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_o_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_o_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_o_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_o_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_o_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_o_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_o_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_o_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_o_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_p_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.m_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.p_o_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.p_o_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.p_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.p_s_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.p_s_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.r_i_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_i_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.t_o",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.t_o_b",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.t_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.u_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.a_s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_m_i_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_v_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.g_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.l_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.o_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.u_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.C_R_A_I",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.C_R_A_T_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.C_R_A_T_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.C_R_A_T_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.C_R_A_T_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.C_R_A_T_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.C_R_A_T_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.C_R_A_T_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.C_R_A_T_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.C_R_A_T_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.C_R_A_T_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.C_R_A_T_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.C_R_A_T_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.C_R_C",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.C_R_I",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.T_I",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_second"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_j_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.c_p_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.c_s_s",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.c_s_w_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.c_s_w_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.c_s_w_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.m_a_C",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.m_g_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.n_o_a_m_s_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.n_o_a_m_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.n_o_h_m_s_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.n_o_h_m_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.n_o_m_m_s_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.n_o_m_m_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.n_o_m_m_w_s_a_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.n_o_m_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.r_o_p_w_e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_e_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_i_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_i_i_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_second"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_s_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_w_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_w_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.t_s_i_i_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.t_s_i_q_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.t_s_i_w_u_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.t_m_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.t_t_a_s_w_f_m_r_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.t_t_m_s_w_f_a_r_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_u_i_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.a_s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_m_i_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_v_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.g_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.l_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.o_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.u_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a_t_a_c_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a_t_a_c_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a_t_a_c_y_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a_t_a_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a_t_a_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a_t_a_i_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a_t_a_i_m_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a_t_a_i_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a_t_a_i_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a_t_a_i_y_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a_t_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.c_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.c_r_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.d_g_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_l_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.l_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.l_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.m_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.m_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.o_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.t_z",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.z_u_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.a_a_i_c_w_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.a_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.c_b_v_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.c_f_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.C_R_l_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.C_R_l_2",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.C_R_l_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.C_R_l_4",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.c_t_e_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.d_f_c_s_t_n_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.d_f_l_s_t_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.d_c_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.d_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.d_s_t_o_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.f_i_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.f_i_o_s_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.f_m_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.f_m_i_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.f_m_i_i_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.f_m_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.f_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.f_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.f_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.f_v_r_d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.f_v_r_d_t_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.i_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.i_d_t_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.i_f_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.i_i_t_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.i_m_p_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.i_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.L_m_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.l_s_g_o_d_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.l_s_g_s_d_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.l_d_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.m_c_r_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.m_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.N_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.n_s_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.n_s_s_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.n_s_s_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.n_s_s_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.n_s_s_e_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.n_s_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.n_s_s_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.n_s_s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.n_s_s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.n_s_s_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.n_s_s_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.n_s_s_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.r_s_f_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.r_s_f_m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_e_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_e_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_e_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_e_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_e_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_e_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_e_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_e_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_e_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_e_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_e_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_e_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_e_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_f_e_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_f_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_f_i_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_f_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_f_i_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_f_m_e_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_f_m_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_f_m_i_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_f_m_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_f_m_i_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.M_N_P",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_s_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_s_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_s_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_s_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_s_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_s_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_s_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_s_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_s_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_s_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_u_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.t_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.t_r_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.a_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.a_p_l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.a_w_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_c_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_c_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_c_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_c_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_c_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_c_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.d_f_e_t_s_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.e_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.e_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.e_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.e_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.e_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_f_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_f_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_f_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_f_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_f_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_f_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_f_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_p_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_p_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_p_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_p_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_p_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_p_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_p_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_u_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_u_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_u_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_u_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_u_d_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_u_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_u_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.f_f_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.h_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.h_f_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.h_l_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.p_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.i_c_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.i_c_d_t_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.i_d_a_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.i_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.l_d_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.l_d_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.l_d_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.l_d_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.l_u_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.l_u_d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.l_u_d_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.l_u_d_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.l_u_d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.l_u_d_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.l_u_d_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.m_h_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.m_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.m_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.m_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.m_f_f_u_t_u",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.p_f_o_b_f",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.p_p_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.r_a_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.r_b",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.s_o_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.s_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.s_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.s_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.s_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.t_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.u_a_m_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.u_a_m_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.u_a_m_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.u_a_m_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.u_a_m_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.u_a_m_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.u_a_m_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.i_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_o_b_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_c_t_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.d_u_t_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_f",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_s_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.e_i_t_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.f_n_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.l_n_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.p_f",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.p_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.p_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.r_b",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.r_b_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.s_o_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.u_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.u_i_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.u_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_u.u",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.A_M_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_h_o_p_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_m_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_m_b_a_e_v",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_m_b_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_o_m_b",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_p_f_p_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_p_m_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_p_m_d_i_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_p_m_b_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_p_m_b_p_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_p_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_p_p_h_f_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_p_p_h_n_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_p_p_i_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_p_v",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_r_b_a_e_v",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_r_b_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_r_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_r_p_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_s_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_v_g_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_h_o_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_o_i_m_m_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_d_1_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_d_2_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_d_2_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_d_2_m_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_c_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_d_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_f_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_q_o_l_i_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.B_m_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.c_d_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.c_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.c_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.C_M_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.c_f_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.C_R_l_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.C_R_l_2",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.C_R_l_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.C_R_l_4",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.D_M_M_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.d_t_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.E_I_P_M_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.e_a_c_v",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.e_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.F_M_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.F_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.F_P_S",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.h_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.i_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.i_n_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.i_c_e_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.i_c_s_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.i_c_w_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.i_c_i_v",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.i_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.L_M_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.L_M_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.m_i_p_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.m_c_r_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.m_i_i_z",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.m_d_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.n_o_e_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.P_L_M_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.P_F_M_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.R_M_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.R_M_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.S_E",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.S_I",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.S_V",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.S_A_M_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.s_s_f_w_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.s_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.S_M_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.T_R_M_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.T_M_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_o",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_a_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_m_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_m_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_m_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_m_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_m_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_m_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_m_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_m_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_m_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_m_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_m_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_c_r_m_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_e_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_e_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_e_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_e_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_e_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_e_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_e_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_e_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_e_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_e_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_e_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_e_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_s_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_s_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_s_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_s_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_s_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_s_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_s_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_s_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_s_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_s_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_s_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_i_s_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.v_i_f_a_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.W_A_M_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.z_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.c_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_m_s.b_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_m_s.c_m_l_9_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_m_s.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_m_s.s_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_m_s.t_c_l_9_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_m_s.t_r_l_9_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_m_s.u_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "q_n_n.n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "q_n_n.n_i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "q_n_n.n_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "q_n_n.z_t_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p_d.a_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p_d.d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p_d.d_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p_d.d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p_d.d_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p_d.d_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p_d.d_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p_d.d_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p_d.d_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p_d.d_h_p_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p_d.m_d",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p_d.n_a_p_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_C_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_C_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_C_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_C_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_C_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_C_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_C_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_C_2",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_C_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_C_4",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_C_5",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_C_6",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_C_7",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_C_8",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_C_9",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_D_2",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_D_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_D_4",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_D_5",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_D_6",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_D_7",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_D_8",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_D_9",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_D_2",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_D_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_D_4",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_D_5",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_D_6",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_D_7",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_D_8",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_D_9",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_I_2",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_I_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_I_4",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_I_5",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_I_6",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_I_7",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_I_8",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_I_9",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_D_2",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_D_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_D_4",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_D_5",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_D_6",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_D_7",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_D_8",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_D_9",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_I_2",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_I_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_I_4",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_I_5",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_I_6",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_I_7",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_I_8",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_F_V_I_9",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_I_2",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_I_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_I_4",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_I_5",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_I_6",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_I_7",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_I_8",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_I_9",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_S_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_S_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_S_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_S_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_S_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_S_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_S_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_S_2",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_S_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_S_4",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_S_5",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_S_6",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_S_7",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_S_8",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_S_9",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_T_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_T_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_T_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_T_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_T_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_T_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_T_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_T_2",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_T_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_T_4",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_T_5",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_T_6",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_T_7",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_T_8",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.A_T_9",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.A",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.c_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.d_c_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.I",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.E_I",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.e_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.E_d_c_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.l_o_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.m_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.p_v_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_D_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_D_2",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_D_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_D_4",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_D_5",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_D_6",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_D_7",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_D_8",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_D_9",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_I_2",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_I_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_I_4",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_I_5",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_I_6",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_I_7",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_I_8",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_I_9",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_M_S_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_M_S_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_M_S_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_M_S_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_M_S_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_M_S_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_M_S_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_M_S_2",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_M_S_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_M_S_4",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_M_S_5",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_M_S_6",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_M_S_7",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_M_S_8",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.Q_M_S_9",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.R",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.S_A_B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.S_F",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.S_I",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.S_M_S",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.S_N",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.S_P",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.S_S",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.S_P",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.s_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.w_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.s_I_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.s_I_2",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.s_I_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.s_I_4",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.s_I_5",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.S",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.t_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.m_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.n_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.n_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.p_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.p_s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.r_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.s_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.t_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s._f_s_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.a_r_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.e_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.e_q_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.e_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.f_r_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.i_f_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.i_i_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_second"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.q_e_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_c_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.i_s_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.l_o_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.s_r_m_",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.s_r_s_",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.t_t_f_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.w_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.w_t_s_w_s_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.w_t_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.w_t_t_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.w_t_t_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.w_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.a_a_i_c_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.a_a_i_c_w_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.b_m_2_e_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.b_s_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.b_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.c_b_v_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.r_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.r_l_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.c_e_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.d_f_a_c_t_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.d_f_l_d_d_t_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.d_f_l_r_d_d_t_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.d_c_2_0_2_e_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.e_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.e_c_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.e_c_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.e_c_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.e_c_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.e_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.e_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.e_c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.e_c_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.e_c_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.e_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.f_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.h_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.I_D_T_A_O_C",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.m_i_p_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.i_h_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.i_d_t_a_o_c_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_e_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_d_d_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_r_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_s_d_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.l_c_e_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.m_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.m_f_a_c_t_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.N_P",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.p_e_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.r_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.r_i_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.r_t_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.s_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.s_i_m_e_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.w_n_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.w_v_n_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.w_f_a_c_t_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.y_f_a_c_t_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._e_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._f_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a._l_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_c_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_a_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.g_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.i_g_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.k",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_a_g_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_v_f.n_s_o_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.p_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_v_f.s_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.s_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.e_i_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_v_f.t_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_v_f.v_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_v_f.v_a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.a_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.d_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.f_p_u",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.f_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.g_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.r_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.s_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.t_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.u_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_l.g_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_l.l_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_l.l_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p.g_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p.p_f_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p.p_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._e_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._f_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g._l_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.c_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.d_s_l_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.d_s_l_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.d_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_n_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_c_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_d_l_b_5_a_1_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_l_v_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_p_u",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_s_h_a_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_t_i_3_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_t_l_b_2_a_8_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_u_i_l_9_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.g_v_i_l_9_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.t_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.u_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_d_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_d_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_d_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_d_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_d_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_d_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.c_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.u_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.u_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._e_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._f_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u._l_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.a_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.a_e_s_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.a_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.a_l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.a_l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.a_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.b",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_b_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_b_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.c_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.c_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.c_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_a_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.c_p_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.e",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.e",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.g_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.i_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.i_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.l_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.l_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.m_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.p_t_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.p_a_u",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.p_f_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.p_l_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.r_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u.s_i_c_b_e",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_d.t_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.b_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.h_a_g_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_second"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.p_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.t_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.t_n_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.t_c_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.t_s_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.t_f_s_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.w_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_t_a_c_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_t_a_c_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_t_a_c_y_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_t_a_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_t_a_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_t_a_i_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_t_a_i_m_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_t_a_i_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_t_a_i_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_t_a_i_y_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_t_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c_r_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.d_g_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_l_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.l_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.o_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.t_z",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.z_u_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.g_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.g_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.g_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.m_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.q_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.C_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.c_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.d_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.e_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.e_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.f_s_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.i_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_r_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_a_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_r_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_s_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.v_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.a_b_f_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_a_s_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_h_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_h_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_t_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_w_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_o",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.e_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.e_q_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.f_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_t_o_q.f_t_o_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.f_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.f_a_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.f_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.f_a_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.f_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.f_a_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.f_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.f_s_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.f_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.f_a_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_t_o_q.i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.i_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.l_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.l_s_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.m_c_q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_a_a_t_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_e_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_e_q_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_e_q_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_e_q_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_e_q_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_e_q_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_e_q_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_e_q_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.n_u",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_a_a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_e_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_e_q_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_q_e_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.q_e_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.q_e_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.q_e_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.q_e_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.q_e_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.q_e_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.q_e_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.q_e_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.q_h_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_a_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_e_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_a_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_t_a_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_t_q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.u_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_u_s_t_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.a_h_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_c_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_c_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_c_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_c_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_c_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_c_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_second"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_c_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_c_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_c_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_r_b_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_r_b_r_a_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.i_n_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.p_c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.s_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.z_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_f_p_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_c_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_c_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_c_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_c_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_c_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_c_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_c_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.b_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.b_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_n_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_s_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_d_t_f_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_d_t_f_s_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_f_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_i_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_r_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_r_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_r_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_r_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_r_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_r_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_r_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_t_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_t_a_l_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_c_1",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_c_2",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_i_p_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_i_c_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.e_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_d_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_q_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_c_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_c_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_r_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.g_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.h_t_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.h_t_a_l_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_q_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_w_3_d_o_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_w_3_d_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_c_f_i_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.i_w_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_a_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_i_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_s_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.m_d_a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.m_h_d_i_l_3_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.m_t_a_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.m_t_a_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.m_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.m_t_a_i_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.m_t_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.m_f_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.m_t_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.m_t_a_l_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.n_o_b_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.o_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.o_f_l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.p_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.p_c_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.r_r_i_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.r_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.r_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.r_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.r_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_t_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_second"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_t_a_l_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_second"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_i_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_c_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_c_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_c_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_c_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_c_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_c_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_c_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_c_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_n_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_n_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_n_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_n_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_n_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_n_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_n_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_n_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_s_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_s_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_s_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_s_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_s_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_s_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_s_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_s_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_p_d_n_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_c_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_f_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_a_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_t_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_t_s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_t_s_w_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_t_s_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.u_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.v_l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.w_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.t_i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.t_t_s_l_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.t_t_s_w_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_d_o_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_d_o_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_d_o_w_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_d_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_h",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_h_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_m_n",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_q",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_q_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_t_o_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_w_o_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_y",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.u_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_a_d.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_a_d.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_a_d.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_a_d.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_a_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u_a.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u_a.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.a_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.a_w_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u_a.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.c_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.c_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.d_c_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_g_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_l_u_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_m_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.i_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.l_o_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u_a.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.m_s_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.p_v_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.q_m_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.q_w_m_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_m_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_w_m_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_w_p_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_w_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u_a.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.t_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_d.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_d.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_d.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_d.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_d.u_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "u_c_c_r_m.c_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "u_c_c_r_m.c_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "u_c_c_r_m.f_s_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "u_c_c_r_m.m_e_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "u_c_c_r_m.m_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "u_c_c_r_m.u_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "u_c_c_r_m.q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_c_w_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_f_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_l_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_z_a.a_t_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_z_a.a_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_z_a.B",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_m_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_s_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.h_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.h_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.i_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.i_s_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_z_a.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.p_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.p_k",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.q_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.q_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.q_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.q_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.q_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.q_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.q_w_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.s_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.s_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.s_g_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.s_g_o_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.s_o_a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.s_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.t_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_z_a.u_l_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.z_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_z_a.z_u_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f.e_t_t_l_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f.e_z_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f.h_v_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f.l_c_t_f_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f.o_t_a_i_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f.s_a_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f.t_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_g_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.f_f",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_g_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.i_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_second"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_P_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_second"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_u_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.n_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_second"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_u_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.p_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.q_e_a_i_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_second"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_P_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_second"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.q_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.s_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.u_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.w_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.w_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.w_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.z_f_m_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_f_p_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_c_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_c_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_c_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_c_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_c_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_c_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_c_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.b_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.b_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_n_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_s_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_d_t_f_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_d_t_f_s_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_f_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_i_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_r_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_r_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_r_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_r_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_r_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_r_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_r_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_t_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_t_a_l_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_c_1",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_c_2",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_i_p_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_i_c_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.d_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.d_d_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.d_d_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.d_d_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.d_d_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.d_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.d_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.d_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.d_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.d_d_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.d_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.d_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.d_d_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.d_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.e_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_d_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_q_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_c_r_1_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_c_r_2_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_c_r_3_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_c_r_4_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_c_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_c_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_r_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.g_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.h_t_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.h_t_a_l_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.a_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_q_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_w_3_d_o_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_w_3_d_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_c_f_i_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.i_w_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_a_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_i_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_s_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.m_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.m_t_a_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.m_t_a_i_d_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.m_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.m_t_a_i_m_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.m_t_t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.m_f_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.m_t_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.m_t_a_l_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.n_o_b_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.o_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.o_f_l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.p_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.p_c_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.r_r_i_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.r_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.r_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.r_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.r_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_t_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_second"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_t_a_l_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "duration_second"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_i_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_s_u_2.s_u_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_c_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_c_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_c_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_c_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_c_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_c_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_c_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_c_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_n_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_n_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_n_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_n_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_n_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_n_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_n_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_n_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_s_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_s_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_s_d_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_s_d_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_s_d_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_s_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_s_d_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_s_d_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_p_d_n_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_c_d_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_f_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.t_i",
+                  "description": "",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_a_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_t_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_t_s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_t_s_w_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_t_s_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NullType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute30"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.u_a_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.v_l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.w_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_r_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_t_t_f_r_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_t_t_r_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.b_w_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.b_w_t_h_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.b_w_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.b_w_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.f_t_t_r_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_i",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_i_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.q_b_t_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.q_b_t_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.q_b_w_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.r_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_e_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_r_q_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_s_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_s_q_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_s_q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_s_q_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_e_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_r_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_date"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_d_o_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_d_o_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_d_o_w_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_week_index"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_d_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_day_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_h_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_hour_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_minute"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_name"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_m_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_month_num"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_q_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_quarter_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_t_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_time_of_day"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_w_o_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_week_of_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_s_t_y",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      },
+                      {
+                        "tag": "urn:li:tag:Temporal"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.DateType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_year"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.t_i",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.t_t_f_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.t_t_f_r_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.t_t_f_r_h_b",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.t_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.t_t_r_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.i_t_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.t_t_r_m_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.EnumType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "tier"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.t_t_s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.t_t_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.t_t_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.t_t_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.w_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.w_t_s_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.d_t_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.d_t_b_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.d_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.d_t_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.d_t_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.d_t_u_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.f_o_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.p_t_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.p_t_b_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.p_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.p_t_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.p_t_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.p_t_u_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.p_t_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.p_t_b_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.p_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.p_t_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.p_t_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.p_t_u_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_n.r_n_u",
+                  "description": " ",
+                  "isPartOfKey": true,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Dimension"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.a_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.a_c_p_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.a_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.a_m_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.b_e_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "b_h.b_h_i_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.b_s_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.c_w_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.c_w_t_r_f_q_t_a_c_q_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.c_w_t_r_f_q_t_a_c_q_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.d_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_q_t_a_c_q_m_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.f_q_t_a_c_q_m_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_t_a_c_m_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_r_i_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_i_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.i_c_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_h.i_h_i_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.m_c_w_3_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.p_c_l_t_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.q_r_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_a_r_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_b_s_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_c_w_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_c_w_t_n_f_q_t_a_c_q_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_c_s_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_e_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_f_q_t_a_c_q_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_f_q_t_a_c_q_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_f_q_t_a_c_q_m_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_i_c_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_i_i_c_r_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_i_i_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_i_a_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_i_c_t_a_c_m_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_l_c_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_v_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i_c.t_w_l_c_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_i.i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_e.e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.a_q_m_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.a_q_m_r_n_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.a_q_m_r_f_c_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.a_q_m_r_f_c_r_m_a_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.a_q_m_r_f_c_r_a_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.a_q_m_r_f_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.a_q_m_r_f_s_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.a_q_m_r_u_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.c_q_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.c_r_m_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.c_r_m_r_u_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.c_r_m_r_u_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.c_r_m_r_u_c_n_s_m_o_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.k_q_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.o_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.p_r_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.q_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.s_m_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.q_t_f_o_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.q_t_f_c_r_m_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.q_t_f_c_r_a_o_m_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.q_t_f_c_r_a_s_m_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.q_t_f_s_m_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.u_q_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.u_c_f_u_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.u_c_r_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.u_c_a_q_r_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_b_v_m.u_c_a_q_r_a_f_s_m_o_o_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.A_N_D_A",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.A_Q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.A_n_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.a_t_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.a_t_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_A_G_o_T",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_A_G_w_1_w_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_A_G_w_2_w_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_G_G_o_T",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_G_G_w_1_w_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_G_G_w_2_w_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_I_A",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_T_A",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_T_G",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_T_I",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.P_V_A",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.t_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.t_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.t_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.t_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.t_i_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.t_r_1_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.t_r_2_w",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.t_v_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "n_p.t_o_t_g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.e_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.e_r_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.p_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.p_r_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.r_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_r_w_c.t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "7_n_e_a_a.s_p_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "a_a_d_g_d.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_c.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.a_a_c_w_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.a_a_c_w_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.a_h_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.a_h_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.a_h_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.a_h_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.a_t_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.a_t_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.c_v",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.d_c_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.i_d_c_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.t_h_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.w_t_i_q_7_p_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.w_t_i_q_8_p_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.w_t_i_q_9_p_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.w_t_i_q_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_l.w_t_i_q_m_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.a_p_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.a_p_i_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.a_p_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.a_p_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.a_m_s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.i_v_a_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.i_v_a_i_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.i_v_a_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.i_v_a_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.i_v_c_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.i_v_c_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.i_v_c_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.i_v_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_f_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_f_i_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_f_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_f_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_m_i_r_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_m_i_r_i_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_m_i_r_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_m_i_r_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_u_a_l_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_u_a_l_i_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_u_a_l_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.m_u_a_l_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.p_c_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.p_c_i_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.p_c_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.p_c_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.p_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.p_p_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.p_p_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.p_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_s_g.t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_r_t.t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_r.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_e.t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_i.c_t_i",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.a_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.b_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_i_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_i_t_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.c_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.e_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.m_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "median"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.m_s_l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "median"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.p_u_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.r_b_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.s_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_m_d.s_i_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.a_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_a_i_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_c_t.t_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "c_f.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.e_p_m_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.h_r_m_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.m_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.s_l_m_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_c_s_c.s_b_m_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.d_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.d_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_r_r.r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "d_z.t_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "e.u_u",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.c_c_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.c_c_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.d_q_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.d_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.f_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.f_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.i_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.i_a_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.i_a_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.m_e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.m_e_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.s_t_i_5_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_f.s_t_i_5_d_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_t_t.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.a_p_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.c_a_p_u_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.c_f_p_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.c_p_u_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.f_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.f_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.f_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.i_A",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.i_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.m_p_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.n_t_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.n_p_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.p_a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.p_p_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.t_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_c_b_p.t_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_c_r.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.c_w_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.i_a_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.i_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.i_e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.t_i_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_e.t_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.TimeType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "date_raw"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_t.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_d_t_c_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_d_t_i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_r_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_t_t_a_i_h_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_t_t_a_i_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.a_t_t_a_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.C_i_2_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.C_i_2_d_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c_w_2_p_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.d_c_e_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_d_i_2_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.i_d_i_2_d_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.o_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.r_p_t_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.s_d_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "i_d_t.u_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.a_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.a_c_p_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.a_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.a_m_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.b_e_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.b_s_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.c_w_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.c_w_t_r_f_q_t_a_c_q_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.c_w_t_r_f_q_t_a_c_q_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.d_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_q_t_a_c_q_m_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.f_q_t_a_c_q_m_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_t_a_c_m_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_r_i_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_i_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.i_c_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.m_c_w_3_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.p_c_l_t_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.q_r_a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_a_r_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_b_s_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_c_w_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_c_w_t_n_f_q_t_a_c_q_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_c_s_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_e_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_f_q_t_a_c_q_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_f_q_t_a_c_q_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_f_q_t_a_c_q_m_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_i_c_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_i_i_c_r_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_i_i_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_i_a_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_i_c_t_a_c_m_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_l_c_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_v_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c.t_w_l_c_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.a_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.a_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.a_a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.a_a_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.a_a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.a_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.a_e_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.c_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.C_c_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.C_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.C_c_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.C_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.C_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.C_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.e_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.e_a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.e_a_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.e_a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.i_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.i_c_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.i_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.i_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.i_c_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.i_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.l_c_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.l_c_a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.l_c_a_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.l_c_a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.p_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.p_a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.p_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.p_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_c_c_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_c_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_c_c_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_c_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_c_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_c_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.S_r_g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.t_s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.t_s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.v_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.v_a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.v_a_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.v_a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_s_d.s_g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.a_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.a_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.d_o",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_f",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_p_o",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.l_c_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.r_i_r_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.t_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.t_d_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.t_o_e",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.t_p_e",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.t_p_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.t_p_s_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.t_p_s_d_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.u_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_l_f.w_a_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_m_d.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.c_r_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_c_r.d_c_r_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_l_c_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_h_t_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_h_t_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_t_a_s_w_f_m_r_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_t_m_s_w_f_a_r_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_t_s_i_w_u_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.a_w_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.c_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.h_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.h_p_a_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.i_s_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.l_c_a_r_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.n_a_c_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_a_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_n_o_a_m_s_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_n_o_a_m_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_n_o_h_m_s_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_n_o_h_m_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_n_o_m_m_s_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_n_o_m_m_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_n_o_m_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_t_t_a_s_w_f_m_r_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.s_t_t_m_s_w_f_a_r_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.t_s_i_w_u_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.t_n_o_m_m_w_s_a_a_j",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.t_n_o_m_m_w_s_a_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.t_t_s_i_i_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.t_t_s_i_q_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.t_t_s_i_w_u_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "l_c_s.w_t_i_q_m_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.m_u_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_m.r_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.s_p_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_m_u.u_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.a_d_f_l_s_t_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.a_e_c_p_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.a_i_c_p_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.a_m_c_p_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.a_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.a_t_o_t_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.D_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.m_u_b_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.n_f_s_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.p_r_w_o_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.p_r_w_s_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.p_o_s_i_r_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_s_i_c_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_w_o_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_w_s_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.s_w_i_r_h_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_b_s.t_r_s_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.a_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.b_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_i_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_i_t_r",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.c_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.e_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.m_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "median"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.m_s_l",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "median"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.p_u_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.r_b_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.s_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m.s_i_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_p_m_b_p_s_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_p_m_b_p_s_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "max"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_i_p_m_b_p_s_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "min"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_t_i_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.a_t_i_a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.c_i_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.i_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.i_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.o_i_n_a_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_i_c.t_t_i_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_m_s.a_c_m_l_9_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_m_s.a_c_l_9_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_m_s.a_r_l_9_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_m_s.u_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "q_n_n.n_s_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "q_n_n.n_s_c_1_t_7",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "q_n_n.n_s_c_1_t_9",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "q_n_n.n_s_c_6_t_3",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "q_n_n.n_s_c_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "q_n_n.n_s_c_l_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "q_n_n.n_s_c_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "q_n_n.n_s_c_l_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "q_n_n.n_s_c_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "q_n_n.n_s_c_l_q",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p_d.a_p_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_p_d.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e_s.c_e_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.q_p_r_b_l_c_t_b",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.q_p_r_b_l_c_t_b_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_e.t_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.a_n_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.a_n_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.A_p_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.a_p_s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_s.m_p_s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.a_f_r_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.a_f_r_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.a_f_r_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.e_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.s_e_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.s_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_q_f_r_t.s_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.m_w_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.n_s_a_c_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.p_w_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.p_w_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.p_w_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.p_w_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.s_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "o_s.u_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.h_c_e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.p_o_e_w_h_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.r_e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "running_total"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_e.r_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "running_total"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.a_p_v_p_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_v_f.n_s_s_o_v_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_v_f.s_s_o_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_v_f.s_v_o_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_v_f.s_v_a_s_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.t_s_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_s_u.t_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.t_v_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.f_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.t_f",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.t_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.t_n",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_f_l.t_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.f_g_c_n_e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.f_g_d_l_b_5_a_1_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.f_g_s_h_a_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.f_g_t_i_3_o_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.f_g_t_l_b_2_a_8_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.f_g_u_i_l_9_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.f_g_v_i_l_9_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.f_u_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.s_c_h_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_g.t_f_g",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_c_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.t_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.t_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.t_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.t_c_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_u_a.t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.a_g_b_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.a_g_b_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.a_g_b_p_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_g_b.m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.s_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.t_c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.t_s_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_c.t_c_p_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.s_p_a",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_a.u_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_a_q.c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.a_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.a_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.a_a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.a_a_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.a_a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.a_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.a_e_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.c_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.c_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.C_c_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.C_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.C_c_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.C_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.C_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.C_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.e_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.e_a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.e_a_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.e_a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.i_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.i_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.i_c_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.i_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.i_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.i_c_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.i_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.l_c_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.l_c_a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.l_c_a_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.l_c_a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.p_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.p_a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.p_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.p_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_c_c_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_c_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_c_c_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_c_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_c_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_c_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_c_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_c_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.S_r_g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.t_s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.t_s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.v_a_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.v_a_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.v_a_s_r_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.v_a_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "s_d_s_m.s_g",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_h_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_h_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_h_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_a_w_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_t_a_h_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_t_a_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_t_a_w_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_t_h_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_t_h_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_t_t_q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_w_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.e_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.e_u_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.e_u_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_p_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.s_p_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_e_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.a_l_u_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_t_q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_a_f_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_a_h_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_a_h_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_a_t_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_a_w_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_f_t_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_n_f_t_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_p_a_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_t_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_t_u_w_f_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_i_q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_u_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_b_a_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_b_a_p_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.u_p_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.u_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.w_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_a_h.t_s_a_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.a_a_h_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.f_c_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.i_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.i_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.m_c_r_b_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.p_a_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.p_c_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.t_u_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.t_u_p_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.t_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.t_a_h_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "m_s_z_t_c.w_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_c_p_o_a_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_c_t_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_w_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_s_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_c_d_t_f_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_f_d_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_h_t_i_m_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_s_p_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_f_r_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_f_r_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_f_r_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.a_m_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.c_f_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.d_m_a_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.e_s_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.e_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.f_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_c_s_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.l_c_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.m_f_r_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.m_f_r_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.p_f_r_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.p_f_r_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.p_f_r_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.p_f_r_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.p_f_r_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.p_f_r_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.p_r_i_1_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_p_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_f_r_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_o_f_r_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_o_t_t_s_w_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.s_o_t_t_s_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_a_h_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_a_h_a_l_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_a_h_l_u_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_a_h_l_u_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_a_h_l_u_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_a_h_l_u_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_a_h_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_a_h_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_a_h_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_a_h_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_v_l_w_v_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_f_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.t_s_p_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.v_s_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.v_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.w_t_e",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.BooleanType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "yesno"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.w_l_c_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.w_a_r_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.w_c_b_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.w_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.w_r_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.w_s_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.w_s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.w_t_b_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_f_h_o_s.w_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.s_o_t_t_s_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "t_t_s_l_u_h.s_o_t_t_s_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.a_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.a_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.a_q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.a_s_q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.a_e_q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.a_e_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.a_q_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.e_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.c_e_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.q_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_p_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.s_p_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.t_e_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.t_s_m_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "p_u.t_s_p",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_w_s_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_v_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_c_w_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_c_w_t_s_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_c_w_t_s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_h_t_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_m_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.StringType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "string"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_h_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_s_o_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_v",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_t_s_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_t_s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.c_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.d_c_v",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.h_t_s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.h_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.i_s_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.i_d_c_v",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.n_a_c_v",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.s_a_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.t_t_s_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.t_h_t",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.t_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.a_t_h_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.v_a_r_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.w_t_i_q_7_p_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.w_t_i_q_8_p_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.w_t_i_q_9_p_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.w_t_i_q_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "f_c_a_s.w_t_i_q_m_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.a_t_r_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.a_t_r_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.a_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.a_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.a_g_p_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.e_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.e_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.t_t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.t_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_g_h.v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_c_p_o_a_v",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_c_t_l",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_w_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_s_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_c_d_t_f_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_f_d_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_h_t_i_m_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_s_p_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_f_r_t_d",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_f_r_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_f_r_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.a_m_t_a_i_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.c_f_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_i_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.d_m_a_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.e_s_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.e_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.f_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_c_s_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.l_c_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.m_f_r_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.m_f_r_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.p_f_r_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.p_f_r_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.p_f_r_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.p_f_r_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.p_f_r_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.p_f_r_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.p_r_i_1_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t_d_d.p_r_w_d_d",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_p_d_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_f_r_t_m",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_o_f_r_t_s",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_o_t_t_s_w_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.s_o_t_t_s_w_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_a_h_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_a_h_a_l_u",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_a_h_l_u_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_a_h_l_u_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_a_h_l_u_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_a_h_l_u_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_a_h_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_a_h_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_a_h_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_a_h_p",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_v_l_w_v_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_f_o",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.t_s_p_a",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "sum"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.v_s_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.v_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.w_l_c_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.w_a_r_i_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.w_r_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.w_r_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.w_s_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.w_s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.w_t_b_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_t.w_t_c",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_b_w_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_b_w_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_q_b_t_t_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_q_b_t_t_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_q_b_t_t_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_q_b_t_t_t_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_t_t_f_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_t_t_f_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_i_t_t_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_t_t_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_t_t_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_t_t_s_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_t_t_s_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_t_t_t_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_t_t_t_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_t_t_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "average"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.a_p_t",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.c_f_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.c_f_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.c_s_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.c_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_b_w_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_t_f_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_t_f_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_t_r",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.m_t_t_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_b_w_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "median"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_b_w_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "median"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "median"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_b_w_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_b_w_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_f_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_f_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_b_w_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_b_w_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_f_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_f_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_b_w_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_b_w_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_f_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_f_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_b_w_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_b_w_t_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_f_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_f_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_r_m",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_r_s",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.p_t_t_t_h",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "percentile"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.q_b_s_a_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.q_b_s_c_a_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_1_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_1_r_w_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_2_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_3_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_4_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_a_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "number"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_c_a_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_c_f_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_c_f_r_w_1",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_c_f_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_c_s_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.s_c_t_r_w",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.u_m_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "z_w_r_t.u_t_c",
+                  "description": " ",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                },
+                {
+                  "nullable": false,
+                  "fieldPath": "last_of.6800_cols",
+                  "description": "",
+                  "isPartOfKey": false,
+                  "label": " ",
+                  "globalTags": {
+                    "tags": [
+                      {
+                        "tag": "urn:li:tag:Measure"
+                      }
+                    ]
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.schema.NumberType": {}
+                    }
+                  },
+                  "recursive": false,
+                  "nativeDataType": "count_distinct"
+                }
+              ],
+              "schemaName": "test-large-schema",
+              "version": 0,
+              "hash": "",
+              "platform": "urn:li:dataPlatform:looker"
+            }
+          }
+        ]
+      }
+    },
+    "proposedDelta": null
+  }
+]
\ No newline at end of file
diff --git a/smoke-test/tests/schema_fields/test_schemafields.py b/smoke-test/tests/schema_fields/test_schemafields.py
new file mode 100644
index 00000000000000..cd282db81ff722
--- /dev/null
+++ b/smoke-test/tests/schema_fields/test_schemafields.py
@@ -0,0 +1,174 @@
+import logging
+import os
+import tempfile
+import time
+from random import randint
+
+import datahub.metadata.schema_classes as models
+import pytest
+from datahub.emitter.mce_builder import make_dataset_urn, make_schema_field_urn
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.ingestion.api.common import PipelineContext, RecordEnvelope
+from datahub.ingestion.api.sink import NoopWriteCallback
+from datahub.ingestion.graph.client import DatahubClientConfig, DataHubGraph
+from datahub.ingestion.sink.file import FileSink, FileSinkConfig
+
+from tests.utils import (
+    delete_urns_from_file,
+    get_gms_url,
+    get_sleep_info,
+    ingest_file_via_rest,
+    wait_for_writes_to_sync,
+)
+
+logger = logging.getLogger(__name__)
+
+
+start_index = randint(10, 10000)
+dataset_urns = [
+    make_dataset_urn("snowflake", f"table_foo_{i}")
+    for i in range(start_index, start_index + 10)
+]
+
+
+class FileEmitter:
+    def __init__(self, filename: str) -> None:
+        self.sink: FileSink = FileSink(
+            ctx=PipelineContext(run_id="create_test_data"),
+            config=FileSinkConfig(filename=filename),
+        )
+
+    def emit(self, event):
+        self.sink.write_record_async(
+            record_envelope=RecordEnvelope(record=event, metadata={}),
+            write_callback=NoopWriteCallback(),
+        )
+
+    def close(self):
+        self.sink.close()
+
+
+@pytest.fixture(scope="module")
+def chart_urn():
+    return "urn:li:chart:(looker,chart_foo)"
+
+
+@pytest.fixture(scope="module")
+def upstream_schema_field_urn():
+    return make_schema_field_urn(make_dataset_urn("snowflake", "table_bar"), "field1")
+
+
+def create_test_data(filename: str, chart_urn: str, upstream_schema_field_urn: str):
+    documentation_mcp = MetadataChangeProposalWrapper(
+        entityUrn=upstream_schema_field_urn,
+        aspect=models.DocumentationClass(
+            documentations=[
+                models.DocumentationAssociationClass(
+                    documentation="test documentation",
+                    attribution=models.MetadataAttributionClass(
+                        time=int(time.time() * 1000),
+                        actor="urn:li:corpuser:datahub",
+                        source="urn:li:dataHubAction:documentation_propagation",
+                    ),
+                )
+            ]
+        ),
+    )
+
+    input_fields_mcp = MetadataChangeProposalWrapper(
+        entityUrn=chart_urn,
+        aspect=models.InputFieldsClass(
+            fields=[
+                models.InputFieldClass(
+                    schemaFieldUrn=upstream_schema_field_urn,
+                    schemaField=models.SchemaFieldClass(
+                        fieldPath="field1",
+                        type=models.SchemaFieldDataTypeClass(models.StringTypeClass()),
+                        nativeDataType="STRING",
+                    ),
+                )
+            ]
+        ),
+    )
+
+    file_emitter = FileEmitter(filename)
+    for mcps in [documentation_mcp, input_fields_mcp]:
+        file_emitter.emit(mcps)
+
+    file_emitter.close()
+
+
+sleep_sec, sleep_times = get_sleep_info()
+
+
+@pytest.fixture(scope="module", autouse=False)
+def ingest_cleanup_data(request, chart_urn, upstream_schema_field_urn):
+    new_file, filename = tempfile.mkstemp(suffix=".json")
+    try:
+        create_test_data(filename, chart_urn, upstream_schema_field_urn)
+        print("ingesting schema fields test data")
+        ingest_file_via_rest(filename)
+        yield
+        print("removing schema fields test data")
+        delete_urns_from_file(filename)
+        wait_for_writes_to_sync()
+    finally:
+        os.remove(filename)
+
+
+@pytest.mark.dependency()
+def test_healthchecks(wait_for_healthchecks):
+    # Call to wait_for_healthchecks fixture will do the actual functionality.
+    pass
+
+
+def get_gql_query(filename: str) -> str:
+    with open(filename) as fp:
+        return fp.read()
+
+
+def validate_schema_field_urn_for_chart(
+    graph: DataHubGraph, chart_urn: str, upstream_schema_field_urn: str
+) -> None:
+    # Validate listing
+    result = graph.execute_graphql(
+        get_gql_query("tests/schema_fields/queries/get_chart_field.gql"),
+        {"urn": chart_urn},
+    )
+    assert "chart" in result
+    assert "inputFields" in result["chart"]
+    assert len(result["chart"]["inputFields"]["fields"]) == 1
+    assert (
+        result["chart"]["inputFields"]["fields"][0]["schemaField"]["schemaFieldEntity"][
+            "urn"
+        ]
+        == upstream_schema_field_urn
+    )
+    assert (
+        result["chart"]["inputFields"]["fields"][0]["schemaField"]["schemaFieldEntity"][
+            "fieldPath"
+        ]
+        == "field1"
+    )
+    assert (
+        result["chart"]["inputFields"]["fields"][0]["schemaFieldUrn"]
+        == upstream_schema_field_urn
+    )
+    assert (
+        result["chart"]["inputFields"]["fields"][0]["schemaField"]["schemaFieldEntity"][
+            "documentation"
+        ]["documentations"][0]["documentation"]
+        == "test documentation"
+    )
+
+
+# @tenacity.retry(
+#     stop=tenacity.stop_after_attempt(sleep_times), wait=tenacity.wait_fixed(sleep_sec)
+# )
+@pytest.mark.dependency(depends=["test_healthchecks"])
+def test_schema_field_gql_mapper_for_charts(
+    ingest_cleanup_data, chart_urn, upstream_schema_field_urn
+):
+    graph: DataHubGraph = DataHubGraph(config=DatahubClientConfig(server=get_gms_url()))
+
+    validate_schema_field_urn_for_chart(graph, chart_urn, upstream_schema_field_urn)
diff --git a/smoke-test/tests/structured_properties/test_structured_properties.py b/smoke-test/tests/structured_properties/test_structured_properties.py
index bf1b5b1292750f..f2327a13df6d00 100644
--- a/smoke-test/tests/structured_properties/test_structured_properties.py
+++ b/smoke-test/tests/structured_properties/test_structured_properties.py
@@ -119,9 +119,11 @@ def create_property_definition(
         qualifiedName=f"{namespace}.{property_name}",
         valueType=Urn.make_data_type_urn(value_type),
         description="The retention policy for the dataset",
-        entityTypes=[Urn.make_entity_type_urn(e) for e in entity_types]
-        if entity_types
-        else [Urn.make_entity_type_urn("dataset")],
+        entityTypes=(
+            [Urn.make_entity_type_urn(e) for e in entity_types]
+            if entity_types
+            else [Urn.make_entity_type_urn("dataset")]
+        ),
         cardinality=cardinality,
         allowedValues=allowed_values,
     )
@@ -137,7 +139,7 @@ def create_property_definition(
 def attach_property_to_entity(
     urn: str,
     property_name: str,
-    property_value: Union[str, float, List[str | float]],
+    property_value: Union[str, float, List[Union[str, float]]],
     graph: DataHubGraph,
     namespace: str = default_namespace,
 ):
diff --git a/smoke-test/tests/utils.py b/smoke-test/tests/utils.py
index 0895056fe3dddf..7564f1a05e79e0 100644
--- a/smoke-test/tests/utils.py
+++ b/smoke-test/tests/utils.py
@@ -23,7 +23,7 @@ def get_frontend_session():
 
 
 def login_as(username: str, password: str):
-    return cli_utils.get_session_login_as(
+    return cli_utils.get_frontend_session_login_as(
         username=username, password=password, frontend_url=get_frontend_url()
     )